diff -Nru gnupg-1.4.9/acinclude.m4 gnupg-1.4.10/acinclude.m4 --- gnupg-1.4.9/acinclude.m4 2007-10-23 11:10:37.000000000 +0100 +++ gnupg-1.4.10/acinclude.m4 2008-12-11 16:40:07.000000000 +0000 @@ -1,5 +1,6 @@ # macros to configure gnupg -# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007, +# 2008 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -89,23 +90,6 @@ dnl fi ]) -dnl GNUPG_CHECK_DOCBOOK_TO_TEXI -dnl -AC_DEFUN([GNUPG_CHECK_DOCBOOK_TO_TEXI], - [ - AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no) - AC_MSG_CHECKING(for sgml to texi tools) - working_sgmltotexi=no - if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then - if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then - working_sgmltotexi=yes - fi - fi - AC_MSG_RESULT($working_sgmltotexi) - AM_CONDITIONAL(HAVE_DOCBOOK_TO_TEXI, test "$working_sgmltotexi" = "yes" ) - ]) - - dnl GNUPG_CHECK_ENDIAN dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST dnl diff -Nru gnupg-1.4.9/aclocal.m4 gnupg-1.4.10/aclocal.m4 --- gnupg-1.4.9/aclocal.m4 2008-03-26 17:30:40.000000000 +0000 +++ gnupg-1.4.10/aclocal.m4 2009-09-02 14:49:53.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file 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. @@ -11,12 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -47,8 +50,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # Figure out how to run the assembler. -*- Autoconf -*- @@ -342,7 +347,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -402,13 +407,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file 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. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -513,16 +518,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -857,7 +863,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) @@ -959,6 +965,7 @@ m4_include([m4/autobuild.m4]) m4_include([m4/codeset.m4]) +m4_include([m4/estream.m4]) m4_include([m4/gettext.m4]) m4_include([m4/glibc2.m4]) m4_include([m4/glibc21.m4]) diff -Nru gnupg-1.4.9/AUTHORS gnupg-1.4.10/AUTHORS --- gnupg-1.4.9/AUTHORS 2007-10-29 19:46:13.000000000 +0000 +++ gnupg-1.4.10/AUTHORS 2009-07-20 11:01:04.000000000 +0100 @@ -1,6 +1,6 @@ Program: GnuPG Maintainer: Werner Koch -Bug reports: +Bug reports: http://bugs.gnupg.org Security related bug reports: License: GPLv3+ diff -Nru gnupg-1.4.9/ChangeLog gnupg-1.4.10/ChangeLog --- gnupg-1.4.9/ChangeLog 2008-03-26 17:27:03.000000000 +0000 +++ gnupg-1.4.10/ChangeLog 2009-09-02 14:47:48.000000000 +0100 @@ -1,3 +1,54 @@ +2009-09-02 Werner Koch + + Release 1.4.10. + + * configure.ac (AC_RG_ENABLE): Don't disable try_gettext in + --enable-minimal. + * README <--enable-minimal>: Mention --disable-nls. + +2009-08-13 Werner Koch + + Release 1.4.10rc1. + + * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove now obsolete + --enable-camellia + +2009-08-13 David Shaw + + * NEWS: Note Camellia and hkps. + +2009-07-21 Werner Koch + + * configure.ac (AH_BOTTOM): Add macros for estream-printf. + (estream_PRINTF_INIT): Add it. + +2009-06-05 David Shaw + + * configure.ac: Remove Camellia restriction. + +2008-10-03 David Shaw + + * configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI + as we no longer use it. Noted by John Clizbe. + +2008-08-27 David Shaw + + * configure.ac: Use printf for the most portable SVN version + detection. + +2008-08-11 Werner Koch + + * configure.ac: Check for size of time_t. + +2008-04-01 Werner Koch + + * configure.ac (AC_INIT): Fix quoting. + +2008-03-31 David Shaw + + * configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use + curl_version_info(). + 2008-03-26 Werner Koch Release 1.4.9. diff -Nru gnupg-1.4.9/checks/conventional-mdc.test gnupg-1.4.10/checks/conventional-mdc.test --- gnupg-1.4.9/checks/conventional-mdc.test 2007-10-23 09:53:20.000000000 +0100 +++ gnupg-1.4.10/checks/conventional-mdc.test 2009-08-05 14:32:33.000000000 +0100 @@ -9,6 +9,7 @@ # *BSD's dd can't cope with a count of 0 if test "$i" = "0"; then : >z + my_chtag z else dd if=data-80000 of=z bs=1 count=$i 2>/dev/null fi diff -Nru gnupg-1.4.9/checks/defs.inc gnupg-1.4.10/checks/defs.inc --- gnupg-1.4.9/checks/defs.inc 2007-12-03 14:27:41.000000000 +0000 +++ gnupg-1.4.10/checks/defs.inc 2009-08-13 08:29:18.000000000 +0100 @@ -112,6 +112,17 @@ # cleanup_files="$cleanup_files $*" #} + +# Special function for zOS. +my_chtag () { + #FIXME: Is there an envvar to test for the OS or do we + # need to resort to a configure test + #if test "$FOO" = "bar"; then + # chtag -tc ISO8859-1 $1 + #fi + : +} + have_pubkey_algo () { if ../g10/gpg --homedir . --version | grep "Pubkey:.*$1" >/dev/null then diff -Nru gnupg-1.4.9/checks/Makefile.in gnupg-1.4.10/checks/Makefile.in --- gnupg-1.4.9/checks/Makefile.in 2008-03-26 17:30:46.000000000 +0000 +++ gnupg-1.4.10/checks/Makefile.in 2009-09-02 17:20:22.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -53,11 +53,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -109,7 +109,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff -Nru gnupg-1.4.9/cipher/camellia-glue.c gnupg-1.4.10/cipher/camellia-glue.c --- gnupg-1.4.9/cipher/camellia-glue.c 2007-12-03 14:27:42.000000000 +0000 +++ gnupg-1.4.10/cipher/camellia-glue.c 2008-12-11 16:40:06.000000000 +0000 @@ -1,5 +1,5 @@ /* camellia-glue.c - Glue for the Camellia cipher - * Copyright (C) 2007 Free Software Foundation, Inc. + * Copyright (C) 2007, 2008 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -58,7 +58,7 @@ static int initialized=0; static const char *selftest_failed=NULL; - if(keylen!=16 && keylen!=32) + if(keylen!=16 && keylen!=24 && keylen!=32) return G10ERR_WRONG_KEYLEN; if(!initialized) @@ -133,6 +133,16 @@ 0x67,0x67,0x31,0x38,0x54,0x96,0x69,0x73, 0x08,0x57,0x06,0x56,0x48,0xea,0xbe,0x43 }; + const byte key_192[]= + { + 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba,0x98, + 0x76,0x54,0x32,0x10,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77 + }; + const byte ciphertext_192[]= + { + 0xb4,0x99,0x34,0x01,0xb3,0xe9,0x96,0xf8, + 0x4e,0xe5,0xce,0xe7,0xd7,0x9b,0x09,0xb9 + }; const byte key_256[]= { 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xfe,0xdc,0xba, @@ -154,6 +164,14 @@ if(memcmp(scratch,plaintext,sizeof(scratch))!=0) return "CAMELLIA128 test decryption failed."; + camellia_setkey(&ctx,key_192,sizeof(key_192)); + camellia_encrypt(&ctx,scratch,plaintext); + if(memcmp(scratch,ciphertext_192,sizeof(scratch))!=0) + return "CAMELLIA192 test encryption failed."; + camellia_decrypt(&ctx,scratch,scratch); + if(memcmp(scratch,plaintext,sizeof(scratch))!=0) + return "CAMELLIA192 test decryption failed."; + camellia_setkey(&ctx,key_256,sizeof(key_256)); camellia_encrypt(&ctx,scratch,plaintext); if(memcmp(scratch,ciphertext_256,sizeof(scratch))!=0) @@ -185,6 +203,11 @@ *keylen = 128; return "CAMELLIA128"; } + else if(algo==CIPHER_ALGO_CAMELLIA192) + { + *keylen = 192; + return "CAMELLIA192"; + } else if(algo==CIPHER_ALGO_CAMELLIA256) { *keylen = 256; diff -Nru gnupg-1.4.9/cipher/ChangeLog gnupg-1.4.10/cipher/ChangeLog --- gnupg-1.4.9/cipher/ChangeLog 2008-03-22 15:57:04.000000000 +0000 +++ gnupg-1.4.10/cipher/ChangeLog 2008-12-11 16:40:06.000000000 +0000 @@ -1,3 +1,8 @@ +2008-04-17 David Shaw + + * camellia-glue.c (selftest, camellia_get_info), cipher.c + (setup_cipher_table): Add Camellia-192. + 2008-03-22 Werner Koch * cipher.c (struct cipher_handle_s): Make sure IV is u32 diff -Nru gnupg-1.4.9/cipher/cipher.c gnupg-1.4.10/cipher/cipher.c --- gnupg-1.4.9/cipher/cipher.c 2008-03-22 16:02:03.000000000 +0000 +++ gnupg-1.4.10/cipher/cipher.c 2008-12-11 16:40:06.000000000 +0000 @@ -1,6 +1,6 @@ /* cipher.c - cipher dispatcher - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - * 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -198,6 +198,17 @@ if( !cipher_table[i].name ) BUG(); i++; + cipher_table[i].algo = CIPHER_ALGO_CAMELLIA192; + cipher_table[i].name = camellia_get_info( cipher_table[i].algo, + &cipher_table[i].keylen, + &cipher_table[i].blocksize, + &cipher_table[i].contextsize, + &cipher_table[i].setkey, + &cipher_table[i].encrypt, + &cipher_table[i].decrypt ); + if( !cipher_table[i].name ) + BUG(); + i++; cipher_table[i].algo = CIPHER_ALGO_CAMELLIA256; cipher_table[i].name = camellia_get_info( cipher_table[i].algo, &cipher_table[i].keylen, diff -Nru gnupg-1.4.9/cipher/idea-stub.c gnupg-1.4.10/cipher/idea-stub.c --- gnupg-1.4.9/cipher/idea-stub.c 2007-10-23 09:44:20.000000000 +0100 +++ gnupg-1.4.10/cipher/idea-stub.c 2008-12-11 16:40:06.000000000 +0000 @@ -119,7 +119,7 @@ #ifndef _WIN32 /* Make sure we are not setuid. */ - if (getuid() != geteuid()) + if (getuid () != geteuid ()) log_bug("trying to load an extension while still setuid\n"); #endif diff -Nru gnupg-1.4.9/cipher/Makefile.in gnupg-1.4.10/cipher/Makefile.in --- gnupg-1.4.9/cipher/Makefile.in 2008-03-26 17:30:46.000000000 +0000 +++ gnupg-1.4.10/cipher/Makefile.in 2009-09-02 17:20:22.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -60,11 +60,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -109,7 +109,7 @@ $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) libcipher_a_OBJECTS = $(am_libcipher_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -150,7 +150,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -402,8 +401,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -415,8 +414,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -426,13 +425,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gnupg-1.4.9/cipher/rndunix.c gnupg-1.4.10/cipher/rndunix.c --- gnupg-1.4.9/cipher/rndunix.c 2007-10-23 09:44:21.000000000 +0100 +++ gnupg-1.4.10/cipher/rndunix.c 2008-12-11 16:40:06.000000000 +0000 @@ -804,7 +804,7 @@ if( !gatherer_pid ) { /* make sure we are not setuid */ - if( getuid() != geteuid() ) + if ( getuid () != geteuid () ) BUG(); /* time to start the gatherer process */ if( pipe( pipedes ) ) { diff -Nru gnupg-1.4.9/config.h.in gnupg-1.4.10/config.h.in --- gnupg-1.4.9/config.h.in 2008-03-26 17:33:29.000000000 +0000 +++ gnupg-1.4.10/config.h.in 2009-09-02 14:50:48.000000000 +0100 @@ -228,7 +228,7 @@ /* Define if you have the iconv() function. */ #undef HAVE_ICONV -/* Define if you have the 'intmax_t' type in or . */ +/* Define to 1 if the system has the type `intmax_t'. */ #undef HAVE_INTMAX_T /* Define to 1 if you have the header file. */ @@ -247,6 +247,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H +/* Define if you have and nl_langinfo(THOUSANDS_SEP). */ +#undef HAVE_LANGINFO_THOUSANDS_SEP + /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -283,7 +286,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define if you have the 'long double' type. */ +/* Define to 1 if the system has the type `long double'. */ #undef HAVE_LONG_DOUBLE /* Define to 1 if the system has the type `long long int'. */ @@ -335,6 +338,9 @@ /* Define if the POSIX multithreading library has read/write locks. */ #undef HAVE_PTHREAD_RWLOCK +/* Define to 1 if the system has the type `ptrdiff_t'. */ +#undef HAVE_PTRDIFF_T + /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV @@ -468,7 +474,7 @@ /* Defined if a `u32' is typedef'd */ #undef HAVE_U32_TYPEDEF -/* Define if you have the 'uintmax_t' type in or . */ +/* Define to 1 if the system has the type `uintmax_t'. */ #undef HAVE_UINTMAX_T /* Defined if a `ulong' is typedef'd */ @@ -652,6 +658,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE +/* The size of `time_t', as computed by sizeof. */ +#undef SIZEOF_TIME_T + /* The size of `uint64_t', as computed by sizeof. */ #undef SIZEOF_UINT64_T @@ -667,6 +676,9 @@ /* The size of `unsigned short', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_SHORT +/* The size of `void *', as computed by sizeof. */ +#undef SIZEOF_VOID_P + /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ #undef SIZE_MAX @@ -808,6 +820,10 @@ #undef inline #endif +/* Define to the widest signed integer type if and do + not define. */ +#undef intmax_t + /* Define to `int' if does not define. */ #undef mode_t @@ -821,8 +837,8 @@ /* Define to `unsigned int' if does not define. */ #undef size_t -/* Define to unsigned long or unsigned long long if and - don't define. */ +/* Define to the widest unsigned integer type if and + do not define. */ #undef uintmax_t /* Define as `fork' if `vfork' does not work. */ @@ -905,6 +921,11 @@ #define SAFE_VERSION_DOT '.' #define SAFE_VERSION_DASH '-' +/* We want to use our memory allocator for estream-printf. */ +#define _ESTREAM_PRINTF_MALLOC xtrymalloc +#define _ESTREAM_PRINTF_FREE xfree +#define _ESTREAM_PRINTF_EXTRA_INCLUDE "memory.h" + #endif /*GNUPG_CONFIG_H_INCLUDED*/ diff -Nru gnupg-1.4.9/configure gnupg-1.4.10/configure --- gnupg-1.4.9/configure 2008-03-26 17:30:49.000000000 +0000 +++ gnupg-1.4.10/configure 2009-09-02 14:50:00.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gnupg 1.4.9. +# Generated by GNU Autoconf 2.61 for gnupg 1.4.10. # # Report bugs to . # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='gnupg' PACKAGE_TARNAME='gnupg' -PACKAGE_VERSION='1.4.9' -PACKAGE_STRING='gnupg 1.4.9' +PACKAGE_VERSION='1.4.10' +PACKAGE_STRING='gnupg 1.4.10' PACKAGE_BUGREPORT='bug-gnupg@gnu.org' ac_unique_file="g10/gpg.c" @@ -713,9 +713,6 @@ FAQPROG WORKING_FAQPROG_TRUE WORKING_FAQPROG_FALSE -DOCBOOK_TO_TEXI -HAVE_DOCBOOK_TO_TEXI_TRUE -HAVE_DOCBOOK_TO_TEXI_FALSE TAR HAVE_USTAR_TRUE HAVE_USTAR_FALSE @@ -1346,7 +1343,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnupg 1.4.9 to adapt to many kinds of systems. +\`configure' configures gnupg 1.4.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1416,7 +1413,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnupg 1.4.9:";; + short | recursive ) echo "Configuration of gnupg 1.4.10:";; esac cat <<\_ACEOF @@ -1579,7 +1576,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnupg configure 1.4.9 +gnupg configure 1.4.10 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1593,7 +1590,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnupg $as_me 1.4.9, which was +It was created by gnupg $as_me 1.4.10, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2373,7 +2370,7 @@ # Define the identity of the package. PACKAGE='gnupg' - VERSION='1.4.9' + VERSION='1.4.10' cat >>confdefs.h <<_ACEOF @@ -2665,7 +2662,7 @@ use_blowfish=yes use_aes=yes use_twofish=yes -use_camellia=no +use_camellia=yes use_sha256=yes use_sha512=yes use_bzip2=yes @@ -2676,8 +2673,7 @@ # Check whether --enable-minimal was given. if test "${enable_minimal+set}" = set; then - enableval=$enable_minimal; try_gettext=no - try_dns=no + enableval=$enable_minimal; try_dns=no use_rsa=no use_idea=no use_cast5=no @@ -2855,14 +2851,6 @@ #define USE_CAMELLIA 1 _ACEOF - { echo "$as_me:$LINENO: WARNING: -*** -*** The Camellia cipher is for testing only and is NOT for production use! -***" >&5 -echo "$as_me: WARNING: -*** -*** The Camellia cipher is for testing only and is NOT for production use! -***" >&2;} fi { echo "$as_me:$LINENO: checking whether to enable the SHA-224 and SHA-256 digests" >&5 @@ -5526,64 +5514,6 @@ - # Extract the first word of "docbook2texi", so it can be a program name with args. -set dummy docbook2texi; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DOCBOOK_TO_TEXI+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DOCBOOK_TO_TEXI"; then - ac_cv_prog_DOCBOOK_TO_TEXI="$DOCBOOK_TO_TEXI" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DOCBOOK_TO_TEXI="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_DOCBOOK_TO_TEXI" && ac_cv_prog_DOCBOOK_TO_TEXI="no" -fi -fi -DOCBOOK_TO_TEXI=$ac_cv_prog_DOCBOOK_TO_TEXI -if test -n "$DOCBOOK_TO_TEXI"; then - { echo "$as_me:$LINENO: result: $DOCBOOK_TO_TEXI" >&5 -echo "${ECHO_T}$DOCBOOK_TO_TEXI" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - { echo "$as_me:$LINENO: checking for sgml to texi tools" >&5 -echo $ECHO_N "checking for sgml to texi tools... $ECHO_C" >&6; } - working_sgmltotexi=no - if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then - if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then - working_sgmltotexi=yes - fi - fi - { echo "$as_me:$LINENO: result: $working_sgmltotexi" >&5 -echo "${ECHO_T}$working_sgmltotexi" >&6; } - if test "$working_sgmltotexi" = "yes" ; then - HAVE_DOCBOOK_TO_TEXI_TRUE= - HAVE_DOCBOOK_TO_TEXI_FALSE='#' -else - HAVE_DOCBOOK_TO_TEXI_TRUE='#' - HAVE_DOCBOOK_TO_TEXI_FALSE= -fi - - - # Check whether --with-tar was given. if test "${with_tar+set}" = set; then @@ -7554,6 +7484,7 @@ fi # Check for curl. We fake the curl API if libcurl isn't installed. +# We require 7.10 or better as we use curl_version_info(). @@ -7748,11 +7679,11 @@ echo "${ECHO_T}$libcurl_cv_lib_curl_version" >&6; } _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` - _libcurl_wanted=`echo 0 | $_libcurl_version_parse` + _libcurl_wanted=`echo 7.10 | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then - { echo "$as_me:$LINENO: checking for libcurl >= version " >&5 -echo $ECHO_N "checking for libcurl >= version ... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for libcurl >= version 7.10" >&5 +echo $ECHO_N "checking for libcurl >= version 7.10... $ECHO_C" >&6; } if test "${libcurl_cv_lib_version_ok+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19580,33 +19511,42 @@ _ACEOF - -# Ensure that we have UINT64_C before we bother to check for uint64_t - -for ac_header in inttypes.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ echo "$as_me:$LINENO: checking for time_t" >&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6; } +if test "${ac_cv_type_time_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + +typedef time_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -19625,137 +19565,69 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_cv_type_time_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_type_time_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of time_t" >&5 +echo $ECHO_N "checking size of time_t... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_time_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to bug-gnupg@gnu.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif -done -{ echo "$as_me:$LINENO: checking for UINT64_C" >&5 -echo $ECHO_N "checking for UINT64_C... $ECHO_C" >&6; } -if test "${gnupg_cv_uint64_c_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + typedef time_t ac__type_sizeof_; int main () { +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 -uint64_t foo=UINT64_C(42); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19764,43 +19636,36 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - gnupg_cv_uint64_c_works=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gnupg_cv_uint64_c_works=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $gnupg_cv_uint64_c_works" >&5 -echo "${ECHO_T}$gnupg_cv_uint64_c_works" >&6; } - -if test "$gnupg_cv_uint64_c_works" = "yes" ; then - { echo "$as_me:$LINENO: checking for uint64_t" >&5 -echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; } -if test "${ac_cv_type_uint64_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -typedef uint64_t ac__type_new_; + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + + typedef time_t ac__type_sizeof_; int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -19822,113 +19687,17 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_uint64_t=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_uint64_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 -echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; } - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of uint64_t" >&5 -echo $ECHO_N "checking size of uint64_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_uint64_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -19943,8 +19712,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + + typedef time_t ac__type_sizeof_; int main () { @@ -19980,8 +19762,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + + typedef time_t ac__type_sizeof_; int main () { @@ -20044,8 +19839,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + + typedef time_t ac__type_sizeof_; int main () { @@ -20084,15 +19892,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_uint64_t=$ac_lo;; -'') if test "$ac_cv_type_uint64_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t) +?*) ac_cv_sizeof_time_t=$ac_lo;; +'') if test "$ac_cv_type_time_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (uint64_t) +echo "$as_me: error: cannot compute sizeof (time_t) See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } else - ac_cv_sizeof_uint64_t=0 + ac_cv_sizeof_time_t=0 fi ;; esac else @@ -20102,8 +19910,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - typedef uint64_t ac__type_sizeof_; + +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + + + typedef time_t ac__type_sizeof_; static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include @@ -20155,95 +19976,64 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_uint64_t=`cat conftest.val` + ac_cv_sizeof_time_t=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_uint64_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t) +if test "$ac_cv_type_time_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (uint64_t) +echo "$as_me: error: cannot compute sizeof (time_t) See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } else - ac_cv_sizeof_uint64_t=0 + ac_cv_sizeof_time_t=0 fi fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint64_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_uint64_t" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_UINT64_T $ac_cv_sizeof_uint64_t -_ACEOF - - -fi - -if test "$ac_cv_sizeof_unsigned_short" = "0" \ - || test "$ac_cv_sizeof_unsigned_int" = "0" \ - || test "$ac_cv_sizeof_unsigned_long" = "0"; then - { echo "$as_me:$LINENO: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&5 -echo "$as_me: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&2;}; -fi - -if test x"$use_sha512" = xyes \ - && test "$ac_cv_sizeof_unsigned_int" != "8" \ - && test "$ac_cv_sizeof_unsigned_long" != "8" \ - && test "$ac_cv_sizeof_unsigned_long_long" != "8" \ - && test x"$ac_cv_sizeof_uint64_t" != "x8"; then - { echo "$as_me:$LINENO: No 64-bit types. Disabling SHA-384 and SHA-512." >&5 -echo "$as_me: No 64-bit types. Disabling SHA-384 and SHA-512." >&6;} - use_sha512=no -fi - -if test x"$use_sha512" = xyes ; then - -cat >>confdefs.h <<\_ACEOF -#define USE_SHA512 1 +#define SIZEOF_TIME_T $ac_cv_sizeof_time_t _ACEOF -fi - if test x"$use_sha512" = xyes; then - USE_SHA512_TRUE= - USE_SHA512_FALSE='#' -else - USE_SHA512_TRUE='#' - USE_SHA512_FALSE= -fi +# Ensure that we have UINT64_C before we bother to check for uint64_t -{ echo "$as_me:$LINENO: checking whether getpagesize is declared" >&5 -echo $ECHO_N "checking whether getpagesize is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_getpagesize+set}" = set; then +for ac_header in inttypes.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -int -main () -{ -#ifndef getpagesize - (void) getpagesize; -#endif - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -20262,99 +20052,125 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl_getpagesize=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_getpagesize=no + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getpagesize" >&5 -echo "${ECHO_T}$ac_cv_have_decl_getpagesize" >&6; } -if test $ac_cv_have_decl_getpagesize = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETPAGESIZE 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETPAGESIZE 0 -_ACEOF - - -fi - +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - while :; do - cat >conftest.$ac_ext <<_ACEOF +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_sys_largefile_source=no; break + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to bug-gnupg@gnu.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ echo "$as_me:$LINENO: checking for UINT64_C" >&5 +echo $ECHO_N "checking for UINT64_C... $ECHO_C" >&6; } +if test "${gnupg_cv_uint64_c_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + +uint64_t foo=UINT64_C(42); ; return 0; } @@ -20377,50 +20193,24 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_sys_largefile_source=1; break + gnupg_cv_uint64_c_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + gnupg_cv_uint64_c_works=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF -;; -esac -rm -f conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FSEEKO 1 -_ACEOF - fi +{ echo "$as_me:$LINENO: result: $gnupg_cv_uint64_c_works" >&5 +echo "${ECHO_T}$gnupg_cv_uint64_c_works" >&6; } - -for ac_func in vprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +if test "$gnupg_cv_uint64_c_works" = "yes" ; then + { echo "$as_me:$LINENO: checking for uint64_t" >&5 +echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uint64_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -20429,53 +20219,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default +typedef uint64_t ac__type_new_; int main () { -return $ac_func (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20484,85 +20248,57 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_cv_type_uint64_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; } -{ echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of uint64_t" >&5 +echo $ECHO_N "checking size of uint64_t... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_uint64_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _doprnt - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _doprnt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub__doprnt || defined __stub____doprnt -choke me -#endif - +$ac_includes_default + typedef uint64_t ac__type_sizeof_; int main () { -return _doprnt (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20571,53 +20307,23 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func__doprnt=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func__doprnt=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } -if test $ac_cv_func__doprnt = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF - -fi - -fi -done - - -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef pid_t ac__type_new_; + typedef uint64_t ac__type_sizeof_; int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -20639,53 +20345,42 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_pid_t=no + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : + done else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - - -for ac_header in vfork.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> + typedef uint64_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -20704,171 +20399,98 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +$ac_includes_default + typedef uint64_t ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to bug-gnupg@gnu.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_lo= ac_hi= fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -done - - - -for ac_func in fork vfork -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default + typedef uint64_t ac__type_sizeof_; int main () { -return $ac_func (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20877,38 +20499,29 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_lo=`expr '(' $ac_mid ')' + 1` fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done - -if test "x$ac_cv_func_fork" = xyes; then - { echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_fork_works=cross +case $ac_lo in +?*) ac_cv_sizeof_uint64_t=$ac_lo;; +'') if test "$ac_cv_type_uint64_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (uint64_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_uint64_t=0 + fi ;; +esac else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20917,12 +20530,33 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef uint64_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include int main () { - /* By Ruediger Kuhlmann. */ - return fork () < 0; + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; ; return 0; @@ -20948,48 +20582,77 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_fork_works=yes + ac_cv_sizeof_uint64_t=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -ac_cv_func_fork_works=no +if test "$ac_cv_type_uint64_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (uint64_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_uint64_t=0 + fi fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint64_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_uint64_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UINT64_T $ac_cv_sizeof_uint64_t +_ACEOF fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } -else - ac_cv_func_fork_works=$ac_cv_func_fork +if test "$ac_cv_sizeof_unsigned_short" = "0" \ + || test "$ac_cv_sizeof_unsigned_int" = "0" \ + || test "$ac_cv_sizeof_unsigned_long" = "0"; then + { echo "$as_me:$LINENO: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&5 +echo "$as_me: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&2;}; fi -if test "x$ac_cv_func_fork_works" = xcross; then - case $host in - *-*-amigaos* | *-*-msdosdjgpp*) - # Override, as these systems have only a dummy fork() stub - ac_cv_func_fork_works=no - ;; - *) - ac_cv_func_fork_works=yes - ;; - esac - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + +if test x"$use_sha512" = xyes \ + && test "$ac_cv_sizeof_unsigned_int" != "8" \ + && test "$ac_cv_sizeof_unsigned_long" != "8" \ + && test "$ac_cv_sizeof_unsigned_long_long" != "8" \ + && test x"$ac_cv_sizeof_uint64_t" != "x8"; then + { echo "$as_me:$LINENO: No 64-bit types. Disabling SHA-384 and SHA-512." >&5 +echo "$as_me: No 64-bit types. Disabling SHA-384 and SHA-512." >&6;} + use_sha512=no fi -ac_cv_func_vfork_works=$ac_cv_func_vfork -if test "x$ac_cv_func_vfork" = xyes; then - { echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +if test x"$use_sha512" = xyes ; then + +cat >>confdefs.h <<\_ACEOF +#define USE_SHA512 1 +_ACEOF + +fi + + if test x"$use_sha512" = xyes; then + USE_SHA512_TRUE= + USE_SHA512_FALSE='#' else - if test "$cross_compiling" = yes; then - ac_cv_func_vfork_works=cross + USE_SHA512_TRUE='#' + USE_SHA512_FALSE= +fi + + +{ echo "$as_me:$LINENO: checking whether getpagesize is declared" >&5 +echo $ECHO_N "checking whether getpagesize is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_getpagesize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20997,217 +20660,82 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Thanks to Paul Eggert for this test. */ $ac_includes_default -#include -#ifdef HAVE_VFORK_H -# include -#endif -/* On some sparc systems, changes by the child to local and incoming - argument registers are propagated back to the parent. The compiler - is told about this with #include , but some compilers - (e.g. gcc -O) don't grok . Test for this by using a - static variable whose address is put into a register that is - clobbered by the vfork. */ -static void -#ifdef __cplusplus -sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif -{ - static pid_t child; - if (!child) { - child = vfork (); - if (child < 0) { - perror ("vfork"); - _exit(2); - } - if (!child) { - arg = getpid(); - write(-1, "", 0); - _exit (arg); - } - } -} - int main () { - pid_t parent = getpid (); - pid_t child; - - sparc_address_test (0); - - child = vfork (); - - if (child == 0) { - /* Here is another test for sparc vfork register problems. This - test uses lots of local variables, at least as many local - variables as main has allocated so far including compiler - temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris - 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should - reuse the register of parent for one of the local variables, - since it will think that parent can't possibly be used any more - in this routine. Assigning to the local variable will thus - munge parent in the parent process. */ - pid_t - p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), - p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); - /* Convince the compiler that p..p7 are live; otherwise, it might - use the same hardware register for all 8 local variables. */ - if (p != p1 || p != p2 || p != p3 || p != p4 - || p != p5 || p != p6 || p != p7) - _exit(1); - - /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent - from child file descriptors. If the child closes a descriptor - before it execs or exits, this munges the parent's descriptor - as well. Test for this by closing stdout in the child. */ - _exit(close(fileno(stdout)) != 0); - } else { - int status; - struct stat st; - - while (wait(&status) != child) - ; - return ( - /* Was there some problem with vforking? */ - child < 0 - - /* Did the child fail? (This shouldn't happen.) */ - || status - - /* Did the vfork/compiler bug occur? */ - || parent != getpid() +#ifndef getpagesize + (void) getpagesize; +#endif - /* Did the file descriptor bug occur? */ - || fstat(fileno(stdout), &st) != 0 - ); - } + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_vfork_works=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_getpagesize=yes +else + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_func_vfork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - + ac_cv_have_decl_getpagesize=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } -fi; -if test "x$ac_cv_func_fork_works" = xcross; then - ac_cv_func_vfork_works=$ac_cv_func_vfork - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getpagesize" >&5 +echo "${ECHO_T}$ac_cv_have_decl_getpagesize" >&6; } +if test $ac_cv_have_decl_getpagesize = yes; then -if test "x$ac_cv_func_vfork_works" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_VFORK 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETPAGESIZE 1 _ACEOF -else -cat >>confdefs.h <<\_ACEOF -#define vfork fork +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETPAGESIZE 0 _ACEOF -fi -if test "x$ac_cv_func_fork_works" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_FORK 1 -_ACEOF fi - - - - - - -for ac_func in strerror stpcpy strlwr tcgetattr strtoul mmap sysconf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } +if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + while :; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +#include /* for off_t */ + #include int main () { -return $ac_func (); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -21230,84 +20758,30 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + ac_cv_sys_largefile_source=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - - - - -for ac_func in strcasecmp strncasecmp ctermid times unsetenv getpwnam getpwuid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +#define _LARGEFILE_SOURCE 1 +#include /* for off_t */ + #include int main () { -return $ac_func (); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -21330,34 +20804,45 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break +done fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source _ACEOF +;; +esac +rm -f conftest* -fi -done - - +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +if test $ac_cv_sys_largefile_source != unknown; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_FSEEKO 1 +_ACEOF +fi -for ac_func in memmove gettimeofday getrusage setrlimit clock_gettime +for ac_func in vprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -21447,21 +20932,9 @@ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -fi -done - - - - - - - -for ac_func in atexit raise getpagesize strftime nl_langinfo setlocale -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ echo "$as_me:$LINENO: checking for _doprnt" >&5 +echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } +if test "${ac_cv_func__doprnt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21470,12 +20943,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. +/* Define _doprnt to an innocuous variant, in case declares _doprnt. For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +#define _doprnt innocuous__doprnt /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. + which can conflict with char _doprnt (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -21485,7 +20958,7 @@ # include #endif -#undef $ac_func +#undef _doprnt /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -21493,18 +20966,18 @@ #ifdef __cplusplus extern "C" #endif -char $ac_func (); +char _doprnt (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func +#if defined __stub__doprnt || defined __stub____doprnt choke me #endif int main () { -return $ac_func (); +return _doprnt (); ; return 0; } @@ -21527,42 +21000,34 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + ac_cv_func__doprnt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_cv_func__doprnt=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 +echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } +if test $ac_cv_func__doprnt = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DOPRNT 1 _ACEOF fi -done - - +fi +done - - - - -for ac_func in waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21571,53 +21036,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default +typedef pid_t ac__type_new_; int main () { -return $ac_func (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21626,131 +21065,177 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_cv_type_pid_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } +if test $ac_cv_type_pid_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define pid_t int _ACEOF fi -done - -for ac_func in fcntl ftruncate +for ac_header in vfork.h do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -#undef $ac_func + ac_header_compiler=no +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -int -main () -{ -return $ac_func (); - ; - return 0; -} +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_header_preproc=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to bug-gnupg@gnu.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_var'}'` +ac_res=`eval echo '${'$as_ac_Header'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi -done - - +done -for ac_func in mkdtemp timegm isascii memrchr strsep +for ac_func in fork vfork do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -21840,21 +21325,2218 @@ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -else - case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" - ;; -esac - fi done +if test "x$ac_cv_func_fork" = xyes; then + { echo "$as_me:$LINENO: checking for working fork" >&5 +echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } +if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_fork_works=cross +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* By Ruediger Kuhlmann. */ + return fork () < 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fork_works=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_fork_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 +echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } + +else + ac_cv_func_fork_works=$ac_cv_func_fork +fi +if test "x$ac_cv_func_fork_works" = xcross; then + case $host in + *-*-amigaos* | *-*-msdosdjgpp*) + # Override, as these systems have only a dummy fork() stub + ac_cv_func_fork_works=no + ;; + *) + ac_cv_func_fork_works=yes + ;; + esac + { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} +fi +ac_cv_func_vfork_works=$ac_cv_func_vfork +if test "x$ac_cv_func_vfork" = xyes; then + { echo "$as_me:$LINENO: checking for working vfork" >&5 +echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } +if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_vfork_works=cross +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Thanks to Paul Eggert for this test. */ +$ac_includes_default +#include +#ifdef HAVE_VFORK_H +# include +#endif +/* On some sparc systems, changes by the child to local and incoming + argument registers are propagated back to the parent. The compiler + is told about this with #include , but some compilers + (e.g. gcc -O) don't grok . Test for this by using a + static variable whose address is put into a register that is + clobbered by the vfork. */ +static void +#ifdef __cplusplus +sparc_address_test (int arg) +# else +sparc_address_test (arg) int arg; +#endif +{ + static pid_t child; + if (!child) { + child = vfork (); + if (child < 0) { + perror ("vfork"); + _exit(2); + } + if (!child) { + arg = getpid(); + write(-1, "", 0); + _exit (arg); + } + } +} + +int +main () +{ + pid_t parent = getpid (); + pid_t child; + + sparc_address_test (0); + + child = vfork (); + + if (child == 0) { + /* Here is another test for sparc vfork register problems. This + test uses lots of local variables, at least as many local + variables as main has allocated so far including compiler + temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris + 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should + reuse the register of parent for one of the local variables, + since it will think that parent can't possibly be used any more + in this routine. Assigning to the local variable will thus + munge parent in the parent process. */ + pid_t + p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), + p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); + /* Convince the compiler that p..p7 are live; otherwise, it might + use the same hardware register for all 8 local variables. */ + if (p != p1 || p != p2 || p != p3 || p != p4 + || p != p5 || p != p6 || p != p7) + _exit(1); + + /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent + from child file descriptors. If the child closes a descriptor + before it execs or exits, this munges the parent's descriptor + as well. Test for this by closing stdout in the child. */ + _exit(close(fileno(stdout)) != 0); + } else { + int status; + struct stat st; + + while (wait(&status) != child) + ; + return ( + /* Was there some problem with vforking? */ + child < 0 + + /* Did the child fail? (This shouldn't happen.) */ + || status + + /* Did the vfork/compiler bug occur? */ + || parent != getpid() + + /* Did the file descriptor bug occur? */ + || fstat(fileno(stdout), &st) != 0 + ); + } +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_vfork_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 +echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } + +fi; +if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=$ac_cv_func_vfork + { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} +fi + +if test "x$ac_cv_func_vfork_works" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WORKING_VFORK 1 +_ACEOF + +else + +cat >>confdefs.h <<\_ACEOF +#define vfork fork +_ACEOF + +fi +if test "x$ac_cv_func_fork_works" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WORKING_FORK 1 +_ACEOF + +fi + + + + + + + + +for ac_func in strerror stpcpy strlwr tcgetattr strtoul mmap sysconf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + + + +for ac_func in strcasecmp strncasecmp ctermid times unsetenv getpwnam getpwuid +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + +for ac_func in memmove gettimeofday getrusage setrlimit clock_gettime +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + + +for ac_func in atexit raise getpagesize strftime nl_langinfo setlocale +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + + + + +for ac_func in waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + +for ac_func in fcntl ftruncate +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + +for ac_func in mkdtemp timegm isascii memrchr strsep +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +else + case " $LIBOBJS " in + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + ;; +esac + +fi +done + + + +{ echo "$as_me:$LINENO: checking for struct sigaction" >&5 +echo $ECHO_N "checking for struct sigaction... $ECHO_C" >&6; } +if test "${ac_cv_type_struct_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef struct sigaction ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_struct_sigaction=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_struct_sigaction=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sigaction" >&5 +echo "${ECHO_T}$ac_cv_type_struct_sigaction" >&6; } +if test $ac_cv_type_struct_sigaction = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SIGACTION 1 +_ACEOF + + +fi +{ echo "$as_me:$LINENO: checking for sigset_t" >&5 +echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6; } +if test "${ac_cv_type_sigset_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef sigset_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_sigset_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_sigset_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_sigset_t" >&5 +echo "${ECHO_T}$ac_cv_type_sigset_t" >&6; } +if test $ac_cv_type_sigset_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_SIGSET_T 1 +_ACEOF + + +fi + + +# See if getopt is in libiberty. This is of course not optimal since +# it might be somewhere other than libiberty, but does cover the +# mingw32 case. + +{ echo "$as_me:$LINENO: checking for getopt" >&5 +echo $ECHO_N "checking for getopt... $ECHO_C" >&6; } +if test "${ac_cv_func_getopt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define getopt to an innocuous variant, in case declares getopt. + For example, HP-UX 11i declares gettimeofday. */ +#define getopt innocuous_getopt + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getopt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef getopt + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getopt (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_getopt || defined __stub___getopt +choke me +#endif + +int +main () +{ +return getopt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_getopt=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_getopt=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_getopt" >&5 +echo "${ECHO_T}$ac_cv_func_getopt" >&6; } +if test $ac_cv_func_getopt = yes; then + : +else + { echo "$as_me:$LINENO: checking for getopt in -liberty" >&5 +echo $ECHO_N "checking for getopt in -liberty... $ECHO_C" >&6; } +if test "${ac_cv_lib_iberty_getopt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-liberty $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getopt (); +int +main () +{ +return getopt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_iberty_getopt=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_iberty_getopt=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_getopt" >&5 +echo "${ECHO_T}$ac_cv_lib_iberty_getopt" >&6; } +if test $ac_cv_lib_iberty_getopt = yes; then + GETOPT="-liberty" + +fi + +fi + + +# +# check for gethrtime and run a testprogram to see whether +# it is broken. It has been reported that some Solaris and HP UX systems +# raise an SIGILL +# +{ echo "$as_me:$LINENO: checking for gethrtime" >&5 +echo $ECHO_N "checking for gethrtime... $ECHO_C" >&6; } +if test "${gnupg_cv_func_gethrtime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + hrtime_t tv; + tv = gethrtime(); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gnupg_cv_func_gethrtime=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gnupg_cv_func_gethrtime=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $gnupg_cv_func_gethrtime" >&5 +echo "${ECHO_T}$gnupg_cv_func_gethrtime" >&6; } +if test $gnupg_cv_func_gethrtime = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETHRTIME 1 +_ACEOF + + { echo "$as_me:$LINENO: checking whether gethrtime is broken" >&5 +echo $ECHO_N "checking whether gethrtime is broken... $ECHO_C" >&6; } +if test "${gnupg_cv_func_broken_gethrtime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + gnupg_cv_func_broken_gethrtime=assume-no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + int main () { + hrtime_t tv; + tv = gethrtime(); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gnupg_cv_func_broken_gethrtime=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gnupg_cv_func_broken_gethrtime=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ echo "$as_me:$LINENO: result: $gnupg_cv_func_broken_gethrtime" >&5 +echo "${ECHO_T}$gnupg_cv_func_broken_gethrtime" >&6; } + if test $gnupg_cv_func_broken_gethrtime = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BROKEN_GETHRTIME 1 +_ACEOF + + fi +fi + + + +for ac_func in mlock +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + if test "$ac_cv_func_mlock" = "no"; then + +for ac_header in sys/mman.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to bug-gnupg@gnu.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_sys_mman_h" = "yes"; then + # Add librt to LIBS: + +{ echo "$as_me:$LINENO: checking for memlk in -lrt" >&5 +echo $ECHO_N "checking for memlk in -lrt... $ECHO_C" >&6; } +if test "${ac_cv_lib_rt_memlk+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char memlk (); +int +main () +{ +return memlk (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_rt_memlk=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_rt_memlk=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_memlk" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_memlk" >&6; } +if test $ac_cv_lib_rt_memlk = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRT 1 +_ACEOF + + LIBS="-lrt $LIBS" + +fi + + { echo "$as_me:$LINENO: checking whether mlock is in sys/mman.h" >&5 +echo $ECHO_N "checking whether mlock is in sys/mman.h... $ECHO_C" >&6; } +if test "${gnupg_cv_mlock_is_in_sys_mman+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #ifdef HAVE_SYS_MMAN_H + #include + #endif + +int +main () +{ + + int i; + + /* glibc defines this for functions which it implements + * to always fail with ENOSYS. Some functions are actually + * named something starting with __ and the normal name + * is an alias. */ + #if defined (__stub_mlock) || defined (__stub___mlock) + choke me + #else + mlock(&i, 4); + #endif + ; return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gnupg_cv_mlock_is_in_sys_mman=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gnupg_cv_mlock_is_in_sys_mman=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $gnupg_cv_mlock_is_in_sys_mman" >&5 +echo "${ECHO_T}$gnupg_cv_mlock_is_in_sys_mman" >&6; } + if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MLOCK 1 +_ACEOF + + fi + fi + fi + if test "$ac_cv_func_mlock" = "yes"; then + + +for ac_func in sysconf getpagesize +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + { echo "$as_me:$LINENO: checking whether mlock is broken" >&5 +echo $ECHO_N "checking whether mlock is broken... $ECHO_C" >&6; } + if test "${gnupg_cv_have_broken_mlock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + gnupg_cv_have_broken_mlock="assume-no" + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +#include +#include +#include + +int main() +{ + char *pool; + int err; + long int pgsize; + +#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) + pgsize = sysconf(_SC_PAGESIZE); +#elif defined(HAVE_GETPAGESIZE) + pgsize = getpagesize(); +#else + pgsize = -1; +#endif + + if(pgsize==-1) + pgsize = 4096; + + pool = malloc( 4096 + pgsize ); + if( !pool ) + return 2; + pool += (pgsize - ((long int)pool % pgsize)); + + err = mlock( pool, 4096 ); + if( !err || errno == EPERM ) + return 0; /* okay */ + + return 1; /* hmmm */ +} + + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gnupg_cv_have_broken_mlock="no" +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gnupg_cv_have_broken_mlock="yes" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi + + if test "$gnupg_cv_have_broken_mlock" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BROKEN_MLOCK 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +for ac_func in plock +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + else + if test "$gnupg_cv_have_broken_mlock" = "no"; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + else + { echo "$as_me:$LINENO: result: assuming no" >&5 +echo "${ECHO_T}assuming no" >&6; } + fi + fi + fi + + + + +for ac_header in sys/stat.h unistd.h direct.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no +fi -{ echo "$as_me:$LINENO: checking for struct sigaction" >&5 -echo $ECHO_N "checking for struct sigaction... $ECHO_C" >&6; } -if test "${ac_cv_type_struct_sigaction+set}" = set; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to bug-gnupg@gnu.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ echo "$as_me:$LINENO: checking if mkdir takes one argument" >&5 +echo $ECHO_N "checking if mkdir takes one argument... $ECHO_C" >&6; } +if test "${gnupg_cv_mkdir_takes_one_arg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21863,16 +23545,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -typedef struct sigaction ac__type_new_; +#include +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif +#ifdef HAVE_DIRECT_H +# include +#endif int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +mkdir ("foo", 0); ; return 0; } @@ -21894,29 +23581,37 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_struct_sigaction=yes + gnupg_cv_mkdir_takes_one_arg=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_struct_sigaction=no + gnupg_cv_mkdir_takes_one_arg=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_sigaction" >&5 -echo "${ECHO_T}$ac_cv_type_struct_sigaction" >&6; } -if test $ac_cv_type_struct_sigaction = yes; then +{ echo "$as_me:$LINENO: result: $gnupg_cv_mkdir_takes_one_arg" >&5 +echo "${ECHO_T}$gnupg_cv_mkdir_takes_one_arg" >&6; } +if test $gnupg_cv_mkdir_takes_one_arg = yes ; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SIGACTION 1 +cat >>confdefs.h <<\_ACEOF +#define MKDIR_TAKES_ONE_ARG 1 _ACEOF - fi -{ echo "$as_me:$LINENO: checking for sigset_t" >&5 -echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6; } -if test "${ac_cv_type_sigset_t+set}" = set; then + + +# +# Prepare building of estream-printf +# + + { echo "$as_me:$LINENO: checking system features for estream-printf" >&5 +echo "$as_me: checking system features for estream-printf" >&6;} + + { echo "$as_me:$LINENO: checking for long long int" >&5 +echo $ECHO_N "checking for long long int... $ECHO_C" >&6; } +if test "${ac_cv_type_long_long_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21925,16 +23620,86 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - -typedef sigset_t ac__type_new_; +long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + typedef int a[((-9223372036854775807LL < 0 + && 0 < 9223372036854775807ll) + ? 1 : -1)]; + int i = 63; +int +main () +{ +long long int llmax = 9223372036854775807ll; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_type_long_long_int=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_long_long_int=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 +echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_LONG_INT 1 +_ACEOF + + fi + + + { echo "$as_me:$LINENO: checking for long double" >&5 +echo $ECHO_N "checking for long double... $ECHO_C" >&6; } +if test "${ac_cv_type_long_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$GCC" = yes; then + ac_cv_type_long_double=yes + else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* The Stardent Vistra knows sizeof (long double), but does + not support it. */ + long double foo = 0.0L; int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + sizeof (double) <= sizeof (long double))]; +test_array [0] = 0 + ; return 0; } @@ -21956,35 +23721,32 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_sigset_t=yes + ac_cv_type_long_double=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_sigset_t=no + ac_cv_type_long_double=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_sigset_t" >&5 -echo "${ECHO_T}$ac_cv_type_sigset_t" >&6; } -if test $ac_cv_type_sigset_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5 +echo "${ECHO_T}$ac_cv_type_long_double" >&6; } + if test $ac_cv_type_long_double = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_SIGSET_T 1 +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_DOUBLE 1 _ACEOF - -fi + fi -# See if getopt is in libiberty. This is of course not optimal since -# it might be somewhere other than libiberty, but does cover the -# mingw32 case. -{ echo "$as_me:$LINENO: checking for getopt" >&5 -echo $ECHO_N "checking for getopt... $ECHO_C" >&6; } -if test "${ac_cv_func_getopt+set}" = set; then + { echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; } +if test "${ac_cv_type_intmax_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21993,53 +23755,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define getopt to an innocuous variant, in case declares getopt. - For example, HP-UX 11i declares gettimeofday. */ -#define getopt innocuous_getopt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getopt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getopt - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char getopt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_getopt || defined __stub___getopt -choke me -#endif - +$ac_includes_default +typedef intmax_t ac__type_new_; int main () { -return getopt (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22048,61 +23784,71 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_getopt=yes + } && test -s conftest.$ac_objext; then + ac_cv_type_intmax_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_getopt=no + ac_cv_type_intmax_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_getopt" >&5 -echo "${ECHO_T}$ac_cv_func_getopt" >&6; } -if test $ac_cv_func_getopt = yes; then - : +{ echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 +echo "${ECHO_T}$ac_cv_type_intmax_t" >&6; } +if test $ac_cv_type_intmax_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INTMAX_T 1 +_ACEOF + else - { echo "$as_me:$LINENO: checking for getopt in -liberty" >&5 -echo $ECHO_N "checking for getopt in -liberty... $ECHO_C" >&6; } -if test "${ac_cv_lib_iberty_getopt+set}" = set; then + test $ac_cv_type_long_long_int = yes \ + && ac_type='long long int' \ + || ac_type='long int' + +cat >>confdefs.h <<_ACEOF +#define intmax_t $ac_type +_ACEOF + +fi + + + + + { echo "$as_me:$LINENO: checking for uintmax_t" >&5 +echo $ECHO_N "checking for uintmax_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uintmax_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liberty $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char getopt (); +$ac_includes_default +typedef uintmax_t ac__type_new_; int main () { -return getopt (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22111,38 +23857,40 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_iberty_getopt=yes + } && test -s conftest.$ac_objext; then + ac_cv_type_uintmax_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_iberty_getopt=no + ac_cv_type_uintmax_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_getopt" >&5 -echo "${ECHO_T}$ac_cv_lib_iberty_getopt" >&6; } -if test $ac_cv_lib_iberty_getopt = yes; then - GETOPT="-liberty" +{ echo "$as_me:$LINENO: result: $ac_cv_type_uintmax_t" >&5 +echo "${ECHO_T}$ac_cv_type_uintmax_t" >&6; } +if test $ac_cv_type_uintmax_t = yes; then -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_UINTMAX_T 1 +_ACEOF + +else + test $ac_cv_type_unsigned_long_long_int = yes \ + && ac_type='unsigned long long int' \ + || ac_type='unsigned long int' + +cat >>confdefs.h <<_ACEOF +#define uintmax_t $ac_type +_ACEOF fi -# -# check for gethrtime and run a testprogram to see whether -# it is broken. It has been reported that some Solaris and HP UX systems -# raise an SIGILL -# -{ echo "$as_me:$LINENO: checking for gethrtime" >&5 -echo $ECHO_N "checking for gethrtime... $ECHO_C" >&6; } -if test "${gnupg_cv_func_gethrtime+set}" = set; then + { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 +echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; } +if test "${ac_cv_type_ptrdiff_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22151,26 +23899,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default +typedef ptrdiff_t ac__type_new_; int main () { - - hrtime_t tv; - tv = gethrtime(); - +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22179,104 +23928,31 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - gnupg_cv_func_gethrtime=yes + } && test -s conftest.$ac_objext; then + ac_cv_type_ptrdiff_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gnupg_cv_func_gethrtime=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $gnupg_cv_func_gethrtime" >&5 -echo "${ECHO_T}$gnupg_cv_func_gethrtime" >&6; } -if test $gnupg_cv_func_gethrtime = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETHRTIME 1 -_ACEOF - - { echo "$as_me:$LINENO: checking whether gethrtime is broken" >&5 -echo $ECHO_N "checking whether gethrtime is broken... $ECHO_C" >&6; } -if test "${gnupg_cv_func_broken_gethrtime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - gnupg_cv_func_broken_gethrtime=assume-no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - int main () { - hrtime_t tv; - tv = gethrtime(); - } - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gnupg_cv_func_broken_gethrtime=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -gnupg_cv_func_broken_gethrtime=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + ac_cv_type_ptrdiff_t=no fi - - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gnupg_cv_func_broken_gethrtime" >&5 -echo "${ECHO_T}$gnupg_cv_func_broken_gethrtime" >&6; } - if test $gnupg_cv_func_broken_gethrtime = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 +echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; } +if test $ac_cv_type_ptrdiff_t = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_GETHRTIME 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_PTRDIFF_T 1 _ACEOF - fi -fi - +fi -for ac_func in mlock -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22285,53 +23961,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default +typedef unsigned long ac__type_new_; int main () { -return $ac_func (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22340,48 +23990,31 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_cv_type_unsigned_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_type_unsigned_long=no fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -done - - if test "$ac_cv_func_mlock" = "no"; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } -for ac_header in sys/mman.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22389,7 +24022,16 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -22408,148 +24050,88 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to bug-gnupg@gnu.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -done - - if test "$ac_cv_header_sys_mman_h" = "yes"; then - # Add librt to LIBS: - -{ echo "$as_me:$LINENO: checking for memlk in -lrt" >&5 -echo $ECHO_N "checking for memlk in -lrt... $ECHO_C" >&6; } -if test "${ac_cv_lib_rt_memlk+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char memlk (); + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -return memlk (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22558,77 +24140,35 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_rt_memlk=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_rt_memlk=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_memlk" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_memlk" >&6; } -if test $ac_cv_lib_rt_memlk = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 -_ACEOF - - LIBS="-lrt $LIBS" - -fi - - { echo "$as_me:$LINENO: checking whether mlock is in sys/mman.h" >&5 -echo $ECHO_N "checking whether mlock is in sys/mman.h... $ECHO_C" >&6; } -if test "${gnupg_cv_mlock_is_in_sys_mman+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - #include - #ifdef HAVE_SYS_MMAN_H - #include - #endif - +$ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { - - int i; - - /* glibc defines this for functions which it implements - * to always fail with ENOSYS. Some functions are actually - * named something starting with __ and the normal name - * is an alias. */ - #if defined (__stub_mlock) || defined (__stub___mlock) - choke me - #else - mlock(&i, 4); - #endif - ; return 0; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22637,94 +24177,62 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - gnupg_cv_mlock_is_in_sys_mman=yes + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gnupg_cv_mlock_is_in_sys_mman=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -{ echo "$as_me:$LINENO: result: $gnupg_cv_mlock_is_in_sys_mman" >&5 -echo "${ECHO_T}$gnupg_cv_mlock_is_in_sys_mman" >&6; } - if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MLOCK 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi - fi - fi - if test "$ac_cv_func_mlock" = "yes"; then + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -for ac_func in sysconf getpagesize -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -return $ac_func (); +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22733,38 +24241,29 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_lo=`expr '(' $ac_mid ')' + 1` fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done - - { echo "$as_me:$LINENO: checking whether mlock is broken" >&5 -echo $ECHO_N "checking whether mlock is broken... $ECHO_C" >&6; } - if test "${gnupg_cv_have_broken_mlock+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - gnupg_cv_have_broken_mlock="assume-no" - +case $ac_lo in +?*) ac_cv_sizeof_unsigned_long=$ac_lo;; +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; +esac else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -22772,44 +24271,38 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include #include -#include -#include -#include -#include -#include - -int main() +int +main () { - char *pool; - int err; - long int pgsize; - -#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) - pgsize = sysconf(_SC_PAGESIZE); -#elif defined(HAVE_GETPAGESIZE) - pgsize = getpagesize(); -#else - pgsize = -1; -#endif - if(pgsize==-1) - pgsize = 4096; - - pool = malloc( 4096 + pgsize ); - if( !pool ) - return 2; - pool += (pgsize - ((long int)pool % pgsize)); - - err = mlock( pool, 4096 ); - if( !err || errno == EPERM ) - return 0; /* okay */ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; - return 1; /* hmmm */ + ; + return 0; } - - _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -22831,37 +24324,40 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gnupg_cv_have_broken_mlock="no" + ac_cv_sizeof_unsigned_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -gnupg_cv_have_broken_mlock="yes" +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - - +rm -f conftest.val fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } - if test "$gnupg_cv_have_broken_mlock" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_MLOCK 1 + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long _ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -for ac_func in plock -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for void *" >&5 +echo $ECHO_N "checking for void *... $ECHO_C" >&6; } +if test "${ac_cv_type_void_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22870,53 +24366,27 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +$ac_includes_default +typedef void * ac__type_new_; int main () { -return $ac_func (); +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22925,68 +24395,176 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + ac_cv_type_void_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_cv_type_void_p=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +echo "${ECHO_T}$ac_cv_type_void_p" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of void *" >&5 +echo $ECHO_N "checking size of void *... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_void_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 -fi -done + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 - else - if test "$gnupg_cv_have_broken_mlock" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - else - { echo "$as_me:$LINENO: result: assuming no" >&5 -echo "${ECHO_T}assuming no" >&6; } - fi - fi - fi + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 -for ac_header in sys/stat.h unistd.h direct.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -23005,111 +24583,186 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +$ac_includes_default + typedef void * ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to bug-gnupg@gnu.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_void_p=$ac_lo;; +'') if test "$ac_cv_type_void_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_void_p=0 + fi ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef void * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +#include +#include +int +main () +{ -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_void_p=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +if test "$ac_cv_type_void_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (void *) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_void_p=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; } -done -{ echo "$as_me:$LINENO: checking if mkdir takes one argument" >&5 -echo $ECHO_N "checking if mkdir takes one argument... $ECHO_C" >&6; } -if test "${gnupg_cv_mkdir_takes_one_arg+set}" = set; then + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOID_P $ac_cv_sizeof_void_p +_ACEOF + + + { echo "$as_me:$LINENO: checking for nl_langinfo and THOUSANDS_SEP" >&5 +echo $ECHO_N "checking for nl_langinfo and THOUSANDS_SEP... $ECHO_C" >&6; } +if test "${estream_cv_langinfo_thousands_sep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23118,33 +24771,23 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_DIRECT_H -# include -#endif +#include int main () { -mkdir ("foo", 0); +char* cs = nl_langinfo(THOUSANDS_SEP); return !cs; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23153,26 +24796,30 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gnupg_cv_mkdir_takes_one_arg=no + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + estream_cv_langinfo_thousands_sep=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gnupg_cv_mkdir_takes_one_arg=yes + estream_cv_langinfo_thousands_sep=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi -{ echo "$as_me:$LINENO: result: $gnupg_cv_mkdir_takes_one_arg" >&5 -echo "${ECHO_T}$gnupg_cv_mkdir_takes_one_arg" >&6; } -if test $gnupg_cv_mkdir_takes_one_arg = yes ; then +{ echo "$as_me:$LINENO: result: $estream_cv_langinfo_thousands_sep" >&5 +echo "${ECHO_T}$estream_cv_langinfo_thousands_sep" >&6; } + if test $estream_cv_langinfo_thousands_sep = yes; then cat >>confdefs.h <<\_ACEOF -#define MKDIR_TAKES_ONE_ARG 1 +#define HAVE_LANGINFO_THOUSANDS_SEP 1 _ACEOF -fi + fi + if test "$use_capabilities" = "yes" ; then @@ -25388,13 +27035,6 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_DOCBOOK_TO_TEXI_TRUE}" && test -z "${HAVE_DOCBOOK_TO_TEXI_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK_TO_TEXI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_DOCBOOK_TO_TEXI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${HAVE_USTAR_TRUE}" && test -z "${HAVE_USTAR_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_USTAR\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -25828,7 +27468,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnupg $as_me 1.4.9, which was +This file was extended by gnupg $as_me 1.4.10, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25885,7 +27525,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnupg config.status 1.4.9 +gnupg config.status 1.4.10 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -26229,9 +27869,6 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -DOCBOOK_TO_TEXI!$DOCBOOK_TO_TEXI$ac_delim -HAVE_DOCBOOK_TO_TEXI_TRUE!$HAVE_DOCBOOK_TO_TEXI_TRUE$ac_delim -HAVE_DOCBOOK_TO_TEXI_FALSE!$HAVE_DOCBOOK_TO_TEXI_FALSE$ac_delim TAR!$TAR$ac_delim HAVE_USTAR_TRUE!$HAVE_USTAR_TRUE$ac_delim HAVE_USTAR_FALSE!$HAVE_USTAR_FALSE$ac_delim @@ -26326,6 +27963,9 @@ MPI_EXTRA_ASM_OBJS!$MPI_EXTRA_ASM_OBJS$ac_delim MPI_SFLAGS!$MPI_SFLAGS$ac_delim USE_INTERNAL_REGEX_TRUE!$USE_INTERNAL_REGEX_TRUE$ac_delim +USE_INTERNAL_REGEX_FALSE!$USE_INTERNAL_REGEX_FALSE$ac_delim +ENABLE_LOCAL_ZLIB_TRUE!$ENABLE_LOCAL_ZLIB_TRUE$ac_delim +ENABLE_LOCAL_ZLIB_FALSE!$ENABLE_LOCAL_ZLIB_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -26367,9 +28007,6 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -USE_INTERNAL_REGEX_FALSE!$USE_INTERNAL_REGEX_FALSE$ac_delim -ENABLE_LOCAL_ZLIB_TRUE!$ENABLE_LOCAL_ZLIB_TRUE$ac_delim -ENABLE_LOCAL_ZLIB_FALSE!$ENABLE_LOCAL_ZLIB_FALSE$ac_delim ENABLE_BZIP2_SUPPORT_TRUE!$ENABLE_BZIP2_SUPPORT_TRUE$ac_delim ENABLE_BZIP2_SUPPORT_FALSE!$ENABLE_BZIP2_SUPPORT_FALSE$ac_delim ZLIBS!$ZLIBS$ac_delim @@ -26390,7 +28027,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -26791,21 +28428,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -26868,7 +28506,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ @@ -27136,9 +28774,3 @@ echo " Extra cpu specific functions:$show_extraasm" fi echo - -if test x"$use_camellia" = xyes ; then - echo "WARNING: The Camellia cipher is for testing only and is NOT for production use!" - echo -fi - diff -Nru gnupg-1.4.9/configure.ac gnupg-1.4.10/configure.ac --- gnupg-1.4.9/configure.ac 2008-03-26 17:26:49.000000000 +0000 +++ gnupg-1.4.10/configure.ac 2009-09-02 14:47:36.000000000 +0100 @@ -1,6 +1,6 @@ # configure.ac script for GnuPG # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -# 2008 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -25,13 +25,12 @@ # Remember to change the version number immediately *after* a release. # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh --force" right before creating a distribution. -m4_define([my_version], [1.4.9]) +m4_define([my_version], [1.4.10]) m4_define([my_issvn], [no]) - -m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \ - || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \ - tr -d '\n'])) -AC_INIT([gnupg], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]), +m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ + | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) +AC_INIT([gnupg], + [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])], [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 @@ -140,7 +139,7 @@ use_blowfish=yes use_aes=yes use_twofish=yes -use_camellia=no +use_camellia=yes use_sha256=yes use_sha512=yes use_bzip2=yes @@ -151,7 +150,6 @@ AC_ARG_ENABLE(minimal, AC_HELP_STRING([--enable-minimal],[build the smallest gpg binary possible]), - try_gettext=no try_dns=no use_rsa=no use_idea=no @@ -264,10 +262,6 @@ AC_MSG_RESULT($use_camellia) if test x"$use_camellia" = xyes ; then AC_DEFINE(USE_CAMELLIA,1,[Define to include the CAMELLIA cipher]) - AC_MSG_WARN([[ -*** -*** The Camellia cipher is for testing only and is NOT for production use! -***]]) fi AC_MSG_CHECKING([whether to enable the SHA-224 and SHA-256 digests]) @@ -504,6 +498,11 @@ #define SAFE_VERSION_DOT '.' #define SAFE_VERSION_DASH '-' +/* We want to use our memory allocator for estream-printf. */ +#define _ESTREAM_PRINTF_MALLOC xtrymalloc +#define _ESTREAM_PRINTF_FREE xfree +#define _ESTREAM_PRINTF_EXTRA_INCLUDE "memory.h" + #endif /*GNUPG_CONFIG_H_INCLUDED*/ ]) @@ -532,7 +531,6 @@ AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes) GNUPG_CHECK_FAQPROG -GNUPG_CHECK_DOCBOOK_TO_TEXI GNUPG_CHECK_USTAR @@ -762,8 +760,9 @@ fi # Check for curl. We fake the curl API if libcurl isn't installed. +# We require 7.10 or better as we use curl_version_info(). -LIBCURL_CHECK_CONFIG([yes],,,[fake_curl=yes]) +LIBCURL_CHECK_CONFIG([yes],[7.10],,[fake_curl=yes]) AM_CONDITIONAL(FAKE_CURL,test x"$fake_curl" = xyes) # Generic, for us, means curl @@ -947,6 +946,19 @@ AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned long) AC_CHECK_SIZEOF(unsigned long long) +AC_CHECK_SIZEOF(time_t,,[[ +#include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +]]) # Ensure that we have UINT64_C before we bother to check for uint64_t AC_CHECK_HEADERS([inttypes.h]) @@ -1041,6 +1053,12 @@ GNUPG_CHECK_MLOCK GNUPG_FUNC_MKDIR_TAKES_ONE_ARG +# +# Prepare building of estream-printf +# +estream_PRINTF_INIT + + dnl dnl Check whether we can use Linux capabilities as requested dnl @@ -1440,9 +1458,3 @@ echo " Extra cpu specific functions:$show_extraasm" fi echo - -if test x"$use_camellia" = xyes ; then - echo "WARNING: The Camellia cipher is for testing only and is NOT for production use!" - echo -fi - diff -Nru gnupg-1.4.9/debian/changelog gnupg-1.4.10/debian/changelog --- gnupg-1.4.9/debian/changelog 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/changelog 2010-02-11 06:24:39.000000000 +0000 @@ -1,3 +1,208 @@ +gnupg (1.4.10-2ubuntu1~ppa1~jaunty1) jaunty; urgency=low + + * Backport to Jaunty. + + -- Nicola Ferralis Tue, 09 Feb 2010 22:48:12 -0800 + +gnupg (1.4.10-2ubuntu1) lucid; urgency=low + + * Merge from Debian testing (lp: #503064, #477818). Remaining changes: + - Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test + since it fails with ulimit 0 (on buildds). + - Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg + (or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485) + - Fix udeb build failure on powerpc, building with -O2 instead of -Os. + + -- Michael Bienia Mon, 04 Jan 2010 20:06:01 +0100 + +gnupg (1.4.10-2) unstable; urgency=low + + [ Thijs Kinkhorst ] + * Correct build issue when backporting to lenny, thanks Andreas Metzler + (closes: #545268). + + [ Daniel Leidert ] + * debian/control: Added gnupg-curl package which ships the keyserver helper + tools built with libcurl. gnupg recommends this package. + (Build-Depends): Changed to generic libreadline-dev (see pkg-gnupg-maint + list 09/2009). + (Description): Adjusted for gnupg vs. gnupg-curl. + * debian/gnupg.doc-base.faq: Added to register the GnuPG FAQ with doc-base. + * debian/gnupg-curl.preinst, + debian/gnupg-curl.postrm: Added to add/remove the diversions for + gpgkeys_curl and gpgkeys_hkp. + * debian/rules: Added targets to build the gnupg binary and helper tools + explicitly with libcurl. Move the gpgkeys_curl and gpgkeys_hkp keyserver + tools built with libcurl into the gnupg-curl package. + (build-deb/config.status): Build the gnupg binary with the "curl shim" + variant and without libcurl, so we don't depend on packages with priority + lower important (closes: #545275). + (install): Delete /usr/share/info/dir.gz (closes: #546552). + (binary-arch): Add missing relevant ChangeLog files. + + -- Thijs Kinkhorst Fri, 25 Sep 2009 10:34:50 +0200 + +gnupg (1.4.10-1) unstable; urgency=low + + [ Daniel Leidert (dale) ] + * New upstream release GnuPG 1.4.10. + - Better cope with unicode characters in any output (closes: #540340). + - Output a warning when trying to revoke a signature from a key, + that is not signed by any of your keys (closes: #543530). + + For more information please read /usr/share/doc/gnupg/changelog.gz. + + * debian/control (Standards-Version): Bumped to 3.8.3. + * debian/gnupg.bug-presubj: Added note about debian/README.BUGS.Debian. + * debian/gnupg.docs: Added debian/README.BUGS.Debian. + * debian/gnupg.udev: Added udev rules to support several SCM smartcard + readers. Thanks to Michael Bienia (closes: #543216). + * debian/rules (binary-arch): Install udev rules and bug control files. + * debian/README.BUGS.Debian: Added. Collect information about limitations + which have been reported to the BTS and might be in the future too. This + will replace the open bug reports, so the bug count decreases and + readability increases (closes: #44910, #89094, #282061, #359758, #427857, + #472642, #485458). + * debian/patches/24_gpgv_manpage_cleanup.dpatch: Dropped (applied upstream). + * debian/patches/25_fr.po_fixes.dpatch: Ditto. + * debian/patches/25_it.po_fixes.dpatch: Ditto. + + [ Thijs Kinkhorst ] + * Add misc:depends substvar to facilitate install-info transition. + + -- Thijs Kinkhorst Sat, 05 Sep 2009 15:43:18 +0200 + +gnupg (1.4.10~rc1-1) experimental; urgency=low + + * First release candidate of GnuPG 1.4.10. + - Improved lockfile handling (closes: #58260). + - Fixes error using the --local-user switch together with the same options + string (closes: #130363). + - Fixes memory leak importing (large) keyrings (closes: #172115, #345911). + - Send HTTP requests with "Pragma: no-cache" (closes: #177716). + - Reference to unimplemented --fix-trustdb switch has been replaced by + short howto for recovery (closes: #196860). + - Resets terminal after SIGINT (LP: #294115; closes: #321871). + - Fixes error using the --fingerprint switch together with the + with-fingerprint options string (closes: #382794). + - Removing some strange old special case code in gpg fixes an error thrown + for a special signature (closes: #402600). This needs well testing ... + see https://bugs.g10code.com/gnupg/issue931. + - Fixes misleading error messages (closes: #205596, #494040). + - Fixes building with libcurl (closes: #502558). + - Fixes a parsing loop specific to amd64 systems (closes: #503853). + - Fixes the non-zero exit status after smartcard insert prompt (closes: + #513464). + - Fixes/improves documentation (LP: #389694; closes: #496921, #527351). + - Fixes several issues in the German (closes: #536827), the Dutch + (LP: #397395) and the French (closes: #525404) translation. + - Added IDN (Internationalized Domain Names) support (closes: #537122). + + For more information please read /usr/share/doc/gnupg/changelog.gz. + + [ Thijs Kinkhorst ] + * Re-enable build-time tests, accidentally disabled due to false + logic in debian/rules. Thanks Neil Williams, closes: #521884. + * Checked for policy 3.8.2 and updated to debhelper 7. + * Install NEWS as upstream changelog. + + [ Daniel Leidert ] + * debian/control (Build-Depends): Added libcurl4-gnutls-dev (LP: #62864). + * debian/rules (CONFARGS): Add --enable-noexecstack to build gnupg without + executable stack on i386 (LP: #49323; closes: #527630). + (binary-arch): Register .info documentation (closes: #527570). + * debian/patches/24_gpgv_manpage_cleanup.dpatch: Party dropped (applied + upstream). + * debian/patches/25_de.po_fixes.dpatch: Dropped (applied upstream). + * debian/patches/99_yat2m_fix_samp_handling.dpatch: Ditto. + * debian/patches/00list: Adjusted. + + -- Thijs Kinkhorst Sat, 15 Aug 2009 18:43:03 +0200 + +gnupg (1.4.9-4ubuntu7) karmic; urgency=low + + * Fix udeb build failure on powerpc, building with -O2 instead of -Os. + + -- Matthias Klose Sun, 27 Sep 2009 13:49:46 +0200 + +gnupg (1.4.9-4ubuntu6) karmic; urgency=low + + * Build-depend on libreadline-dev instead of libreadline5-dev. + + -- Matthias Klose Sat, 19 Sep 2009 22:52:53 +0200 + +gnupg (1.4.9-4ubuntu5) karmic; urgency=low + + * debian/gnupg.udev: + Add udev rules to set ACLs on SCM smartcard readers. They replace the hal + rules for the same purpose. (LP: #57755) + * debian/rules: + Call dh_installudev. + + -- Michael Bienia Fri, 03 Jul 2009 15:38:40 +0200 + +gnupg (1.4.9-4ubuntu4) karmic; urgency=low + + * Undo the last change. A GnuPG bug with handling multiple keyservers + makes this break + + -- Mackenzie Morgan Sat, 20 Jun 2009 18:04:47 -0400 + +gnupg (1.4.9-4ubuntu3) karmic; urgency=low + + * deian/patches/100_ubuntu_default_keyserver.dpatch: (LP: #380093) + - Add keyserver.ubuntu.com as a default keyserver in g10/options.skel + + -- Mackenzie Morgan Mon, 25 May 2009 13:10:51 -0400 + +gnupg (1.4.9-4ubuntu2) karmic; urgency=low + + * debian/rules: add --enable-noexecstack to configure to avoid needless + executable stacks on i386 (LP: #49323, debian bug 527630). + * debian/rules: fix "nocheck" logic to run tests (debian bug 521884). + + -- Kees Cook Fri, 08 May 2009 09:12:18 -0700 + +gnupg (1.4.9-4ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test + since it fails with ulimit 0 (on buildds). + - Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg + (or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485) + - Add libcurl4-gnutls-dev to Build-Depends to fix gpg running into a + timeout updating the keyring (lp: 62864) + - Add 'debian/patches/55_curl_typefix.dpatch': Fix a build error with recent + curl and gcc 4.3 + + -- Nicolas Valcárcel Scerpella Tue, 05 May 2009 16:02:14 -0500 + +gnupg (1.4.9-4) unstable; urgency=low + + [ Daniel Leidert (dale) ] + * debian/compat: Added to define debhelper compat level 5. + * debian/control: (Build-Depends): Added debhelper v5. + * debian/gnupg.dirs: Added for new debhelper-based debian/rules. + * debian/gnupg.docs: Ditto. + * debian/gnupg.links: Ditto. + * debian/gnupg.manpages: Ditto. + * debian/gnupg-udeb.install: Ditto. + * debian/gpgv.files: Ditto. + * debian/gpgv-udeb.install: Ditto. + * debian/rules: Complete rewrite using debhelper (closes: #437050, #430459). + + [ Thijs Kinkhorst ] + * We don't install setuid root anymore, and have not even built + with capability support anyway in recent times. Drop libcap-dev + build-dependency and associated patches. (Closes: #492622). + * No longer install gpg-convert-from-106 in the path, but ship + this script to convert from GnuPG 1.0.6 and earlier as an + example. + * Add --disable-asm build flag on ppc64 architecture (Closes: #343434). + * Rephrase description on the subject of IDEA (Closes: #509853). + + -- Thijs Kinkhorst Mon, 16 Feb 2009 18:35:15 +0100 + gnupg (1.4.9-3ubuntu1) intrepid; urgency=low * Merge from debian unstable (lp: #225005), remaining changes: diff -Nru gnupg-1.4.9/debian/compat gnupg-1.4.10/debian/compat --- gnupg-1.4.9/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/compat 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1 @@ +7 diff -Nru gnupg-1.4.9/debian/control gnupg-1.4.10/debian/control --- gnupg-1.4.9/debian/control 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/control 2010-02-11 06:24:39.000000000 +0000 @@ -1,16 +1,15 @@ Source: gnupg Section: utils Priority: important -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GnuPG-Maintainers Uploaders: Sune Vuorela , Daniel Leidert (dale) , Thijs Kinkhorst -Standards-Version: 3.8.0 -Build-Depends: libz-dev, libldap2-dev, libbz2-dev, - libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], +Standards-Version: 3.8.3 +Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev, libusb-dev [!hurd-i386], - libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12), + libreadline-dev, file, gettext, dpatch, libcurl4-gnutls-dev Homepage: http://www.gnupg.org Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/ @@ -18,25 +17,45 @@ Package: gnupg Architecture: any -Depends: ${shlibs:Depends}, gpgv -Recommends: ${shlibs:Recommends} +Depends: ${shlibs:Depends}, ${misc:Depends}, gpgv +Recommends: ${shlibs:Recommends}, gnupg-curl Suggests: gnupg-doc, xloadimage | imagemagick | eog, libpcsclite1 -Conflicts: seahorse (<< 2.22.2-2) Description: GNU privacy guard - a free PGP replacement GnuPG is GNU's tool for secure communication and data storage. It can be used to encrypt data and to create digital signatures. It includes an advanced key management facility and is compliant with the proposed OpenPGP Internet standard as described in RFC2440. . - GnuPG does not use any patented algorithms so it cannot be compatible - with PGP2 because it uses IDEA (which is patented worldwide). + The gnupg package is built without libcurl. So it does not support + HKPS keyservers. Install the gnupg-curl package if you want to use + the keyserver helper tools built with libcurl and supporting HKPS. + . + GnuPG does not use any patented algorithms. This means it cannot be + compatible with PGP2, because that uses IDEA (which is patented in + a number of countries). + +Package: gnupg-curl +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, ${shlibs:Recommends}, ${misc:Depends}, gnupg +Description: GNU privacy guard - a free PGP replacement (cURL) + GnuPG is GNU's tool for secure communication and data storage. + It can be used to encrypt data and to create digital signatures. + It includes an advanced key management facility and is compliant + with the proposed OpenPGP Internet standard as described in RFC2440. + . + This package contains the keyserver helper tools built with libcurl, + which replace the ones in the gnupg package built with the "curl shim" + variant of gnupg. This package provides support for HKPS keyservers. + . + GnuPG does not use any patented algorithms. This means it cannot be + compatible with PGP2, because that uses IDEA (which is patented in + a number of countries). Package: gpgv Architecture: any -Priority: important -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: gnupg -Replaces: gnupg (<< 1.4.5-2) Description: GNU privacy guard - signature verification tool GnuPG is GNU's tool for secure communication and data storage. . @@ -50,7 +69,7 @@ Section: debian-installer Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: GNU privacy guard - a free PGP replacement GnuPG is GNU's tool for secure communication and data storage. It can be used to encrypt data and to create digital signatures. @@ -64,7 +83,7 @@ Section: debian-installer Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: minimal signature verification tool GnuPG is GNU's tool for secure communication and data storage. It can be used to encrypt data and to create digital signatures. diff -Nru gnupg-1.4.9/debian/copyright gnupg-1.4.10/debian/copyright --- gnupg-1.4.9/debian/copyright 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/copyright 2010-02-11 06:24:39.000000000 +0000 @@ -9,8 +9,9 @@ - adding support for the Debian package maintenance scheme, by adding various debian/* files. -Program Copyright (C) 1998-2008 Free Software Foundation, Inc. -Modifications for Debian Copyright (C) 1998-2006 James Troup. +Program Copyright (C) 1998-2009 Free Software Foundation, Inc. +Modifications for Debian Copyright (C) 1998-2006 James Troup, +2008-2009 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst. 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 diff -Nru gnupg-1.4.9/debian/gnupg.bug-presubj gnupg-1.4.10/debian/gnupg.bug-presubj --- gnupg-1.4.9/debian/gnupg.bug-presubj 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.bug-presubj 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,2 @@ +Please consider reading /usr/share/doc/gnupg/README.BUGS.Debian before +sending a bug report. Maybe you'll find your problem there. diff -Nru gnupg-1.4.9/debian/gnupg-curl.postrm gnupg-1.4.10/debian/gnupg-curl.postrm --- gnupg-1.4.9/debian/gnupg-curl.postrm 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg-curl.postrm 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,17 @@ +#!/bin/sh +# postrm script for gnupg-curl +# +# see: dh_installdeb(1) + +set -e + +if [ "$1" = remove ] ; then + dpkg-divert --package gnupg-curl --rename \ + --remove /usr/lib/gnupg/gpgkeys_curl + dpkg-divert --package gnupg-curl --rename \ + --remove /usr/lib/gnupg/gpgkeys_hkp +fi + +#DEBHELPER# + +exit 0 diff -Nru gnupg-1.4.9/debian/gnupg-curl.preinst gnupg-1.4.10/debian/gnupg-curl.preinst --- gnupg-1.4.9/debian/gnupg-curl.preinst 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg-curl.preinst 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,19 @@ +#!/bin/sh +# preinst script for gnupg-curl +# +# see: dh_installdeb(1) + +set -e + +if [ "$1" = install ] || [ "$1" = upgrade ] ; then + dpkg-divert --package gnupg-curl \ + --divert /usr/lib/gnupg/gpgkeys_curl.non_curl \ + --rename /usr/lib/gnupg/gpgkeys_curl + dpkg-divert --package gnupg-curl \ + --divert /usr/lib/gnupg/gpgkeys_hkp.non_curl \ + --rename /usr/lib/gnupg/gpgkeys_hkp +fi + +#DEBHELPER# + +exit 0 diff -Nru gnupg-1.4.9/debian/gnupg.dirs gnupg-1.4.10/debian/gnupg.dirs --- gnupg-1.4.9/debian/gnupg.dirs 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.dirs 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/doc/gnupg +usr/share/man/ru/man1 diff -Nru gnupg-1.4.9/debian/gnupg.doc-base.faq gnupg-1.4.10/debian/gnupg.doc-base.faq --- gnupg-1.4.9/debian/gnupg.doc-base.faq 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.doc-base.faq 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,11 @@ +Document: gnupg-faq +Title: GnuPG Frequently Asked Questions +Author: David D. Scribner +Abstract: The GnuPG FAQ contains a list of frequently occuring questions + and their answers regarding installation, usage, compatibility, + issues, warning and error messages of GnuPG. +Section: System/Security + +Format: HTML +Index: /usr/share/doc/gnupg/faq.html +Files: /usr/share/doc/gnupg/faq.html diff -Nru gnupg-1.4.9/debian/gnupg.docs gnupg-1.4.10/debian/gnupg.docs --- gnupg-1.4.9/debian/gnupg.docs 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.docs 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,10 @@ +README +THANKS +TODO +doc/DETAILS +doc/FAQ +doc/faq.html +doc/highlights-1.4.txt +doc/OpenPGP +debian/Upgrading_From_PGP.txt +debian/README.BUGS.Debian diff -Nru gnupg-1.4.9/debian/gnupg.examples gnupg-1.4.10/debian/gnupg.examples --- gnupg-1.4.9/debian/gnupg.examples 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.examples 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1 @@ +tools/convert-from-106 diff -Nru gnupg-1.4.9/debian/gnupg.install gnupg-1.4.10/debian/gnupg.install --- gnupg-1.4.9/debian/gnupg.install 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.install 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1 @@ +tools/lspgpot usr/bin diff -Nru gnupg-1.4.9/debian/gnupg.manpages gnupg-1.4.10/debian/gnupg.manpages --- gnupg-1.4.9/debian/gnupg.manpages 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.manpages 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,3 @@ +debian/gpgsplit.1 +debian/lspgpot.1 +debian/gpg-zip.1 diff -Nru gnupg-1.4.9/debian/gnupg-udeb.install gnupg-1.4.10/debian/gnupg-udeb.install --- gnupg-1.4.9/debian/gnupg-udeb.install 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg-udeb.install 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1 @@ +build-udeb/g10/gpg usr/bin/ diff -Nru gnupg-1.4.9/debian/gnupg.udev gnupg-1.4.10/debian/gnupg.udev --- gnupg-1.4.9/debian/gnupg.udev 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gnupg.udev 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="usb", GOTO="gnupg_rules_end" +ACTION!="add", GOTO="gnupg_rules_end" + +# USB SmartCard Readers +## SCM readers (SCR335, SPR532, & Co) +ATTR{idVendor}=="04e6", ATTR{idProduct}=="e001", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" +ATTR{idVendor}=="04e6", ATTR{idProduct}=="e003", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" +ATTR{idVendor}=="04e6", ATTR{idProduct}=="5115", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" + +LABEL="gnupg_rules_end" diff -Nru gnupg-1.4.9/debian/gpg-convert-from-106.1 gnupg-1.4.10/debian/gpg-convert-from-106.1 --- gnupg-1.4.9/debian/gpg-convert-from-106.1 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/gpg-convert-from-106.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -.TH "gpg-convert-from-106" 1 "December 2005" - -.SH NAME -gpg-convert-from-106 \- converts your public keyring and trustdb from GnuPG -1.0.6 to later formats. - -.SH SYNOPSIS -.B gpg-convert-from-106 - - -.SH DESCRIPTION -.B gpg-convert-from-106 -converts your public keyring and trustdb from GnuPG 1.0.6 or earlier to the -1.0.7 and later format. - -.SH AUTHOR -Copyright (C) 2002 Free Software Foundation, Inc. Please report bugs to -. - -This manpage was written by Francois Wendling . - diff -Nru gnupg-1.4.9/debian/gpgv.files gnupg-1.4.10/debian/gpgv.files --- gnupg-1.4.9/debian/gpgv.files 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gpgv.files 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin/gpgv +usr/share/man/man1/gpgv.1 diff -Nru gnupg-1.4.9/debian/gpgv-udeb.install gnupg-1.4.10/debian/gpgv-udeb.install --- gnupg-1.4.9/debian/gpgv-udeb.install 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/gpgv-udeb.install 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1 @@ +build-udeb/g10/gpgv usr/bin/ diff -Nru gnupg-1.4.9/debian/patches/00list gnupg-1.4.10/debian/patches/00list --- gnupg-1.4.9/debian/patches/00list 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/00list 2010-02-11 06:24:39.000000000 +0000 @@ -1,10 +1,2 @@ -15_free_caps -16_min_privileges -24_gpgv_manpage_cleanup -25_de.po_fixes -25_it.po_fixes -25_fr.po_fixes 50_disable_mlock_test -55_curl_typefix 61_use_agent_default -99_yat2m_fix_samp_handling diff -Nru gnupg-1.4.9/debian/patches/15_free_caps.dpatch gnupg-1.4.10/debian/patches/15_free_caps.dpatch --- gnupg-1.4.9/debian/patches/15_free_caps.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/15_free_caps.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_free_caps.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: cap_from_text() allocates a new capability context, which is not freed -## DP: in the original sources. This patch fixes this. -## DP: Please note that this approach alone is not safe: when using -## DP: USE_CAPABILITIES the root user is not setuid() back any more to a normal -## DP: user. - -@DPATCH@ -diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c gnupg-1.2.5/g10/status.c ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c 2004-07-21 09:59:45.000000000 +0200 -+++ gnupg-1.2.5/g10/status.c 2004-08-01 20:07:42.071690680 +0200 -@@ -346,6 +346,9 @@ - { - char buf[100]; - struct shmid_ds shmds; -+#ifdef USE_CAPABILITIES -+ cap_t caps; -+#endif - - #ifndef IPC_RMID_DEFERRED_RELEASE - atexit( remove_shmid ); -@@ -371,7 +374,9 @@ - (unsigned)shm_size/1024, shm_area, shm_id ); - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - /* (need the cast for Solaris with Sun's workshop compilers) */ - if ( mlock ( (char*)shm_area, shm_size) ) -@@ -380,7 +385,9 @@ - else - shm_is_locked = 1; - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - -@@ -407,7 +414,9 @@ - - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - #ifdef IPC_HAVE_SHM_LOCK - if ( shmctl (shm_id, SHM_LOCK, 0) ) -@@ -419,7 +428,9 @@ - log_info("Locking shared memory %d failed: No way to do it\n", shm_id ); - #endif - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - -diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c gnupg-1.2.5/util/secmem.c ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c 2004-02-24 17:06:58.000000000 +0100 -+++ gnupg-1.2.5/util/secmem.c 2004-08-01 20:08:10.873412378 +0200 -@@ -97,12 +97,18 @@ - { - #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK) - int err; -+ cap_t caps; -+ -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); - err = mlock( p, n ); - if( err && errno ) - err = errno; -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - if( err ) { - if( errno != EPERM -@@ -301,8 +307,12 @@ - if( !n ) { - #ifndef __riscos__ - #ifdef USE_CAPABILITIES -+ cap_t caps; -+ - /* drop all capabilities */ -- cap_set_proc( cap_from_text("all-eip") ); -+ caps = cap_from_text("all-eip"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - #elif !defined(HAVE_DOSISH_SYSTEM) - uid_t uid; diff -Nru gnupg-1.4.9/debian/patches/16_min_privileges.dpatch gnupg-1.4.10/debian/patches/16_min_privileges.dpatch --- gnupg-1.4.9/debian/patches/16_min_privileges.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/16_min_privileges.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 16_min_privileges.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: when using USE_CAPABILITIES, the uid was not setuid() back to a normal -## DP: user; this would allow to regain _all_ capabilities just by doing -## DP: exec(). This patch ensures minimal privileges by immediately revoking -## DP: root user and all capabilities except CAP_IPC_LOCK. After the shared -## DP: memory is set up, this last capability is dropped as well. - -@DPATCH@ -diff -urNad gnupg-1.4.0/g10/gpg.c /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c ---- gnupg-1.4.0/g10/gpg.c 2004-12-16 09:47:36.000000000 +0000 -+++ /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c 2005-02-03 23:31:40.645873299 +0000 -@@ -69,6 +69,11 @@ - #endif - - -+#ifdef USE_CAPABILITIES -+#include -+#include -+#endif -+ - enum cmd_and_opt_values - { - aNull = 0, -@@ -1618,6 +1623,10 @@ - #ifdef USE_SHM_COPROCESSING - ulong requested_shm_size=0; - #endif -+#ifdef USE_CAPABILITIES -+ uid_t curr_uid; -+ cap_t caps; -+#endif - - #ifdef __riscos__ - opt.lock_once = 1; -@@ -1629,6 +1638,33 @@ - * when adding any stuff between here and the call to - * secmem_init() somewhere after the option parsing - */ -+ -+ /* if we use capabilities and run as root, we can immediately setuid back -+ * to the normal user and only keep CAP_IPC_LOCK until the shared memory is -+ * set up. -+ */ -+#ifdef USE_CAPABILITIES -+ curr_uid = getuid(); -+ if( curr_uid && !geteuid() ) { /* we are setuid root */ -+ if( prctl( PR_SET_KEEPCAPS, 1, 0, 0, 0 ) ) { -+ perror( "main(): could not keep capabilities" ); -+ return -100; -+ } -+ -+ if( setuid( curr_uid ) ) { -+ perror( "main(): could not set user id" ); -+ return -100; -+ } -+ -+ caps = cap_from_text( "cap_ipc_lock=p" ); -+ if( cap_set_proc( caps ) ) { -+ perror( "main(): could not install capabilities" ); -+ return -100; -+ } -+ cap_free( caps ); -+ } -+#endif -+ - log_set_name("gpg"); - secure_random_alloc(); /* put random number into secure memory */ - may_coredump = disable_core_dumps(); -@@ -1747,7 +1783,7 @@ - } - #endif - /* initialize the secure memory. */ -- got_secmem=secmem_init( 32768 ); -+ got_secmem=secmem_init( 32768 ); /* this will drop all remaining privileges */ - maybe_setuid = 0; - /* Okay, we are now working under our real uid */ - diff -Nru gnupg-1.4.9/debian/patches/24_gpgv_manpage_cleanup.dpatch gnupg-1.4.10/debian/patches/24_gpgv_manpage_cleanup.dpatch --- gnupg-1.4.9/debian/patches/24_gpgv_manpage_cleanup.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/24_gpgv_manpage_cleanup.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 24_gpgv_manpage_cleanup.dpatch -## -## DP: Description: Small fixes for gpgv manpage (#177951) -## DP: Author: "Jim W. Jaszewski" -## DP: Upstream status: https://bugs.g10code.com/gnupg/issue917 -## DP: Upstream status: https://bugs.g10code.com/gnupg/issue918 -## DP: Date: 2003-01-22 - -@DPATCH@ -diff -urNad gnupg-1.4.6~/doc/gpgv.texi gnupg-1.4.6/doc/gpgv.texi ---- gnupg-1.4.6~/doc/gpgv.texi 2006-12-04 14:01:31.000000000 +0000 -+++ gnupg-1.4.6/doc/gpgv.texi 2006-12-07 02:33:20.000000000 +0000 -@@ -55,8 +55,8 @@ - @mansect description - @code{@gpgvname} is an OpenPGP signature verification tool. - --This program is actually a stripped down version of @code{gpg} which is --only able to check signatures. It is somewhat smaller than the fully blown -+This program is actually a stripped-down version of @code{gpg} which is -+only able to check signatures. It is somewhat smaller than the fully-blown - @code{gpg} and uses a different (and simpler) way to check that - the public keys used to make the signature are valid. There are - no configuration files and only a few options are implemented. -@@ -114,7 +114,7 @@ - - @mansect return value - --The program returns 0 if everything was fine, 1 if at least -+The program returns 0 if everything is fine, 1 if at least - one signature was bad, and other error codes for fatal errors. - - @mansect examples -@@ -126,7 +126,7 @@ - @itemx @gpgvname @code{sigfile} - Verify the signature of the file. The second form - is used for detached signatures, where @code{sigfile} is the detached --signature (either ASCII armored or binary) and are the signed -+signature (either ASCII-armored or binary) and are the signed - data; if this is not given the name of the file holding the signed data is - constructed by cutting off the extension (".asc", ".sig" or ".sign") from - @code{sigfile}. -@@ -152,7 +152,7 @@ - @table @asis - - @item ~/.gnupg/trustedkeys.gpg --The default keyring with the allowed keys -+The default keyring with the allowed keys. - - @end table - -diff -urNad gnupg-1.4.6~/doc/opt-homedir.texi gnupg-1.4.6/doc/opt-homedir.texi ---- gnupg-1.4.6~/doc/opt-homedir.texi 2006-12-04 13:31:56.000000000 +0000 -+++ gnupg-1.4.6/doc/opt-homedir.texi 2006-12-07 02:32:48.000000000 +0000 -@@ -1,11 +1,11 @@ - @c This option is included at several places. - @item --homedir @var{dir} - @opindex homedir --Set the name of the home directory to @var{dir}. If his option is not -+Set the name of the home directory to @var{dir}. If this 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 @env{GNUPGHOME} or --(on W32 systems) by means on the Registry entry -+(on W32 systems) by means of the Registry entry - @ifset isman - @var{HKCU\\Software\\GNU\\GnuPG:HomeDir}. - @end ifset diff -Nru gnupg-1.4.9/debian/patches/25_de.po_fixes.dpatch gnupg-1.4.10/debian/patches/25_de.po_fixes.dpatch --- gnupg-1.4.9/debian/patches/25_de.po_fixes.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/25_de.po_fixes.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_de.po_fixes.dpatch -## -## DP: Description: Small fixes for the German translation (#314069) -## DP: Author: Jens Seidel -## DP: Updates by Daniel Leidert -## DP: Upstream status: https://bugs.g10code.com/gnupg/issue916 -## DP: Date: 2008-05-21 - -@DPATCH@ -diff -urNad experimental~/po/de.po experimental/po/de.po ---- experimental~/po/de.po 2008-03-25 09:53:06.000000000 +0100 -+++ experimental/po/de.po 2008-05-21 22:43:35.000000000 +0200 -@@ -1248,7 +1248,7 @@ - - #: g10/gpg.c:803 - msgid "Pubkey: " --msgstr "Öff.Schlüssel: " -+msgstr "Öff. Schlüssel: " - - #: g10/gpg.c:809 g10/keyedit.c:2306 - msgid "Cipher: " -@@ -2350,7 +2350,7 @@ - #: g10/import.c:318 - #, c-format - msgid " secret keys unchanged: %lu\n" --msgstr " unveränderte geh.Schl.: %lu\n" -+msgstr " unveränderte geh. Schl.: %lu\n" - - #: g10/import.c:320 - #, c-format -@@ -2400,7 +2400,7 @@ - #: g10/import.c:645 - msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" - msgstr "" --"diesen Schüssel wieder zu verteilen, um mögliche Probleme durch unpassende " -+"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende " - "Verfahrenskombinationen zu vermeiden\n" - - #: g10/import.c:669 -@@ -3029,7 +3029,7 @@ - #: g10/keyedit.c:1124 - msgid "Key has only stub or on-card key items - no passphrase to change.\n" - msgstr "" --"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schüsselelemente- keine " -+"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- keine " - "Passphrase ist zu ändern.\n" - - #: g10/keyedit.c:1135 g10/keygen.c:3226 -@@ -3275,7 +3275,7 @@ - - #: g10/keyedit.c:1751 - msgid "Really sign all user IDs? (y/N) " --msgstr "Wirklich alle User-IDs beglaubigen? " -+msgstr "Wirklich alle User-IDs beglaubigen? (j/N) " - - #: g10/keyedit.c:1758 - msgid "Hint: Select the user IDs to sign\n" -@@ -3351,15 +3351,15 @@ - - #: g10/keyedit.c:2020 - msgid "Do you really want to revoke the entire key? (y/N) " --msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? " -+msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) " - - #: g10/keyedit.c:2031 - msgid "Do you really want to revoke the selected subkeys? (y/N) " --msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? " -+msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) " - - #: g10/keyedit.c:2033 - msgid "Do you really want to revoke this subkey? (y/N) " --msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? " -+msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) " - - #: g10/keyedit.c:2083 - msgid "Owner trust may not be set while using a user provided trust database\n" -@@ -3383,11 +3383,11 @@ - - #: g10/keyedit.c:2201 - msgid "Save changes? (y/N) " --msgstr "Änderungen speichern? " -+msgstr "Änderungen speichern? (j/N) " - - #: g10/keyedit.c:2204 - msgid "Quit without saving? (y/N) " --msgstr "Beenden ohne zu speichern? " -+msgstr "Beenden ohne zu speichern? (j/N) " - - #: g10/keyedit.c:2214 - #, c-format -@@ -3531,7 +3531,7 @@ - - #: g10/keyedit.c:3018 - 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" -+msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n" - - #: g10/keyedit.c:3158 - msgid "Delete this good signature? (y/N/q)" -@@ -3605,7 +3605,7 @@ - #: g10/keyedit.c:3353 - 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 " -+"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer " - "hinzufügen.\n" - - #: g10/keyedit.c:3373 -@@ -5013,7 +5013,7 @@ - "Wählen Sie ein Bild für Ihre Foto-ID aus. Das Bild muß eine JPEG-Datei\n" - "sein. Bitte beachten Sie, daß das Bild in Ihrem öffentlichen\n" - "Schlüssel gespeichert wird. Wenn Sie ein sehr großes Bild benutzen,\n" --"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der GröÂße\n" -+"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n" - "240x288 Pixel ist eine gute Wahl.\n" - - #: g10/photoid.c:93 -@@ -5374,7 +5374,7 @@ - #: g10/pubkey-enc.c:242 - #, c-format - msgid "cipher algorithm %d%s is unknown or disabled\n" --msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n" -+msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n" - - #: g10/pubkey-enc.c:280 - #, c-format -@@ -5473,7 +5473,7 @@ - msgstr "" - "Widerrufszertifikat wurde erzeugt.\n" - "\n" --"Bitte speichern Sie es auf einem Medium welches sie wegschliessen\n" -+"Bitte speichern Sie es auf einem Medium welches sie wegschließen\n" - "können; falls Mallory (ein Angreifer) Zugang zu diesem Zertifikat\n" - "erhält, kann erIhren Schlüssel unbrauchbar machen. Es wäre klug,\n" - "dieses Widerrufszertifikat auch auszudrucken und sicher aufzubewahren,\n" -@@ -5556,7 +5556,7 @@ - msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" - msgstr "" - "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für " --"sym.Verschlüsselung nicht vermieden werden!\n" -+"sym. Verschlüsselung nicht vermieden werden!\n" - - #: g10/seskey.c:218 - msgid "DSA requires the hash length to be a multiple of 8 bits\n" -@@ -6066,7 +6066,7 @@ - #, c-format - msgid "public key of ultimately trusted key %s not found\n" - msgstr "" --"öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n" -+"öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n" - - #: g10/trustdb.c:2270 - #, c-format -@@ -6125,7 +6125,7 @@ - - #: util/errors.c:58 - msgid "bad public key" --msgstr "Falscher öffentlicher Schüssel" -+msgstr "Falscher öffentlicher Schlüssel" - - #: util/errors.c:59 - msgid "bad secret key" -@@ -6301,7 +6301,7 @@ - - #: util/errors.c:104 - msgid "unusable public key" --msgstr "unbrauchbarer öffentlicher Schüssel" -+msgstr "unbrauchbarer öffentlicher Schlüssel" - - #: util/errors.c:105 - msgid "unusable secret key" diff -Nru gnupg-1.4.9/debian/patches/25_fr.po_fixes.dpatch gnupg-1.4.10/debian/patches/25_fr.po_fixes.dpatch --- gnupg-1.4.9/debian/patches/25_fr.po_fixes.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/25_fr.po_fixes.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_fr.po_fixes.dpatch by Daniel Leidert (dale) -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: French wording improved (closes: #394037). -## DP: -## DP: -## DP: - -@DPATCH@ -diff -urNad experimental~/po/fr.po experimental/po/fr.po ---- experimental~/po/fr.po 2008-03-25 11:23:35.000000000 +0100 -+++ experimental/po/fr.po 2008-05-22 04:16:49.000000000 +0200 -@@ -2809,9 +2809,8 @@ - "etc.)\n" - msgstr "" - "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" -+"pour qu'il vérifie les clés des autres utilisateurs (en vérifiant les passeports, en -+vérifiant les empreintes de plusieurs sources différentes, etc.)\n" - - #: g10/keyedit.c:417 g10/pkclist.c:276 - #, c-format diff -Nru gnupg-1.4.9/debian/patches/25_it.po_fixes.dpatch gnupg-1.4.10/debian/patches/25_it.po_fixes.dpatch --- gnupg-1.4.9/debian/patches/25_it.po_fixes.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/25_it.po_fixes.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_it.po_fixes.dpatch by Daniel Leidert (dale) -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Italian typo fix (closes: #298699). -## DP: -## DP: -## DP: - -@DPATCH@ -diff -urNad experimental~/po/it.po experimental/po/it.po ---- experimental~/po/it.po 2008-03-25 09:53:09.000000000 +0100 -+++ experimental/po/it.po 2008-05-22 03:24:54.000000000 +0200 -@@ -6102,7 +6102,7 @@ - #: g10/trustdb.c:581 g10/trustdb.c:2425 - #, c-format - msgid "next trustdb check due at %s\n" --msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" -+msgstr "il prossimo controllo del trustdb sarà fatto il %s\n" - - #: g10/trustdb.c:590 - #, fuzzy, c-format diff -Nru gnupg-1.4.9/debian/patches/55_curl_typefix.dpatch gnupg-1.4.10/debian/patches/55_curl_typefix.dpatch --- gnupg-1.4.9/debian/patches/55_curl_typefix.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/55_curl_typefix.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 55_curl_typefix.dpatch by Michael Bienia -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Apply patch from upstream to fix a build error with recent curl -## DP: and gcc 4.3 (error: 'typeof' applied to a bit-field) -## DP: Patch taken from http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html - -@DPATCH@ -diff -urNad gnupg-1.4.9~/keyserver/gpgkeys_curl.c gnupg-1.4.9/keyserver/gpgkeys_curl.c ---- gnupg-1.4.9~/keyserver/gpgkeys_curl.c 2007-10-23 11:59:12.000000000 +0200 -+++ gnupg-1.4.9/keyserver/gpgkeys_curl.c 2008-07-21 01:59:06.000000000 +0200 -@@ -286,7 +286,7 @@ - - if(follow_redirects) - { -- curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1); -+ curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L); - if(follow_redirects>0) - curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); - } -@@ -298,10 +298,10 @@ - { - fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); - curl_easy_setopt(curl,CURLOPT_STDERR,console); -- curl_easy_setopt(curl,CURLOPT_VERBOSE,1); -+ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); - } - -- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); -+ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); - curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); - - if(proxy) -diff -urNad gnupg-1.4.9~/keyserver/gpgkeys_hkp.c gnupg-1.4.9/keyserver/gpgkeys_hkp.c ---- gnupg-1.4.9~/keyserver/gpgkeys_hkp.c 2007-10-23 11:59:12.000000000 +0200 -+++ gnupg-1.4.9/keyserver/gpgkeys_hkp.c 2008-07-21 01:59:06.000000000 +0200 -@@ -202,9 +202,9 @@ - fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); - - curl_easy_setopt(curl,CURLOPT_URL,request); -- curl_easy_setopt(curl,CURLOPT_POST,1); -+ curl_easy_setopt(curl,CURLOPT_POST,1L); - curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key); -- curl_easy_setopt(curl,CURLOPT_FAILONERROR,1); -+ curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L); - - res=curl_easy_perform(curl); - if(res!=0) -@@ -661,7 +661,7 @@ - { - fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); - curl_easy_setopt(curl,CURLOPT_STDERR,console); -- curl_easy_setopt(curl,CURLOPT_VERBOSE,1); -+ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); - } - - if(proxy) diff -Nru gnupg-1.4.9/debian/patches/99_yat2m_fix_samp_handling.dpatch gnupg-1.4.10/debian/patches/99_yat2m_fix_samp_handling.dpatch --- gnupg-1.4.9/debian/patches/99_yat2m_fix_samp_handling.dpatch 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/patches/99_yat2m_fix_samp_handling.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99_yat2m_fix_samp_handling.dpatch by Daniel Leidert (dale) -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix a bug in the @samp{} handling. Leading to "warning: `foo'' not -## DP: defines. Further use a fix from upstream to handle backslashes -## DP: correctly (#4734, #4735). -## DP: -## DP: - -@DPATCH@ -diff -urNad experimental~/doc/yat2m.c experimental/doc/yat2m.c ---- experimental~/doc/yat2m.c 2007-12-12 19:40:17.000000000 +0100 -+++ experimental/doc/yat2m.c 2008-05-22 00:45:24.000000000 +0200 -@@ -449,7 +449,7 @@ - { "code", 0, "\\fB", "\\fR" }, - { "sc", 0, "\\fB", "\\fR" }, - { "var", 0, "\\fI", "\\fR" }, -- { "samp", 0, "'", "'" }, -+ { "samp", 0, "\\(aq", "\\(aq'" }, - { "file", 0, "`\\fI","\\fR'" }, - { "env", 0, "`\\fI","\\fR'" }, - { "acronym", 0 }, -@@ -675,6 +675,8 @@ - } - *eol_action = 0; - } -+ else if (*s == '\\') -+ fputs ("\\\\", fp); - else - putc (*s, fp); - } diff -Nru gnupg-1.4.9/debian/README.BUGS.Debian gnupg-1.4.10/debian/README.BUGS.Debian --- gnupg-1.4.9/debian/README.BUGS.Debian 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/README.BUGS.Debian 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,112 @@ +Frequently Reported Issues for gnupg in Debian +---------------------------------------------- + +This file is intended to collect information about issues and limitations in +gnupg, which have been reported to the Debian bug-tracking system (BTS) for +gnupg. + + + +Make sure you checked the information here before reporting an issue to the +Debian BTS. Please note, that most of the reports have been forwarded +upstream, and that this file just expresses what upstream told us. For many +of these reports, items in the upstream bug tracker have been opened. So in +rare cases, a limitation might get fixed in future releases of GnuPG. + + +gnupg: When creating a signature, it does not necessarily preserve the + permissions of the signed file. + + [..] I don't see the problem with this. In same cases we could create a + file with the same permissions as the source file but not in all. + Often gpg does not work on the file but just reads the content. This + common Unix behaviour (cf. cat(1)). If there are concerns, make sure + the umask has ben set properly. + . + Sor signing confidential files, a detached signature is anyway a + better choice. + . + Another reason not to change it is that it changes the interface and + thus would break myriads of scripts. [..] (Werner Koch) + + Debian #44910 + + +gnupg: I wish I could sign multiple files in one pass. + + [..] IIRC, the sematics of sign are too complicated for --multifile. If + the problem is just to avoid entering a passphrase several times, + gpg-agent is very helpful and solves the problem nicely. [..] + (Werner Koch) + + Debian #89094 + GnuPG #1041 + + +gnupg: I want to extract a signature from a signed and encrypted file. + + [..] This is the occasionally-requested "--unwrap" command which would + stop processing after a single layer of the file. I.e. convert + Enc(Sign(data)) to Sign(data). [..] (David Shaw) + + Debian #282061 + GnuPG #1060 + + GnuPG #1047 + + +gnupg: I get a passphrase entry window (from pinentry*) although I used + the --passphrase switch. + + [..] That is as it should be. [..] (Werner Koch) + + gpg won't send the value of --passphrase given on the command line to the + configured agent. + + Debian #427857 + + +gnupg: Sets key expiry date in the past. + + When setting the expiry time to values bigger than 97 years (years + >2106), gpg creates a key with expiry date set in the past. This is + due to using a 32 bit integer to represent the date. It's currently + an unfixable limitation. + + Debian #472642 + + + +gnupg: Dies with "Ohhhh jeeeee: ... this is a bug". + + Since gnupg 1.4.6-2.2 we don't install the gpg(1) binary setuid root + anymore. If you observe the error message because of this change, then + you can use dpkg-statoverride(1) to change the permissions of the binary + permanently (for example to set them setuid root): + + dpkg-statoverride --update --add root root 4755 /usr/bin/gpg + + Debian #485458 + + + -- Daniel Leidert , 2009 diff -Nru gnupg-1.4.9/debian/rules gnupg-1.4.10/debian/rules --- gnupg-1.4.9/debian/rules 2010-02-11 06:24:38.000000000 +0000 +++ gnupg-1.4.10/debian/rules 2010-02-11 06:24:39.000000000 +0000 @@ -9,192 +9,133 @@ # paternity under the Copyright, Designs and Patents Act 1988.) # This file may have to be extensively modified -STRIP=strip --remove-section=.comment --remove-section=.note +include /usr/share/dpatch/dpatch.make -DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -HOSTARG = --host=$(DEB_HOST_GNU_TYPE) -endif +################################## variables ################################# + +#VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ --enable-mailto --with-mailprog=/usr/sbin/sendmail +CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ \ + --enable-mailto --with-mailprog=/usr/sbin/sendmail \ + --enable-noexecstack -install_dir=install -d -m 755 -install_file=install -m 644 -install_script=install -m 755 -install_binary=install -m 755 - -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - install_binary += -s +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +CONFARGS += --host=$(DEB_HOST_GNU_TYPE) endif +ifeq ($(DEB_BUILD_ARCH),ppc64) +CONFARGS += --disable-asm +endif -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) -DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +LDFLAGS += -Wl,--as-needed -include /usr/share/dpatch/dpatch.make +################################### configure ################################ -build-deb-stamp: patch-stamp - $(checkdir) - mkdir -p build-deb - cd build-deb && ../configure $(CONFARGS) $(HOSTARG) - $(MAKE) -C build-deb +build-deb/config.status: + dh_testdir + (mkdir -p $(@D); cd $(@D); \ + ../configure $(CONFARGS) $(HOSTARG) --without-libcurl) + +build-deb-curl/config.status: + dh_testdir + (mkdir -p $(@D); cd $(@D); \ + ../configure $(CONFARGS) $(HOSTARG)) + +build-udeb/config.status: + dh_testdir + (mkdir -p $(@D); cd $(@D); CFLAGS="-g $(if $(filter powerpc,$(DEB_BUILD_ARCH)),-O2,-Os)" \ + ../configure $(CONFARGS) $(HOSTARG) \ + --without-bzip2 --without-readline --without-libcurl) + +##################################### build ################################## + +build-deb-stamp: patch-stamp build-deb/config.status + dh_testdir + $(MAKE) -C build-deb/ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) -C build-deb check + make -C build-deb/checks check || exit 1 endif touch $@ -build-udeb-stamp: patch-stamp - $(checkdir) - mkdir -p build-udeb - cd build-udeb && CFLAGS='-g -Os' ../configure $(CONFARGS) $(HOSTARG) --without-bzip2 --without-readline - $(MAKE) -C build-udeb +build-deb-curl-stamp: patch-stamp build-deb-curl/config.status + dh_testdir + $(MAKE) -C build-deb-curl/ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) -C build-udeb check + make -C build-deb-curl/checks check || exit 1 endif touch $@ -build: build-deb-stamp build-udeb-stamp +build-udeb-stamp: patch-stamp build-udeb/config.status + dh_testdir + $(MAKE) -C build-udeb/ + touch $@ + +build: build-deb-stamp build-deb-curl-stamp build-udeb-stamp -test: build - $(checkdir) - make -C build-deb/checks check || exit 127 - touch test +##################################### clean ################################## clean: unpatch - $(checkdir) - rm -f build - rm -rf build-deb build-udeb debian/gpgv-udeb debian/gnupg-udeb debian/gpgv - rm -rf debian/tmp debian/patched debian/files* debian/*substvars - rm -f build-udeb-stamp build-deb-stamp - find . -name \*~ | xargs rm -vf - -binary-indep: - -binary-arch: checkroot build # test - $(checkdir) - - : # gnupg - rm -rf debian/tmp - $(MAKE) -C build-deb prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man libexecdir=`pwd`/debian/tmp/usr/lib/ mkinstalldirs=`pwd`/scripts/mkinstalldirs install - : # copies of the manpage which can't be grokked by install-info - rm debian/tmp/usr/share/info/* - find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs $(STRIP) - chmod 755 debian/tmp/usr/bin/gpg - sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot - sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/tmp/usr/bin/gpg-convert-from-106 - chmod 755 debian/tmp/usr/bin/lspgpot debian/tmp/usr/bin/gpg-convert-from-106 - sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \ - > debian/tmp/usr/share/man/man1/gpg.1.new - mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1 - $(install_file) debian/gpg-convert-from-106.1 debian/gpgsplit.1 debian/gpg-zip.1 \ - debian/lspgpot.1 debian/tmp/usr/share/man/man1/ - gzip -9v debian/tmp/usr/share/man/man*/* + dh_testdir + dh_testroot + rm -rf build-udeb/ build-deb-curl/ build-deb/ + # find . -name \*~ | xargs rm -vf + dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp patch-stamp + +#################################### install ################################# + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg : # Move localized manpages to FHS compliant locations - $(install_dir) debian/tmp/usr/share/man/ru/man1/ - mv debian/tmp/usr/share/man/man1/gpg.ru.1.gz debian/tmp/usr/share/man/ru/man1/gpg.1.gz + mv debian/gnupg/usr/share/man/man1/gpg.ru.1 debian/gnupg/usr/share/man/ru/man1/gpg.1 : # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/ - rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html - $(install_dir) debian/tmp/usr/share/doc/gnupg/ - $(install_file) debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian - $(install_file) README NEWS THANKS TODO doc/DETAILS \ - doc/FAQ doc/faq.html doc/OpenPGP debian/Upgrading_From_PGP.txt \ - doc/highlights-1.4.txt debian/tmp/usr/share/doc/gnupg/ - for i in po util mpi cipher tools g10 checks include; do \ - $(install_file) $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done - $(install_file) ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel - gzip -9v debian/tmp/usr/share/doc/gnupg/* - ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz - $(install_file) debian/copyright debian/tmp/usr/share/doc/gnupg/ - - : # in the gpgv package instead - rm debian/tmp/usr/bin/gpgv - rm debian/tmp/usr/share/man/man1/gpgv.1.gz - - find debian/tmp/ -type d -empty | xargs rmdir - - #find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps - find debian/tmp/ -path debian/tmp/usr/lib/gnupg/gpgkeys_ldap \ - -or -type f -print | \ - xargs file | grep ELF | cut -d: -f 1 | \ - xargs dpkg-shlibdeps \ - -dRecommends debian/tmp/usr/lib/gnupg/gpgkeys_ldap -dDepends - $(install_dir) debian/tmp/DEBIAN/ - cd debian/tmp && find * -type f | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums - dpkg-gencontrol -pgnupg -isp - chown -R root.root debian/tmp - chmod -R go=rX debian/tmp - dpkg --build debian/tmp .. - - : # gpgv - rm -rf debian/gpgv - $(install_dir) debian/gpgv/DEBIAN/ - - $(install_dir) debian/gpgv/usr/bin/ - $(install_binary) build-udeb/g10/gpgv debian/gpgv/usr/bin/ - $(STRIP) debian/gpgv/usr/bin/gpgv - - $(install_dir) debian/gpgv/usr/share/man/man1/ - $(install_file) build-deb/doc/gpgv.1 debian/gpgv/usr/share/man/man1/ - gzip -9v debian/gpgv/usr/share/man/man*/* - - $(install_dir) debian/gpgv/usr/share/doc/gpgv - $(install_file) debian/changelog debian/gpgv/usr/share/doc/gpgv/changelog.Debian - gzip -9v debian/gpgv/usr/share/doc/gpgv/* - $(install_file) debian/copyright debian/gpgv/usr/share/doc/gpgv/ - - find debian/gpgv/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps - cd debian/gpgv && find * -type f | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums - dpkg-gencontrol -pgpgv -Pdebian/gpgv -isp - chown -R root.root debian/gpgv - chmod -R go=rX debian/gpgv - dpkg --build debian/gpgv .. - - : ### Udebs - - : # gpgv-udeb - rm -rf debian/gpgv-udeb - $(install_dir) debian/gpgv-udeb/DEBIAN/ debian/gpgv-udeb/usr/bin/ - $(install_binary) build-udeb/g10/gpgv debian/gpgv-udeb/usr/bin/ - $(STRIP) debian/gpgv-udeb/usr/bin/gpgv - find debian/gpgv-udeb/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps -Tdebian/gpgv-udeb.substvars -tudeb - - : # Don't let dpkg-gencontrol write incorrect guesses to debian/files. - : # Instead, register the udeb manually. - dpkg-gencontrol -pgpgv-udeb -Tdebian/gpgv-udeb.substvars -Pdebian/gpgv-udeb -isp -fdebian/files~ - dpkg-distaddfile gpgv-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb debian-installer extra - - chown -R root.root debian/gpgv-udeb - chmod -R go=rX debian/gpgv-udeb - dpkg --build debian/gpgv-udeb ../gpgv-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb - - : # gnupg-udeb - rm -rf debian/gnupg-udeb - $(install_dir) debian/gnupg-udeb/DEBIAN/ debian/gnupg-udeb/usr/bin/ - $(install_binary) build-udeb/g10/gpg debian/gnupg-udeb/usr/bin/ - $(STRIP) debian/gnupg-udeb/usr/bin/gpg - find debian/gnupg-udeb/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps -Tdebian/gnupg-udeb.substvars -tudeb - - : # Don't let dpkg-gencontrol write incorrect guesses to debian/files. - : # Instead, register the udeb manually. - dpkg-gencontrol -pgnupg-udeb -Tdebian/gnupg-udeb.substvars -Pdebian/gnupg-udeb -isp -fdebian/files~ - dpkg-distaddfile gnupg-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb debian-installer extra - - chown -R root.root debian/gnupg-udeb - chmod -R go=rX debian/gnupg-udeb - dpkg --build debian/gnupg-udeb ../gnupg-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb - -define checkdir - test -f g10/gpg.c && test -f debian/rules -endef - -# Below here is fairly generic really - -binary: binary-indep binary-arch - -checkroot: - $(checkdir) - test root = "`whoami`" + $(RM) debian/gnupg/usr/share/gnupg/FAQ \ + debian/gnupg/usr/share/gnupg/faq.html + $(RM) debian/gnupg/usr/share/info/dir* + find debian/gnupg/ -type d -empty | xargs rmdir + $(MAKE) -C build-deb-curl/keyserver install DESTDIR=$(CURDIR)/debian/gnupg-curl + $(RM) debian/gnupg-curl/usr/lib/gnupg/gpgkeys_finger \ + debian/gnupg-curl/usr/lib/gnupg/gpgkeys_ldap \ + debian/gnupg-curl/usr/lib/gnupg/gpgkeys_mailto + +#################################### binary ################################## + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs NEWS + # Do we want to ship these 100 of kB's changelogs? + for i in checks cipher doc g10 include keyserver mpi po tools util; do \ + install -m 644 $$i/ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.$$i; \ + done + install -m 644 ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.toplevel + install -m 644 keyserver/ChangeLog debian/gnupg-curl/usr/share/doc/gnupg-curl/changelog.keyserver + dh_installdocs + dh_installexamples + dh_movefiles -pgpgv --sourcedir=debian/gnupg + dh_install + dh_installinfo doc/gnupg1.info + dh_installman + dh_installudev + if which dh_bugfiles ; then dh_bugfiles ; fi + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch -.PHONY: build binary binary-arch binary-indep clean checkroot +.PHONY: build binary binary-arch binary-indep clean diff -Nru gnupg-1.4.9/debian/TODO gnupg-1.4.10/debian/TODO --- gnupg-1.4.9/debian/TODO 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/debian/TODO 2010-02-11 06:24:39.000000000 +0000 @@ -0,0 +1,45 @@ +TODO + +* fixed in older releases and probably even not relevant in 1.4.x anymore (in + braces the upstream tracker item number): + + #113897: "Oops: lock already hold by us" when using --fast-import (not 100% sure) + + the following I'm not 100% sure: + #166794, + #172823: --search leads to segfault + + +* Ubuntu patches: + + debian/patches/61_use_agent_default.dpatch: we should decide if used as default + +* discuss + + - if gpg should be put into /bin (#477671) + + - if keyserver-options verbose should be default (#474569) + + - why does gnupg depend on gpgv and can this perhaps be made less strong? + +general: + + +============================================================================== + + +* Close candidate (upstream rejected change): + + #38857: gnupg: no way to copy a key + #61914: gnupg: confusing question in gpg key generation process (I cannot agree) + #93656: gnupg; No way to specify multiple keyservers? (#139) +#162742: gnupg: Please handle "deprecated option honor-http-proxy" +#173586: gnupg: Suggestion for a better error message +#185782: `--batch --output existingfile' outputs nothing and exits 0 +#196681: gnupg: gpg says /dev/null@alea isn't a valid email address +#290980: gnupg: 'gpg -q --verify' should be quiet on success (#919) +#310805: gnupg: fully exportable armored homedir is completely impossible now! +#318587: gnupg: should encrypt to all subkeys + +#300743: gnupg: Should not depend on libusb + diff -Nru gnupg-1.4.9/doc/ChangeLog gnupg-1.4.10/doc/ChangeLog --- gnupg-1.4.9/doc/ChangeLog 2007-12-21 12:33:13.000000000 +0000 +++ gnupg-1.4.10/doc/ChangeLog 2009-09-02 13:32:12.000000000 +0100 @@ -1,3 +1,29 @@ +2009-09-02 Werner Koch + + * gpgv.texi, gpg.texi: Update from GnuPG-2. + +2009-08-18 Werner Koch + + * Makefile.am (sources_from_trunk): New. + (update-source-from-gnupg-2): New. Run it. Fixes bug#917 + +2009-08-13 Werner Koch + + * gpgv.texi, gpg.texi: Update from GnuPG-2. + +2008-04-30 David Shaw + + * gpg-zip.1: Add man page thanks to Colin Tuckley and Daniel + Leidert. + +2008-04-02 Werner Koch + + * opt-homedir.texi: Remove special case for Registry key. + + * yat2m.c (proc_texi_cmd): Use the \(aq glyph for @samp. This is + bug#898. + (proc_texi_buffer): Handle backslashs correctly. + 2007-12-21 Werner Koch * README.W32: Tell that Vista is supported and that at least NT-4 @@ -18,7 +44,7 @@ * gpg.texi: Updated from gnupg-2. * gpl.texi: Replace by GPLv3 version. - + * Makefile.am: Use standard suffix rules. 2006-12-04 Werner Koch @@ -190,7 +216,7 @@ Corp. * gpg.ru.sgml: Updated from upstream. Added a closing PARA. - + * gpg.sgml: Add bkuptocard command for --edit-key. 2005-02-05 David Shaw @@ -770,7 +796,7 @@ 2002-06-03 Timo Schulz * DETAILS: Add ATTRIBUTE. - + 2002-05-31 David Shaw * gpg.sgml: Add "edit/addrevoker". Document --desig-revoke. Note @@ -809,7 +835,7 @@ 2002-04-30 Timo Schulz * gpg.sgml: Add an entry for --encrypt-files and --decrypt-files. - + 2002-04-29 David Shaw * gpg.sgml: Fix minor error in --pgp6 documentation: it does not @@ -848,7 +874,7 @@ SIGEXPIRED (deprecated), and VALIDSIG (added expiration date). Add "Preferences" command to unattended key generation instructions. Also fixed a few typos. - + * samplekeys.asc: new (added to EXTRA_DIST in Makefile.am as well) 2002-01-31 Marcus Brinkmann @@ -860,7 +886,7 @@ * gpg.sgml: auto-key-retrieve is a keyserver-option (noted by Roger Sondermann). - + 2002-03-27 David Shaw * gpg.sgml: --pgp2 also means --disable-mdc, --no-ask-sig-expire, @@ -890,7 +916,7 @@ 2002-01-26 Timo Schulz * gnupg-w32.reg: New. Registry file for W32 in registry format. - + 2002-01-26 Werner Koch * gpg.sgml: A few words about --gpg-agent-info and GPG_AGENT_INFO. @@ -899,7 +925,7 @@ * README.W32: Modify the filename because now the .exe extension is automatically added to the binary. - + 2002-01-14 Werner Koch * gpg.sgml: Talk about PGP 5 and higher. @@ -1125,7 +1151,7 @@ * DETAILS: Ditto. - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2009 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 diff -Nru gnupg-1.4.9/doc/faq.html gnupg-1.4.10/doc/faq.html --- gnupg-1.4.9/doc/faq.html 2007-11-15 13:11:10.000000000 +0000 +++ gnupg-1.4.10/doc/faq.html 2008-12-11 16:41:59.000000000 +0000 @@ -1,6 +1,5 @@ GnuPG FAQ - diff -Nru gnupg-1.4.9/doc/gnupg1.info gnupg-1.4.10/doc/gnupg1.info --- gnupg-1.4.9/doc/gnupg1.info 2008-03-26 17:34:12.000000000 +0000 +++ gnupg-1.4.10/doc/gnupg1.info 2009-09-02 14:50:59.000000000 +0100 @@ -1,6 +1,6 @@ -This is gnupg1.info, produced by makeinfo version 4.8 from gnupg1.texi. +This is gnupg1.info, produced by makeinfo version 4.13 from gnupg1.texi. - This is the `The GNU Privacy Guard Manual' (1.4.9, 23 October 2007). +This is the `The GNU Privacy Guard Manual' (1.4.10, 11 December 2008). Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -22,7 +22,7 @@ Using the GnuPG Version 1.4 *************************** -This is the `The GNU Privacy Guard Manual' (1.4.9, 23 October 2007). +This is the `The GNU Privacy Guard Manual' (1.4.10, 11 December 2008). Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -108,7 +108,7 @@ `--help' `-h' Print a usage message summarizing the most useful command line - options. Not that you cannot abbreviate this command. + options. Note that you cannot abbreviate this command. `--warranty' Print warranty information. @@ -129,14 +129,18 @@ (for a signed and encrypted message), `--symmetric' (for a signed and symmetrically encrypted message), or `--encrypt' and `--symmetric' together (for a signed message that may be decrypted - via a secret key or a passphrase). + via a secret key or a passphrase). The key to be used for signing + is chosen by default or can be set with the `--local-user' and + `--default-key' options. `--clearsign' - Make a clear text signature. The content in a clear text signature - is readable without any special software. OpenPGP software is only - needed to verify the signature. Clear text signatures may modify - end-of-line whitespace for platform independence and are not - intended to be reversible. + Make a clear text signature. The content in a clear text + signature is readable without any special software. OpenPGP + software is only needed to verify the signature. Clear text + signatures may modify end-of-line whitespace for platform + independence and are not intended to be reversible. The key to be + used for signing is chosen by default or can be set with the + `--local-user' and `--default-key' options. `--detach-sign' `-b' @@ -165,8 +169,8 @@ `--decrypt' `-d' - Decrypt the file given on the command line (or `stdin' if no file - is specified) and write it to stdout (or the file specified with + Decrypt the file given on the command line (or STDIN if no file is + specified) and write it to STDOUT (or the file specified with `--output'). If the decrypted file is signed, the signature is also verified. This command differs from the default operation, as it never writes to the filename which is included in the file and it @@ -175,19 +179,19 @@ `--verify' Assume that the first argument is a signed file or a detached signature and verify it without generating any output. With no - arguments, the signature packet is read from stdin. If only a + arguments, the signature packet is read from STDIN. If only a sigfile is given, it may be a complete signature or a detached signature, in which case the signed stuff is expected in a file without the ".sig" or ".asc" extension. With more than 1 argument, the first should be a detached signature and the remaining files are the signed stuff. To read the signed stuff - from stdin, use `-' as the second filename. For security reasons - a detached signature cannot read the signed material from stdin + from STDIN, use `-' as the second filename. For security reasons + a detached signature cannot read the signed material from STDIN without denoting it in the above way. `--multifile' This modifies certain other commands to accept multiple files for - processing on the command line or read from stdin with each + processing on the command line or read from STDIN with each filename on a separate line. This allows for many files to be processed at once. `--multifile' may currently be used along with `--verify', `--encrypt', and `--decrypt'. Note that `--multifile @@ -240,13 +244,15 @@ "tsign"). `--check-sigs' - Same as `--list-sigs', but the signatures are verified. + Same as `--list-sigs', but the signatures are verified. Note that + for performance reasons the revocation status of a signing key is + not shown. The status of the verification is indicated by a flag directly following the "sig" tag (and thus before the flags described above for `--list-sigs'). A "!" indicates that the signature has been successfully verified, a "-" denotes a bad signature and a "%" is - used if an error occured while checking the signature (e.g. a non + used if an error occurred while checking the signature (e.g. a non supported algorithm). `--fingerprint' @@ -292,7 +298,7 @@ Either export all keys from all keyrings (default keyrings and those registered via option `--keyring'), or if at least one name is given, those of the given name. The new keyring is written to - stdout or to the file given with option `--output'. Use together + STDOUT or to the file given with option `--output'. Use together with `--armor' to mail those keys. `--send-keys `key IDs'' @@ -300,7 +306,8 @@ Fingerprints may be used instead of key IDs. Option `--keyserver' must be used to give the name of this keyserver. Don't send your complete keyring to a keyserver -- select only those keys which - are new or changed by you. + are new or changed by you. If no key IDs are given, `gpg' does + nothing. `--export-secret-keys' `--export-secret-subkeys' @@ -318,7 +325,7 @@ fast version is currently just a synonym. There are a few other options which control how this command works. - Most notable here is the `--keyserver-options merge-only' option + Most notable here is the `--import-options merge-only' option which does not insert new keys but does only the merging of new signatures, user-IDs and subkeys. @@ -375,13 +382,20 @@ `--yes'. `--export-ownertrust' - Send the ownertrust values to stdout. This is useful for backup + Send the ownertrust values to STDOUT. This is useful for backup purposes as these values are the only ones which can't be - re-created from a corrupted trust DB. + re-created from a corrupted trustdb. Example: + gpg --export-ownertrust > otrust.txt `--import-ownertrust' Update the trustdb with the ownertrust values stored in `files' (or - stdin if not given); existing values will be overwritten. + STDIN if not given); existing values will be overwritten. In case + of a severely damaged trustdb and if you have a recent backup of + the ownertrust values (e.g. in the file `otrust.txt', you may + re-create the trustdb using these commands: + cd ~/.gnupg + rm trustdb.gpg + gpg --import-ownertrust < otrust.txt `--rebuild-keydb-caches' When updating from version 1.0.6 to 1.0.7 this command should be @@ -391,7 +405,7 @@ `--print-md `algo'' `--print-mds' Print message digest of algorithm ALGO for all given files or - stdin. With the second form (or a deprecated "*" as algo) digests + STDIN. With the second form (or a deprecated "*" as algo) digests for all available algorithms are printed. `--gen-random `0|1|2'' @@ -442,6 +456,14 @@ related tasks. It expects the specification of a key on the command line. + uid `n' + Toggle selection of user ID or photographic user ID with + index `n'. Use 0 to deselect all. + + key `n' + Toggle selection of subkey with index `n'. Use 0 to deselect + all. + sign Make a signature on key of user `name' If the key is not yet signed by the default user (or the users given with -u), the @@ -468,91 +490,40 @@ non-revocable, and "t" (for trust) may be freely mixed and prefixed to "sign" to create a signature of any type desired. + delsig + Delete a signature. Note that it is not possible to retract a + signature, once it has been send to the public (i.e. to a + keyserver). In that case you better use `revsig'. + revsig Revoke a signature. For every signature which has been generated by one of the secret keys, GnuPG asks whether a revocation certificate should be generated. - trust - Change the owner trust value. This updates the trust-db - immediately and no save is required. - - disable - enable - Disable or enable an entire key. A disabled key can not - normally be used for encryption. + check + Check the signatures on all selected user IDs. adduid - Create an alternate user id. + Create an additional user ID. addphoto - Create a photographic user id. This will prompt for a JPEG + Create a photographic user ID. This will prompt for a JPEG file that will be embedded into the user ID. Note that a very large JPEG will make for a very large key. Also note that some programs will display your JPEG unchanged (GnuPG), and some programs will scale it to fit in a dialog box (PGP). - deluid - Delete a user id. Note that it is not possible to retract a - user id, once it has been send to the public (i.e. to a - keyserver). In that case you better use `revuid'. + showphoto + Display the selected photographic user ID. - delsig - Delete a signature. Note that it is not possible to retract a - signature, once it has been send to the public (i.e. to a - keyserver). In that case you better use `revsig'. + deluid + Delete a user ID or photographic user ID. Note that it is not + possible to retract a user id, once it has been send to the + public (i.e. to a keyserver). In that case you better use + `revuid'. revuid - Revoke a user id. - - addkey - Add a subkey to this key. - - addcardkey - Generate a key on a card and add it to this key. - - keytocard - Transfer the selected secret key (or the primary key if no - key has been selected) to a smartcard. The secret key in the - keyring will be replaced by a stub if the key could be stored - successfully on the card and you use the save command later. - Only certain key types may be transferred to the card. A sub - menu allows you to select on what card to store the key. Note - that it is not possible to get that key back from the card - - if the card gets broken your secret key will be lost unless - you have a backup somewhere. - - bkuptocard `file' - Restore the given file to a card. This command may be used to - restore a backup key (as generated during card - initialization) to a new card. In almost all cases this will - be the encryption key. You should use this command only with - the corresponding public key and make sure that the file - given as argument is indeed the backup to restore. You should - then select 2 to restore as encryption key. You will first - be asked to enter the passphrase of the backup key and then - for the Admin PIN of the card. - - delkey - Remove a subkey (secondart key). Note that it is not possible - to retract a subkey, once it has been send to the public - (i.e. to a keyserver). In that case you better use `revkey'. - - addrevoker - Add a designated revoker. This takes one optional argument: - "sensitive". If a designated revoker is marked as sensitive, - it will not be exported by default (see export-options). - - revkey - Revoke a subkey. - - expire - Change the key expiration time. If a subkey is selected, the - expiration time of this subkey will be changed. With no - selection, the key expiration of the primary key is changed. - - passwd - Change the passphrase of the secret key. + Revoke a user ID or photographic user ID. primary Flag the current user id as the primary one, removes the @@ -562,19 +533,20 @@ over other photo user IDs, and setting a regular user ID as primary makes it primary over other regular user IDs. - uid `n' - Toggle selection of user id with index `n'. Use 0 to - deselect all. - - key `n' - Toggle selection of subkey with index `n'. Use 0 to deselect - all. - - check - Check all selected user ids. + 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-options honor-keyserver-url' for more + on how this works. Setting a value of "none" removes an + existing preferred keyserver. - showphoto - Display the selected photographic user id. + notation + Set a name=value notation for the specified user ID(s). See + `--cert-notation' for more on how this works. Setting a value + of "none" removes all notations, setting a notation prefixed + with a minus sign (-) removes that notation, and setting a + notation name (without the =value) prefixed with a minus sign + removes all notations with that name. pref List preferences from the selected user ID. This shows the @@ -600,20 +572,78 @@ keys via attribute user IDs so these preferences will not be used by GnuPG. - 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-options honor-keyserver-url' for more - on how this works. Setting a value of "none" removes an - existing preferred keyserver. + When setting preferences, you should list the algorithms in + the order which you'd like to see them used by someone else + when encrypting a message to your key. If you don't include + 3DES, it will be automatically added at the end. Note that + there are many factors that go into choosing an algorithm + (for example, your key may not be the only recipient), and so + the remote OpenPGP application being used to send to you may + or may not follow your exact chosen order for a given + message. It will, however, only choose an algorithm that is + present on the preference list of every recipient key. See + also the INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section + below. - notation - Set a name=value notation for the specified user ID(s). See - `--cert-notation' for more on how this works. Setting a value - of "none" removes all notations, setting a notation prefixed - with a minus sign (-) removes that notation, and setting a - notation name (without the =value) prefixed with a minus sign - removes all notations with that name. + addkey + Add a subkey to this key. + + addcardkey + Generate a subkey on a card and add it to this key. + + keytocard + Transfer the selected secret subkey (or the primary key if no + subkey has been selected) to a smartcard. The secret key in + the keyring will be replaced by a stub if the key could be + stored successfully on the card and you use the save command + later. Only certain key types may be transferred to the card. + A sub menu allows you to select on what card to store the + key. Note that it is not possible to get that key back from + the card - if the card gets broken your secret key will be + lost unless you have a backup somewhere. + + bkuptocard `file' + Restore the given file to a card. This command may be used to + restore a backup key (as generated during card + initialization) to a new card. In almost all cases this will + be the encryption key. You should use this command only with + the corresponding public key and make sure that the file + given as argument is indeed the backup to restore. You should + then select 2 to restore as encryption key. You will first + be asked to enter the passphrase of the backup key and then + for the Admin PIN of the card. + + delkey + Remove a subkey (secondart key). Note that it is not possible + to retract a subkey, once it has been send to the public + (i.e. to a keyserver). In that case you better use `revkey'. + + revkey + Revoke a subkey. + + expire + Change the key or subkey expiration time. If a subkey is + selected, the expiration time of this subkey will be changed. + With no selection, the key expiration of the primary key is + changed. + + trust + Change the owner trust value for the key. This updates the + trust-db immediately and no save is required. + + disable + enable + Disable or enable an entire key. A disabled key can not + normally be used for encryption. + + addrevoker + Add a designated revoker to the key. This takes one optional + argument: "sensitive". If a designated revoker is marked as + sensitive, it will not be exported by default (see + export-options). + + passwd + Change the passphrase of the secret key. toggle Toggle between public and secret key listing. @@ -636,7 +666,9 @@ Add cross-certification signatures to signing subkeys that may not currently have them. Cross-certification signatures protect against a subtle attack against signing subkeys. See - `--require-cross-certification'. + `--require-cross-certification'. All new keys generated have + this signature by default, so this option is only useful to + bring older keys up to date. save Save all changes to the key rings and quit. @@ -752,7 +784,12 @@ `--batch' `--no-batch' Use batch mode. Never ask, do not allow interactive commands. - `--no-batch' disables this option. + `--no-batch' disables this option. Note that even with a filename + given on the command line, gpg might still need to read from STDIN + (in particular if gpg figures that the input is a detached + signature and no data file has been specified). Thus if you do + not want to feed data via STDIN, you should connect STDIN to + `/dev/null'. `--no-tty' Make sure that the TTY (terminal) is never used for any output. @@ -870,10 +907,10 @@ `--enable-dsa2' `--disable-dsa2' - Enables new-style DSA keys which (unlike the old style) may be - larger than 1024 bit and use hashes other than SHA-1 and - RIPEMD/160. Note that very few programs currently support these - keys and signatures from them. + Enable hash truncation for all DSA keys even for old DSA Keys up to + 1024 bit. This is also the default with `--openpgp'. Note that + older versions of GnuPG also required this flag to allow the + generation of DSA larger than 1024 bit. `--photo-viewer `string'' This is the command line that should be run to view a photo ID. @@ -887,7 +924,7 @@ on standard input. The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' - stdin". Note that if your image viewer program is not secure, then + STDIN". Note that if your image viewer program is not secure, then executing it from GnuPG does not make it secure. `--exec-path `string'' @@ -924,11 +961,11 @@ not used). `--homedir DIR' - Set the name of the home directory to DIR. If his option is not + Set the name of the home directory to DIR. If this option is not used, the home directory defaults to `~/.gnupg'. It is only recognized when given on the command line. It also overrides any home directory stated through the environment variable `GNUPGHOME' - or (on W32 systems) by means on the Registry entry + or (on W32 systems) by means of the Registry entry HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR. `--pcsc-driver `file'' @@ -1105,28 +1142,42 @@ GnuPG can automatically locate and retrieve keys as needed using this option. This happens when encrypting to an email address (in the "user@example.com" form), and there are no user@example.com - keys on the local keyring. This option takes any number of the - following arguments, in the order they are to be tried: + keys on the local keyring. This option takes any number of the + following mechanisms, in the order they are to be tried: cert - locate a key using DNS CERT, as specified in 2538bis - (currently in draft): http://www.josefsson.org/rfc2538bis/ + Locate a key using DNS CERT, as specified in rfc4398. pka - locate a key using DNS PKA. + Locate a key using DNS PKA. ldap - locate a key using the PGP Universal method of checking - "ldap://keys.(thedomain)". + Using DNS Service Discovery, check the domain in question for + any LDAP keyservers to use. If this fails, attempt to locate + the key using the PGP Universal method of checking + `ldap://keys.(thedomain)'. keyserver - locate a key using whatever keyserver is defined using the + Locate a key using whatever keyserver is defined using the `--keyserver' option. - (keyserver URL) + keyserver-URL In addition, a keyserver URL as used in the `--keyserver' option may be used here to query that particular keyserver. + local + Locate the key using the local keyrings. This mechanism + allows to select the order a local key lookup is done. Thus + using `--auto-key-locate local' is identical to + `--no-auto-key-locate'. + + nodefault + This flag disables the standard local key lookup, done before + any of the mechanisms defined by the `--auto-key-locate' are + tried. The position of this mechanism in the list does not + matter. It is not required if `local' is also used. + + `--keyid-format `short|0xshort|long|0xlong'' Select how to display key IDs. "short" is the traditional 8-character key ID. "long" is the more accurate (but less @@ -1150,12 +1201,12 @@ Most keyservers synchronize with each other, so there is generally no need to send keys to more than one server. The keyserver - `hkp://subkeys.pgp.net' uses round robin DNS to give a different + `hkp://keys.gnupg.net' uses round robin DNS to give a different keyserver each time you use it. `--keyserver-options `name=value1 '' This is a space or comma delimited string that gives options for - the keyserver. Options can be prepended with a `no-' to give the + the keyserver. Options can be prefixed with a `no-' to give the opposite meaning. Valid import-options or export-options may be used here as well to apply to importing (`--recv-key') or exporting (`--send-key') a key from a keyserver. While not all options are @@ -1240,6 +1291,24 @@ When retrieving a key via DNS CERT, only accept keys up to this size. Defaults to 16384 bytes. + debug + Turn on debug output in the keyserver helper program. Note + that the details of debug output depends on which keyserver + helper program is being used, and in turn, on any libraries + that the keyserver helper program uses internally (libcurl, + openldap, etc). + + check-cert + Enable certificate checking if the keyserver presents one + (for hkps or ldaps). Defaults to on. + + ca-cert-file + Provide a certificate file to override the system default. + Only necessary if check-cert is enabled, and the keyserver is + using a certificate that is not present in a system default + certificate list. + + `--completes-needed `n'' Number of completely trusted users to introduce a new key signer (defaults to 1). @@ -1634,28 +1703,31 @@ `--personal-cipher-preferences `string'' Set the list of personal cipher preferences to `string'. Use `gpg --version' to get a list of available algorithms, and use `none' - to set no preference at all. This allows the user to factor in - their own preferred algorithms when algorithms are chosen via - recipient key preferences. The most highly ranked cipher in this - list is also used for the `--symmetric' encryption command. + to set no preference at all. This allows the user to safely + override the algorithm chosen by the recipient key preferences, as + GPG will only select an algorithm that is usable by all + recipients. The most highly ranked cipher in this list is also + used for the `--symmetric' encryption command. `--personal-digest-preferences `string'' Set the list of personal digest preferences to `string'. Use `gpg --version' to get a list of available algorithms, and use `none' - to set no preference at all. This allows the user to factor in - their own preferred algorithms when algorithms are chosen via - recipient key preferences. The most highly ranked digest - algorithm in this list is algo used when signing without encryption - (e.g. `--clearsign' or `--sign'). The default value is SHA-1. + to set no preference at all. This allows the user to safely + override the algorithm chosen by the recipient key preferences, as + GPG will only select an algorithm that is usable by all + recipients. The most highly ranked digest algorithm in this list + is also used when signing without encryption (e.g. `--clearsign' + or `--sign'). The default value is SHA-1. `--personal-compress-preferences `string'' Set the list of personal compression preferences to `string'. Use `gpg --version' to get a list of available algorithms, and use `none' to set no preference at all. This allows the user to - factor in their own preferred algorithms when algorithms are - chosen via recipient key preferences. The most highly ranked - compression algorithm in this list is algo used when there are no - recipient keys to consider (e.g. `--symmetric'). + safely override the algorithm chosen by the recipient key + preferences, as GPG will only select an algorithm that is usable + by all recipients. The most highly ranked compression algorithm + in this list is also used when there are no recipient keys to + consider (e.g. `--symmetric'). `--s2k-cipher-algo `name'' Use `name' as the cipher algorithm used to protect secret keys. @@ -1726,8 +1798,8 @@ common baseline. This option implies `--rfc1991 --disable-mdc --no-force-v4-certs - --no-sk-comment --escape-from-lines --force-v3-sigs --cipher-algo - IDEA --digest-algo MD5 --compress-algo ZIP'. It also disables + --escape-from-lines --force-v3-sigs --cipher-algo IDEA + --digest-algo MD5 --compress-algo ZIP'. It also disables `--textmode' when encrypting. `--pgp6' @@ -1738,8 +1810,8 @@ -throw-keyids, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. - This option implies `--disable-mdc --no-sk-comment - --escape-from-lines --force-v3-sigs'. + This option implies `--disable-mdc --escape-from-lines + --force-v3-sigs'. `--pgp7' Set up all options to be as PGP 7 compliant as possible. This is @@ -1801,11 +1873,12 @@ `file'. `--logger-fd `n'' - Write log output to file descriptor `n' and not to stderr. + Write log output to file descriptor `n' and not to STDERR. +`--log-file `file'' `--logger-file `file'' Same as `--logger-fd', except the logger data is written to file - `file'. + `file'. Note that `--log-file' is only implemented for GnuPG-2. `--attribute-fd `n'' Write attribute subpackets to the file descriptor `n'. This is most @@ -1890,11 +1963,12 @@ `--for-your-eyes-only' `--no-for-your-eyes-only' - Set the `for your eyes only' flag in the message. This causes GnuPG - to refuse to save the file unless the `--output' option is given, - and PGP to use the "secure viewer" with a Tempest-resistant font to - display the message. This option overrides `--set-filename'. - `--no-for-your-eyes-only' disables this option. + Set the `for your eyes only' flag in the message. This causes + GnuPG to refuse to save the file unless the `--output' option is + given, and PGP to use a "secure viewer" with a claimed + Tempest-resistant font to display the message. This option + overrides `--set-filename'. `--no-for-your-eyes-only' disables + this option. `--use-embedded-filename' `--no-use-embedded-filename' @@ -1964,11 +2038,11 @@ `--no-throw-keyids' Do not put the recipient key IDs into encrypted messages. This helps to hide the receivers of the message and is a limited - countermeasure against traffic analysis. On the receiving side, it - may slow down the decryption process because all available secret - keys must be tried. `--no-throw-keyids' disables this option. - This option is essentially the same as using `--hidden-recipient' - for all recipients. + countermeasure against traffic analysis.(1) On the receiving + side, it may slow down the decryption process because all + available secret keys must be tried. `--no-throw-keyids' disables + this option. This option is essentially the same as using + `--hidden-recipient' for all recipients. `--not-dash-escaped' This option changes the behavior of cleartext signatures so that @@ -1995,7 +2069,7 @@ `--passphrase-fd `n'' Read the passphrase from file descriptor `n'. Only the first line will be read from file descriptor `n'. If you use 0 for `n', the - passphrase will be read from stdin. This can only be used if only + passphrase will be read from STDIN. This can only be used if only one passphrase is supplied. `--passphrase-file `file'' @@ -2149,11 +2223,14 @@ `--allow-multiple-messages' `--no-allow-multiple-messages' - Allow processing of multiple OpenPGP messages contained in a single - file or stream. Some programs that call GPG are not prepared to - deal with multiple messages being processed together, so this - option defaults to no. Note that versions of GPG prior to 1.4.7 - always allowed multiple messages. + Allow processing of multiple OpenPGP messages contained in a + single file or stream. Some programs that call GPG are not + prepared to deal with multiple messages being processed together, + so this option defaults to no. Note that versions of GPG prior to + 1.4.7 always allowed multiple messages. + + Warning: Do not use this option unless you need it as a temporary + workaround! `--enable-special-filenames' This options enables a mode in which filenames of the form `-&n', @@ -2245,6 +2322,12 @@ [no-]show-policy-url' instead. + ---------- Footnotes ---------- + + (1) Using a little social engineering anyone who is able to decrypt +the message can check whether one of the other recipients is the one he +suspects. +  File: gnupg1.info, Node: GPG Configuration, Next: GPG Examples, Prev: GPG Options, Up: Invoking GPG @@ -2260,6 +2343,7 @@ It may contain any valid long option; the leading two dashes may not be entered and the option may not be abbreviated. This default name may be changed on the command line (*note option --options::). + You should backup this file. Note that on larger installations, it is useful to put predefined @@ -2271,31 +2355,33 @@ --homedir::). Only the `gpg' may modify these files. `~/.gnupg/secring.gpg' - The secret keyring. + The secret keyring. You should backup this file. `~/.gnupg/secring.gpg.lock' - and the lock file + The lock file for the secret keyring. `~/.gnupg/pubring.gpg' - The public keyring + The public keyring. You should backup this file. `~/.gnupg/pubring.gpg.lock' - and the lock file + The lock file for the public keyring. `~/.gnupg/trustdb.gpg' - The trust database + The trust database. There is no need to backup this file; it is + better to backup the ownertrust values (*note option + --export-ownertrust::). `~/.gnupg/trustdb.gpg.lock' - and the lock file + The lock file for the trust database. `~/.gnupg/random_seed' - used to preserve the internal random pool + A file used to preserve the state of the internal random pool. `/usr[/local]/share/gnupg/options.skel' - Skeleton options file + The skeleton options file. `/usr[/local]/lib/gnupg/' - Default location for extensions + Default location for extensions. Operation is further controlled by a few environment variables: @@ -2317,7 +2403,7 @@ PINENTRY_USER_DATA This value is passed via gpg-agent to pinentry. It is useful to - convey extra information to a custom pinentry + convey extra information to a custom pinentry. COLUMNS LINES @@ -2326,11 +2412,12 @@ LANGUAGE Apart from its use by GNU, it is used in the W32 version to override the language selection done through the Registry. If - used and set to a a valid and available language name (LANGID), - the file with the translation is loaded from + used and set to a valid and available language name (LANGID), the + file with the translation is loaded from `GPGDIR/gnupg.nls/LANGID.mo'. Here GPGDIR is the directory out of - which the gpg binary has been laoded. If it can't be loaded the - Registry is tried as a fallback. + which the gpg binary has been loaded. If it can't be loaded the + Registry is tried and as last resort the native Windows locale + system is used.  @@ -2348,6 +2435,9 @@ gpg -sb `file' make a detached signature +gpg -u 0x12345678 -sb `file' + make a detached signature with the key 0x12345678 + gpg -list-keys `user_ID' show keys @@ -2384,7 +2474,7 @@ If you are going to verify detached signatures, make sure that the program knows about it; either give both filenames on the command line -or use `-' to specify stdin. +or use `-' to specify STDIN. INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS ******************************************** @@ -3282,49 +3372,49 @@ * Menu: * --enarmor: Operational GPG Commands. - (line 290) + (line 304) * armor: GPG Input and Output. (line 8) * batch: GPG Configuration Options. (line 39) * card-edit: Operational GPG Commands. - (line 144) -* card-status: Operational GPG Commands. (line 150) +* card-status: Operational GPG Commands. + (line 156) * change-pin: Operational GPG Commands. - (line 153) + (line 159) * check-sigs: Operational GPG Commands. - (line 123) + (line 127) * check-trustdb: Operational GPG Commands. - (line 243) + (line 250) * clearsign: Operational GPG Commands. - (line 15) + (line 17) * debug: GPG Esoteric Options. (line 22) * decrypt: Operational GPG Commands. - (line 48) + (line 52) * decrypt-files: Operational GPG Commands. - (line 83) + (line 87) * default-key: GPG Configuration Options. (line 10) * default-keyserver-url: GPG Esoteric Options. - (line 419) + (line 424) * default-preference-list: GPG Esoteric Options. - (line 414) + (line 419) * default-recipient: GPG Configuration Options. (line 15) * default-recipient-self: GPG Configuration Options. (line 19) * delete-key: Operational GPG Commands. - (line 158) + (line 164) * delete-secret-and-public-key: Operational GPG Commands. - (line 167) + (line 173) * delete-secret-key: Operational GPG Commands. - (line 163) + (line 169) * desig-revoke: OpenPGP Key Management. (line 21) * detach-sign: Operational GPG Commands. - (line 23) + (line 27) * dry-run: GPG Esoteric Options. (line 8) * dump-options: General GPG Commands. @@ -3332,212 +3422,212 @@ * edit-key: OpenPGP Key Management. (line 26) * enarmor: Operational GPG Commands. - (line 290) + (line 304) * encrypt: Operational GPG Commands. - (line 27) + (line 31) * encrypt-files: Operational GPG Commands. - (line 80) + (line 84) * export: Operational GPG Commands. - (line 172) + (line 178) * export-ownertrust: Operational GPG Commands. - (line 258) + (line 265) * export-secret-keys: Operational GPG Commands. - (line 187) + (line 194) * export-secret-subkeys: Operational GPG Commands. - (line 187) + (line 194) * fetch-keys: Operational GPG Commands. - (line 228) + (line 235) * fingerprint: Operational GPG Commands. - (line 133) + (line 139) * fixed-list-mode: GPG Input and Output. (line 117) * gen-key: OpenPGP Key Management. (line 9) * gen-prime: Operational GPG Commands. - (line 284) + (line 298) * gen-random: Operational GPG Commands. - (line 278) + (line 292) * gen-revoke: OpenPGP Key Management. (line 17) -* gnupg: OpenPGP Options. (line 111) +* gnupg: OpenPGP Options. (line 114) * gpgconf-list: GPG Esoteric Options. - (line 432) + (line 437) * gpgconf-test: GPG Esoteric Options. - (line 436) + (line 441) * help: General GPG Commands. (line 12) * hidden-recipient: GPG Key related Options. (line 14) * homedir: GPG Configuration Options. - (line 212) + (line 217) * import: Operational GPG Commands. - (line 197) + (line 204) * import-ownertrust: Operational GPG Commands. - (line 263) + (line 271) * interactive: GPG Esoteric Options. (line 19) * keyedit:addcardkey: OpenPGP Key Management. - (line 97) + (line 163) * keyedit:addkey: OpenPGP Key Management. - (line 94) + (line 160) * keyedit:addphoto: OpenPGP Key Management. - (line 74) + (line 81) * keyedit:addrevoker: OpenPGP Key Management. - (line 127) + (line 211) * keyedit:adduid: OpenPGP Key Management. - (line 71) + (line 78) * keyedit:bkuptocard: OpenPGP Key Management. - (line 111) + (line 177) * keyedit:check: OpenPGP Key Management. - (line 159) + (line 75) * keyedit:clean: OpenPGP Key Management. - (line 207) + (line 223) * keyedit:cross-certify: OpenPGP Key Management. - (line 221) + (line 237) * keyedit:delkey: OpenPGP Key Management. - (line 122) + (line 188) * keyedit:delsig: OpenPGP Key Management. - (line 86) + (line 65) * keyedit:deluid: OpenPGP Key Management. - (line 81) + (line 91) * keyedit:disable: OpenPGP Key Management. - (line 67) + (line 207) * keyedit:enable: OpenPGP Key Management. - (line 67) + (line 207) * keyedit:expire: OpenPGP Key Management. - (line 135) + (line 196) * keyedit:key: OpenPGP Key Management. - (line 155) + (line 35) * keyedit:keyserver: OpenPGP Key Management. - (line 189) + (line 108) * keyedit:keytocard: OpenPGP Key Management. - (line 100) + (line 166) * keyedit:lsign: OpenPGP Key Management. - (line 38) + (line 46) * keyedit:minimize: OpenPGP Key Management. - (line 216) + (line 232) * keyedit:notation: OpenPGP Key Management. - (line 196) + (line 115) * keyedit:nrsign: OpenPGP Key Management. - (line 43) + (line 51) * keyedit:passwd: OpenPGP Key Management. - (line 140) + (line 217) * keyedit:pref: OpenPGP Key Management. - (line 165) + (line 123) * keyedit:primary: OpenPGP Key Management. - (line 143) + (line 100) * keyedit:quit: OpenPGP Key Management. - (line 230) + (line 248) * keyedit:revkey: OpenPGP Key Management. - (line 132) + (line 193) * keyedit:revsig: OpenPGP Key Management. - (line 57) + (line 70) * keyedit:revuid: OpenPGP Key Management. - (line 91) + (line 97) * keyedit:save: OpenPGP Key Management. - (line 227) + (line 245) * keyedit:setpref: OpenPGP Key Management. - (line 177) + (line 135) * keyedit:showphoto: OpenPGP Key Management. - (line 162) + (line 88) * keyedit:showpref: OpenPGP Key Management. - (line 169) + (line 127) * keyedit:sign: OpenPGP Key Management. - (line 31) + (line 39) * keyedit:toggle: OpenPGP Key Management. - (line 204) + (line 220) * keyedit:trust: OpenPGP Key Management. - (line 62) + (line 202) * keyedit:tsign: OpenPGP Key Management. - (line 47) + (line 55) * keyedit:uid: OpenPGP Key Management. - (line 151) + (line 31) * list-config: GPG Esoteric Options. - (line 424) + (line 429) * list-keys: Operational GPG Commands. - (line 88) + (line 92) * list-options: GPG Configuration Options. - (line 54) + (line 59) * list-options:show-notations: GPG Configuration Options. - (line 73) + (line 78) * list-options:show-photos: GPG Configuration Options. - (line 62) -* list-options:show-policy-urls: GPG Configuration Options. (line 67) +* list-options:show-policy-urls: GPG Configuration Options. + (line 72) * list-options:show-std-notations: GPG Configuration Options. - (line 73) + (line 78) * list-options:show-user-notations: GPG Configuration Options. - (line 73) + (line 78) * list-packets: Operational GPG Commands. - (line 140) + (line 146) * list-secret-keys: Operational GPG Commands. - (line 101) + (line 105) * list-sigs: Operational GPG Commands. - (line 107) + (line 111) * local-user: GPG Key related Options. (line 63) * lsign-key: OpenPGP Key Management. - (line 265) + (line 283) * mangle-dos-filenames: GPG Configuration Options. - (line 303) + (line 308) * max-output: GPG Input and Output. (line 19) * multifile: Operational GPG Commands. - (line 69) + (line 73) * no: GPG Configuration Options. - (line 51) + (line 56) * no-batch: GPG Configuration Options. (line 39) * no-default-recipient: GPG Configuration Options. (line 25) * no-mangle-dos-filenames: GPG Configuration Options. - (line 303) + (line 308) * no-tty: GPG Configuration Options. - (line 43) + (line 48) * no-verbose: GPG Configuration Options. (line 32) -* openpgp: OpenPGP Options. (line 119) +* openpgp: OpenPGP Options. (line 122) * output: GPG Input and Output. (line 16) -* pgp2: OpenPGP Options. (line 137) -* pgp6: OpenPGP Options. (line 150) -* pgp7: OpenPGP Options. (line 161) -* pgp8: OpenPGP Options. (line 167) +* pgp2: OpenPGP Options. (line 140) +* pgp6: OpenPGP Options. (line 153) +* pgp7: OpenPGP Options. (line 164) +* pgp8: OpenPGP Options. (line 170) * print-md: Operational GPG Commands. - (line 273) + (line 287) * quiet: GPG Configuration Options. (line 35) * rebuild-keydb-caches: Operational GPG Commands. - (line 267) + (line 281) * recipient: GPG Key related Options. (line 8) * recv-keys: Operational GPG Commands. - (line 206) + (line 213) * refresh-keys: Operational GPG Commands. - (line 210) -* rfc1991: OpenPGP Options. (line 134) -* rfc2440: OpenPGP Options. (line 130) -* rfc4880: OpenPGP Options. (line 125) + (line 217) +* rfc1991: OpenPGP Options. (line 137) +* rfc2440: OpenPGP Options. (line 133) +* rfc4880: OpenPGP Options. (line 128) * search-keys: Operational GPG Commands. - (line 219) + (line 226) * send-keys: Operational GPG Commands. - (line 179) + (line 185) * sign: Operational GPG Commands. (line 8) * sign-key: OpenPGP Key Management. - (line 261) + (line 279) * store: Operational GPG Commands. - (line 44) + (line 48) * symmetric: Operational GPG Commands. - (line 35) + (line 39) * update-trustdb: Operational GPG Commands. - (line 233) + (line 240) * verbose: GPG Configuration Options. (line 28) * verify: Operational GPG Commands. - (line 56) + (line 60) * verify-files: Operational GPG Commands. - (line 77) + (line 81) * version: General GPG Commands. (line 7) * warranty: General GPG Commands. @@ -3547,7 +3637,7 @@ * with-fingerprint: GPG Input and Output. (line 121) * yes: GPG Configuration Options. - (line 48) + (line 53)  File: gnupg1.info, Node: Index, Prev: Option Index, Up: Top @@ -3560,32 +3650,34 @@ * command options: Invoking GPG. (line 6) * GPG command options: Invoking GPG. (line 6) -* gpgsm.conf: GPG Configuration. (line 11) +* gpg.conf: GPG Configuration. (line 11) * options, GPG command: Invoking GPG. (line 6)  Tag Table: Node: Top717 -Node: Invoking GPG1760 -Node: GPG Commands2536 -Node: General GPG Commands3367 -Node: Operational GPG Commands3998 -Node: OpenPGP Key Management16922 -Node: GPG Options27374 -Node: GPG Configuration Options28604 -Ref: option --homedir36733 -Ref: option --options39283 -Node: GPG Key related Options57206 -Node: GPG Input and Output60205 -Node: OpenPGP Options65614 -Node: GPG Esoteric Options73513 -Node: GPG Configuration94943 -Node: GPG Examples97775 -Node: Specify a User ID101785 -Ref: how-to-specify-a-user-id101934 -Node: Copying106565 -Node: Option Index144198 -Node: Index162904 +Node: Invoking GPG1762 +Node: GPG Commands2538 +Node: General GPG Commands3369 +Node: Operational GPG Commands4001 +Ref: option --export-ownertrust15970 +Node: OpenPGP Key Management17685 +Node: GPG Options29225 +Node: GPG Configuration Options30455 +Ref: option --homedir38924 +Ref: option --options41475 +Node: GPG Key related Options60707 +Node: GPG Input and Output63706 +Node: OpenPGP Options69115 +Node: GPG Esoteric Options77126 +Ref: GPG Esoteric Options-Footnote-198774 +Node: GPG Configuration98928 +Node: GPG Examples102125 +Node: Specify a User ID106220 +Ref: how-to-specify-a-user-id106369 +Node: Copying111000 +Node: Option Index148633 +Node: Index167339  End Tag Table diff -Nru gnupg-1.4.9/doc/gpg.ru.1 gnupg-1.4.10/doc/gpg.ru.1 --- gnupg-1.4.9/doc/gpg.ru.1 2007-10-23 11:42:53.000000000 +0100 +++ gnupg-1.4.10/doc/gpg.ru.1 2008-12-11 16:42:00.000000000 +0000 @@ -1,10 +1,64 @@ +.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $ +.\" +.\" transcript compatibility for postscript use. +.\" +.\" synopsis: .P! +.\" +.de P! +.fl +\!!1 setgray +.fl +\\&.\" +.fl +\!!0 setgray +.fl \" force out current output buffer +\!!save /psv exch def currentpoint translate 0 0 moveto +\!!/showpage{}def +.fl \" prolog +.sy sed -e 's/^/!/' \\$1\" bring in postscript file +\!!psv restore +. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 +.. +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow +.. +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +'\" t +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n .TH "gpg" "1" .SH "NAME" gpg \(em ÉÎÓÔÒÕÍÅÎÔ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ É ÃÉÆÒÏ×ÏÊ ÐÏÄÐÉÓÉ .SH "SYNOPSIS" .PP .nf -\fBgpg\fR [\-\-homedir \fBname\fR] [\-\-options \fBfile\fR] [\fBoptions\fR] \fBcommand\fR [\fBargs\fR] +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +\fBgpg\fR [--homedir \fBname\fR] [--options \fBfile\fR] [\fBoptions\fR] \fBcommand\fR [\fBargs\fR] .fi .SH "ïðéóáîéå" .PP @@ -25,7 +79,7 @@ ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÒÁÚÂÏÒ ÐÁÒÁÍÅÔÒÏ× ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÓÒÁÚÕ ÐÏÓÌÅ ÔÏÇÏ, ËÁË × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ×ÓÔÒÅÞÁÅÔÓÑ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ÐÁÒÁÍÅÔÒÏÍ. ÷Ù ÍÏÖÅÔÅ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÐÒÅËÒÁÔÉÔØ ÒÁÚÂÏÒ ÐÁÒÁÍÅÔÒÏ×, ÉÓÐÏÌØÚÕÑ ÓÐÅÃÉÁÌØÎÙÊ -ÐÁÒÁÍÅÔÒ "\-\-". +ÐÁÒÁÍÅÔÒ "--". .SH "ëïíáîäù" .PP \fBgpg\fR ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ ÂÅÚ ÕËÁÚÁÎÉÑ ËÏÍÁÎÄÙ, × ÜÔÏÍ ÓÌÕÞÁÅ ÏÎ @@ -34,46 +88,46 @@ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ËÌÀÞÉ, ÔÏ ×Ù×ÏÄÉÔÓÑ ÉÈ ÓÐÉÓÏË). .PP \fBgpg\fR ÒÁÓÐÏÚÎÁ£Ô ÓÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ: -.IP "\-s, \-\-sign" 10 +.IP "-s, --sign" 10 óÏÚÄÁÔØ ÐÏÄÐÉÓØ. äÁÎÎÁÑ ËÏÍÁÎÄÁ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó -\-\-encrypt (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), -\-\-symmetric (ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÏÏÂÝÅÎÉÊ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ -ÓÉÍÍÅÔÒÉÞÎÙÍ ÛÉÆÒÏÍ) ÉÌÉ Ó \-\-encrypt É \-\-symmetric ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ +--encrypt (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), +--symmetric (ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÏÏÂÝÅÎÉÊ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ +ÓÉÍÍÅÔÒÉÞÎÙÍ ÛÉÆÒÏÍ) ÉÌÉ Ó --encrypt É --symmetric ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÒÁÓÛÉÆÒÏ×ÁÎÙ ÉÌÉ Ó ÐÏÍÏÝØÀ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÉÌÉ ÐÏÓÒÅÄÓÔ×ÏÍ ËÌÀÞÅ×ÏËÌÀÞÅ×ÏÊ ÆÒÁÚÙ). -.IP "\-\-clearsign" 10 +.IP "--clearsign" 10 óÏÚÄÁÔØ ÐÒÏÚÒÁÞÎÕÀ ÐÏÄÐÉÓØ. -.IP "\-b, \-\-detach-sign" 10 +.IP "-b, --detach-sign" 10 óÏÚÄÁÔØ ÏÔÄÅÌ£ÎÎÕÀ ÐÏÄÐÉÓØ. -.IP "\-e, \-\-encrypt" 10 -úÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ. íÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó \-\-sign (ÄÌÑ -ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), \-\-symmetric (ÄÌÑ +.IP "-e, --encrypt" 10 +úÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ. íÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó --sign (ÄÌÑ +ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), --symmetric (ÄÌÑ ÓÏÚÄÁÎÉÑ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÒÁÓÛÉÆÒÏ×ÁÔØ ËÁË Ó ÐÏÍÏÝØÀ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÔÁË É ÉÓÐÏÌØÚÕÑ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ) ÉÌÉ Ó -\-\-sign É \-\-symmetric ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ +--sign É --symmetric ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÒÁÓÛÉÆÒÏ×ÁÔØ ËÁË Ó ÐÏÍÏÝØÀ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÔÁË É ÉÓÐÏÌØÚÕÑ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ). -.IP "\-c, \-\-symmetric" 10 +.IP "-c, --symmetric" 10 úÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ ÉÓÐÏÌØÚÕÑ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ (ÐÁÒÏÌØ). ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÁÌÇÏÒÉÔÍ CAST5. äÌÑ ×ÙÂÏÒÁ ÄÒÕÇÏÇÏ ÁÌÇÏÒÉÔÍÁ -ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒÏÍ \-\-cipher-algo. íÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ -ÓÏ×ÍÅÓÔÎÏ Ó \-\-sign (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), -\-\-encrypt (ÄÌÑ ÓÏÚÄÁÎÉÑ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÖÎÏ +ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒÏÍ --cipher-algo. íÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ +ÓÏ×ÍÅÓÔÎÏ Ó --sign (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ), +--encrypt (ÄÌÑ ÓÏÚÄÁÎÉÑ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÒÁÓÛÉÆÒÏ×ÁÔØ ËÁË Ó ÐÏÍÏÝØÀ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÔÁË É ÉÓÐÏÌØÚÕÑ ËÌÀÞÅ×ÕÀ -ÆÒÁÚÕ) ÉÌÉ Ó \-\-sign É \-\-encrypt ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É +ÆÒÁÚÕ) ÉÌÉ Ó --sign É --encrypt ÓÒÁÚÕ (ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÁÎÎÙÈ É ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÒÁÓÛÉÆÒÏ×ÁÔØ ËÁË Ó ÐÏÍÏÝØÀ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÔÁË É ÉÓÐÏÌØÚÕÑ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ). -.IP "\-\-store" 10 +.IP "--store" 10 óÏÚÄÁ£Ô ÐÁËÅÔ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó RFC1991. -.IP "\-\-decrypt [\fBfile\fR]" 10 +.IP "--decrypt [\fBfile\fR]" 10 òÁÓÛÉÆÒÏ×Ù×ÁÅÔ \fBfile\fR (ÉÌÉ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ ÆÁÊÌ ÎÅ ÚÁÄÁÎ) É ×Ù×ÏÄÉÔ ÅÇÏ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ (ÉÌÉ × ÆÁÊÌ ÏÐÒÅÄÅÌ£ÎÎÙÊ ÐÁÒÁÍÅÔÒÏÍ -\-\-output). åÓÌÉ ÒÁÓÛÉÆÒÏ×ÁÎÎÙÊ ÆÁÊÌ ÐÏÄÐÉÓÁÎ, ÔÏ ÔÁËÖÅ ÐÒÏ×ÅÒÑÅÔÓÑ +--output). åÓÌÉ ÒÁÓÛÉÆÒÏ×ÁÎÎÙÊ ÆÁÊÌ ÐÏÄÐÉÓÁÎ, ÔÏ ÔÁËÖÅ ÐÒÏ×ÅÒÑÅÔÓÑ ÐÏÄÐÉÓØ. üÔÁ ËÏÍÁÎÄÁ ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÏÐÅÒÁÃÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÔÅÍ, ÞÔÏ ÎÉËÏÇÄÁ ÎÅ ÓÏÈÒÁÎÑÅÔ ÒÅÚÕÌØÔÁÔ × ÆÁÊÌÅ Ó ÉÍÅÎÅÍ ÕËÁÚÁÎÎÙÍ × ÚÁÛÉÆÒÏ×ÁÎÎÏÍ ÆÁÊÌÅ É ÎÅ ÏÂÒÁÂÁÔÙ×ÁÅÔ ÆÁÊÌÙ ÎÅ ÎÁÞÉÎÁÀÝÉÅÓÑ Ó ÚÁÛÉÆÒÏ×ÁÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ. -.IP "\-\-verify [[\fBsigfile\fR] [\fBsigned-files\fR]]" 10 +.IP "--verify [[\fBsigfile\fR] [\fBsigned-files\fR]]" 10 ðÒÅÄÐÏÌÁÇÁÅÔ, ÞÔÏ \fBsigfile\fR ÓÏÄÅÒÖÉÔ ÐÏÄÐÉÓØ É ÐÒÏ×ÅÒÑÅÔ Å£, ÎÅ ×Ù×ÏÄÑ ÓÏÄÅÒÖÉÍÏÅ ÄÏËÕÍÅÎÔÁ. âÅÚ ÁÒÇÕÍÅÎÔÏ×, ÓÞÉÔÙ×ÁÅÔ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ. åÓÌÉ ÚÁÄÁÎ ÔÏÌØËÏ ÆÁÊÌ ÐÏÄÐÉÓÉ, ÔÏ × Î£Í @@ -86,72 +140,72 @@ ×ÔÏÒÏÇÏ ÆÁÊÌÁ. ðÏ ÐÒÉÞÉÎÁÍ ÂÅÚÏÐÁÓÎÏÓÔÉ, ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÏÔÄÅÌ£ÎÎÏÊ ÐÏÄÐÉÓÉ, ÐÏÄÐÉÓÁÎÎÙÊ ÍÁÔÅÒÉÁÌ ÎÅ ÍÏÖÅÔ ÓÞÉÔÙ×ÁÔØÓÑ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ ÂÅÚ Ñ×ÎÏÇÏ ÕËÁÚÁÎÉÑ ×ÙÛÅÏÚÎÁÞÅÎÎÙÍ ÏÂÒÁÚÏÍ. -.IP "\-\-multifile" 10 +.IP "--multifile" 10 éÚÍÅÎÑÅÔ ÐÏ×ÅÄÅÎÉÅ ÎÅËÏÔÏÒÙÈ ÄÒÕÇÉÈ ËÏÍÁÎÄ ÔÁË, ÞÔÏÂÙ ÏÎÉ ÍÏÇÌÉ ÏÂÒÁÂÁÔÙ×ÁÔØ ÓÒÁÚÕ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ×. éÍÅÎÁ ÆÁÊÌÏ× ÕËÁÚÙ×ÁÀÔÓÑ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ÉÌÉ ÐÏÄÁÀÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ ÐÏ ÏÄÎÏÍÕ × ÓÔÒÏËÅ. üÔÏ ÐÏÚ×ÏÌÑÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÍÎÏÖÅÓÔ×Ï ÆÁÊÌÏ× ÏÄÎÏÊ ËÏÍÁÎÄÏÊ. ÷ ÎÁÓÔÏÑÝÅÅ -×ÒÅÍÑ \-\-multifile ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó \-\-verify, -\-\-encrypt, É \-\-decrypt. úÁÍÅÔØÔÅ, ÞÔÏ "\-\-multifile \-\-verify" ÎÅÌØÚÑ +×ÒÅÍÑ --multifile ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó --verify, +--encrypt, É --decrypt. úÁÍÅÔØÔÅ, ÞÔÏ "--multifile --verify" ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÒÏ×ÅÒËÉ ÏÔÄÅÌ£ÎÎÙÈ ÐÏÄÐÉÓÅÊ. -.IP "\-\-verify-files [\fBfiles\fR]" 10 -éÄÅÎÔÉÞÎÁ \-\-multifile \-\-verify. -.IP "\-\-encrypt-files [\fBfiles\fR]" 10 -éÄÅÎÔÉÞÎÁ \-\-multifile \-\-encrypt. -.IP "\-\-decrypt-files [\fBfiles\fR]" 10 -éÄÅÎÔÉÞÎÁ \-\-multifile \-\-decrypt. -.IP "\-\-list-keys [\fBnames\fR]" 10 -.IP "\-\-list-public-keys [\fBnames\fR]" 10 +.IP "--verify-files [\fBfiles\fR]" 10 +éÄÅÎÔÉÞÎÁ --multifile --verify. +.IP "--encrypt-files [\fBfiles\fR]" 10 +éÄÅÎÔÉÞÎÁ --multifile --encrypt. +.IP "--decrypt-files [\fBfiles\fR]" 10 +éÄÅÎÔÉÞÎÁ --multifile --decrypt. +.IP "--list-keys [\fBnames\fR]" 10 +.IP "--list-public-keys [\fBnames\fR]" 10 ÷Ù×ÏÄÉÔ ×ÓÅ ËÌÀÞÉ ÉÚ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ, ÉÌÉ ÔÏÌØËÏ ÕËÁÚÁÎÎÙÅ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. .IP "" 10 îÅ ÓÌÅÄÕÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ×Ù×ÏÄ ÄÁÎÎÏÊ ËÏÍÁÎÄÙ × ÓÃÅÎÁÒÉÑÈ É ÄÒÕÇÉÈ ÐÒÏÇÒÁÍÍÁÈ, Ô.Ë. ÆÏÒÍÁÔ ×Ù×ÏÄÁ ÍÏÖÅÔ ÍÅÎÑÔØÓÑ × ÒÁÚÎÙÈ ×ÅÒÓÉÑÈ GnuPG. äÌÑ ÍÁÛÉÎÎÏÊ ÏÂÒÁÂÏÔËÉ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ ×Ù×ÏÄ ËÏÍÁÎÄÙ -\-\-with-colons. -.IP "\-K, \-\-list-secret-keys [\fBnames\fR]" 10 +--with-colons. +.IP "-K, --list-secret-keys [\fBnames\fR]" 10 ÷Ù×ÏÄÉÔ ×ÓÅ ËÌÀÞÉ ÉÚ Ó×ÑÚËÉ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ, ÉÌÉ ÔÏÌØËÏ ÕËÁÚÁÎÎÙÅ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. úÎÁË '#' ÐÏÓÌÅ ÓÉÍ×ÏÌÏ× sec ÏÚÎÁÞÁÅÔ, ÞÔÏ ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ (ÎÁÐÒ., ÅÓÌÉ ÏÎ ÂÙÌ ÓÏÚÄÁÎ ËÏÍÁÎÄÏÊ -\-\-export-secret-subkeys). -.IP "\-\-list-sigs [\fBnames\fR]" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-list-keys, ÎÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ ×Ù×ÏÄÉÔ ÐÏÄÐÉÓÉ ÎÁ ËÌÀÞÁÈ. +--export-secret-subkeys). +.IP "--list-sigs [\fBnames\fR]" 10 +ôÏ ÖÅ, ÞÔÏ É --list-keys, ÎÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ ×Ù×ÏÄÉÔ ÐÏÄÐÉÓÉ ÎÁ ËÌÀÞÁÈ. .IP "" 10 äÌÑ ËÁÖÄÏÊ ÐÏÄÐÉÓÉ ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ÆÌÁÇÏ× ÍÅÖÄÕ ÔÜÇÏÍ "sig" É ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ. üÔÉ ÆÌÁÇÉ ÓÏÄÅÒÖÁÔ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ËÁÖÄÏÊ ÐÏÄÐÉÓÉ. ãÉÆÒÙ 1-3 ÕËÁÚÙ×ÁÀÔ ÎÁ ÕÒÏ×ÅÎØ ÐÒÏ×ÅÒËÉ ÓÅÒÔÉÆÉËÁÔÁ (ÓÍ. -\-\-ask-cert-level), "L" ÄÌÑ ÌÏËÁÌØÎÙÈ ÉÌÉ ÎÅÜËÓÐÏÒÔÉÒÕÅÍÙÈ ÐÏÄÐÉÓÅÊ (ÓÍ. -\-\-lsign-key), "R" ÄÌÑ ÎÅÏÔÚÙ×ÁÅÍÙÈ ÐÏÄÐÉÓÅÊ (ÓÍ. nrsign × ÏÐÉÓÁÎÉÉ -\-\-edit-key), "P" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÏÄÅÒÖÁÝÉÈ URL ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ (ÓÍ. -\-\-cert-policy-url), "N" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÏÄÅÒÖÁÝÉÈ ÐÒÉÍÅÞÁÎÉÅ (ÓÍ. -\-\-cert-notation), "X" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÏÔÏÒÙÈ ÉÓÔ£Ë. (ÓÍ. -\-\-ask-cert-expire), ÃÉÆÒÙ 1-9 ÉÌÉ "T" ÄÌÑ 10 É ÂÏÌÅÅ, ÞÔÏÂÙ ÕËÁÚÁÔØ -ÕÒÏ×ÅÎØ ÄÏ×ÅÒÑÀÝÅÊ ÐÏÄÐÉÓÉ (ÓÍ. tsign × ÏÐÉÓÁÎÉÉ ËÏÍÁÎÄÙ \-\-edit-key). -.IP "\-\-check-sigs [\fBnames\fR]" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-list-sigs, ÎÏ ÐÏÄÐÉÓÉ ÐÒÏ×ÅÒÑÀÔÓÑ. -.IP "\-\-fingerprint [\fBnames\fR]" 10 -÷Ù×ÏÄÉÔ ×ÓÅ ËÌÀÞÉ É ÉÈ ÏÔÐÅÞÁÔËÉ. üÔÏ ÔÏÔ ÖÅ ×Ù×ÏÄ, ÞÔÏ É Õ \-\-list-keys, +--ask-cert-level), "L" ÄÌÑ ÌÏËÁÌØÎÙÈ ÉÌÉ ÎÅÜËÓÐÏÒÔÉÒÕÅÍÙÈ ÐÏÄÐÉÓÅÊ (ÓÍ. +--lsign-key), "R" ÄÌÑ ÎÅÏÔÚÙ×ÁÅÍÙÈ ÐÏÄÐÉÓÅÊ (ÓÍ. nrsign × ÏÐÉÓÁÎÉÉ +--edit-key), "P" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÏÄÅÒÖÁÝÉÈ URL ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ (ÓÍ. +--cert-policy-url), "N" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÏÄÅÒÖÁÝÉÈ ÐÒÉÍÅÞÁÎÉÅ (ÓÍ. +--cert-notation), "X" ÄÌÑ ÐÏÄÐÉÓÅÊ ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÏÔÏÒÙÈ ÉÓÔ£Ë. (ÓÍ. +--ask-cert-expire), ÃÉÆÒÙ 1-9 ÉÌÉ "T" ÄÌÑ 10 É ÂÏÌÅÅ, ÞÔÏÂÙ ÕËÁÚÁÔØ +ÕÒÏ×ÅÎØ ÄÏ×ÅÒÑÀÝÅÊ ÐÏÄÐÉÓÉ (ÓÍ. tsign × ÏÐÉÓÁÎÉÉ ËÏÍÁÎÄÙ --edit-key). +.IP "--check-sigs [\fBnames\fR]" 10 +ôÏ ÖÅ, ÞÔÏ É --list-sigs, ÎÏ ÐÏÄÐÉÓÉ ÐÒÏ×ÅÒÑÀÔÓÑ. +.IP "--fingerprint [\fBnames\fR]" 10 +÷Ù×ÏÄÉÔ ×ÓÅ ËÌÀÞÉ É ÉÈ ÏÔÐÅÞÁÔËÉ. üÔÏ ÔÏÔ ÖÅ ×Ù×ÏÄ, ÞÔÏ É Õ --list-keys, ÎÏ ÄÌÑ ËÁÖÄÏÇÏ ËÌÀÞÁ ÄÏÂÁ×ÌÑÅÔÓÑ ÓÔÒÏËÁ, ÓÏÄÅÒÖÁÝÁÑ ÅÇÏ ÏÔÐÅÞÁÔÏË. íÏÖÅÔ -ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó \-\-list-sigs ÉÌÉ \-\-check-sigs. åÓÌÉ ËÏÍÁÎÄÁ +ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÏ×ÍÅÓÔÎÏ Ó --list-sigs ÉÌÉ --check-sigs. åÓÌÉ ËÏÍÁÎÄÁ ÚÁÄÁÎÁ Ä×ÁÖÄÙ, ÔÏ ×Ù×ÏÄÑÔÓÑ ÏÔÐÅÞÁÔËÉ É ÄÌÑ ÐÏÄÞÉΣÎÎÙÈ ËÌÀÞÅÊ. -.IP "\-\-list-packets" 10 +.IP "--list-packets" 10 ÷Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÁËÅÔÏ×. éÓÐÏÌØÚÕÅÔÓÑ, × ÏÓÎÏ×ÎÏÍ, ÄÌÑ ÏÔÌÁÄËÉ. -.IP "\-\-gen-key" 10 +.IP "--gen-key" 10 çÅÎÅÒÉÒÕÅÔ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ. äÁÎÎÁÑ ËÏÍÁÎÄÁ, ËÁË ÐÒÁ×ÉÌÏ, ÉÓÐÏÌØÚÕÅÔÓÑ ÔÏÌØËÏ ÉÎÔÅÒÁËÔÉ×ÎÏ. .IP "" 10 éÍÅÅÔÓÑ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÁÑ ×ÏÚÍÏÖÎÏÓÔØ, ÐÏÚ×ÏÌÑÀÝÁÑ ÇÅÎÅÒÉÒÏ×ÁÔØ ËÌÀÞÉ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ. ðÏÄÒÏÂÎÏÓÔÉ × ÆÁÊÌÅ \fBdoc/DETAILS\fP × ÉÓÈÏÄÎÏÍ ÄÉÓÔÒÉÂÕÔÉ×Å. -.IP "\-\-edit-key \fBname\fR" 10 +.IP "--edit-key \fBname\fR" 10 ðÒÅÄÏÓÔÁ×ÌÑÅÔ ÍÅÎÀ, ÐÏÚ×ÏÌÑÀÝÅÅ ×ÙÐÏÌÎÑÔØ ×ÓÅ ÚÁÄÁÞÉ ÐÏ ÕÐÒÁ×ÌÅÎÉÀ ËÌÀÞÁÍÉ: .RS .IP "sign" 10 ðÏÄÐÉÓÁÔØ ËÌÀÞ ÐÏÌØÚÏ×ÁÔÅÌÑ \fBname\fR. åÓÌÉ ËÌÀÞ ÎÅ ÂÙÌ ÅÝ£ ÐÏÄÐÉÓÁÎ ËÌÀÞÏÍ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÏ ÕÍÏÌÞÁÎÉÀ ( ÉÌÉ ÐÏÌØÚÏ×ÁÔÅÌÑ ÚÁÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÏÍ -\-u), ÔÏ ÐÒÏÇÒÁÍÍÁ ×Ù×ÏÄÉÔ ÉÎÆÏÒÍÁÃÉÀ Ï ËÌÀÞÅ, ×ÍÅÓÔÅ Ó ÏÔÐÅÞÁÔËÏÍ É +-u), ÔÏ ÐÒÏÇÒÁÍÍÁ ×Ù×ÏÄÉÔ ÉÎÆÏÒÍÁÃÉÀ Ï ËÌÀÞÅ, ×ÍÅÓÔÅ Ó ÏÔÐÅÞÁÔËÏÍ É ÚÁÐÒÁÛÉ×ÁÅÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÅ ÎÁ ÐÏÄÐÉÓØ ËÌÀÞÁ. ðÏÄÔ×ÅÒÖÄÅÎÉÅ ÚÁÐÒÁÛÉ×ÁÅÔÓÑ -ÄÌÑ ËÁÖÄÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÚÁÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÏÍ \-u. +ÄÌÑ ËÁÖÄÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÚÁÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÏÍ -u. .IP "lsign" 10 ôÏ ÖÅ, ÞÔÏ É "sign", ÎÏ ÐÏÄÐÉÓØ ÐÏÍÅÞÁÅÔÓÑ ËÁË ÎÅÜËÓÐÏÒÔÉÒÕÅÍÁÑ É ÎÉËÏÇÄÁ ÎÅ ÐÅÒÅÄÁ£ÔÓÑ ÄÒÕÇÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ. íÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ, ÞÔÏÂÙ @@ -210,7 +264,7 @@ ÐÏÚÖÅ ÉÓÐÏÌØÚÕÅÔÅ ËÏÍÁÎÄÕ save. ôÏÌØËÏ ËÌÀÞÉ ÏÐÒÅÄÅÌ£ÎÎÙÈ ÔÉÐÏ× ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÎÁ ËÁÒÔÕ. ðÏÄÍÅÎÀ ÐÏÚ×ÏÌÉÔ ÷ÁÍ ×ÙÂÒÁÔØ ËÁÒÔÕ ÎÁ ËÏÔÏÒÕÀ ÷Ù ÈÏÔÉÔÅ ÓÏÈÒÁÎÉÔØ ËÌÀÞ. úÁÍÅÔØÔÅ, ÞÔÏ ÐÏÌÕÞÉÔØ ËÌÀÞ Ó ËÁÒÔÙ ÏÂÒÁÔÎÏ -ÎÅ×ÏÚÍÏÖÎÏ \- ÅÓÌÉ ËÁÒÔÁ ÂÕÄÅÔ ÐÏÔÅÒÑÎÁ ÉÌÉ ÐÏ×ÒÅÖÄÅÎÁ, ÔÏ ÷ÁÛ ÓÅËÒÅÔÎÙÊ +ÎÅ×ÏÚÍÏÖÎÏ - ÅÓÌÉ ËÁÒÔÁ ÂÕÄÅÔ ÐÏÔÅÒÑÎÁ ÉÌÉ ÐÏ×ÒÅÖÄÅÎÁ, ÔÏ ÷ÁÛ ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÂÕÄÅÔ ÕÔÒÁÞÅÎ, ÅÓÌÉ ÏÔÓÕÔÓÔ×ÕÅÔ ÒÅÚÅÒ×ÎÁÑ ËÏÐÉÑ. .IP "delkey" 10 õÄÁÌÉÔØ ÐÏÄËÌÀÞ. @@ -246,13 +300,13 @@ ïÔÏÂÒÁÚÉÔØ ×ÙÂÒÁÎÎÙÊ ÆÏÔÏÇÒÁÆÉÞÅÓËÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ. .IP "pref" 10 ÷Ù×ÅÓÔÉ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ ÄÌÑ ×ÙÂÒÁÎÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ. -ðÏËÁÚÙ×ÁÅÔ ÄÅÊÓÔ×ÉÔÅÌØÎÙÊ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ, ÎÅ ×ËÌÀÞÁÑ ËÁËÉÅ\-ÌÉÂÏ +ðÏËÁÚÙ×ÁÅÔ ÄÅÊÓÔ×ÉÔÅÌØÎÙÊ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ, ÎÅ ×ËÌÀÞÁÑ ËÁËÉÅ-ÌÉÂÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÍÙÅ ÐÒÅÄÐÏÞÔÅÎÉÑ. .IP "showpref" 10 ÷Ù×ÅÓÔÉ ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ ÄÌÑ ×ÙÂÒÁÎÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÎÅÖÅÌÉ pref. ðÏËÁÚÙ×ÁÅÔ ÄÅÊÓÔ×ÕÀÝÉÅ ÐÒÅÄÐÏÞÔÅÎÉÑ, ×ËÌÀÞÁÑ ÐÏÄÒÁÚÕÍÅ×ÁÅÍÙÅ 3DES (ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ), SHA-1 -(ÈÜÛ\-ÆÕÎËÃÉÑ) É Uncompressed (ÓÖÁÔÉÅ), ÅÓÌÉ ÏÎÉ ÎÅ ÄÏÂÁ×ÌÅÎÙ × ÓÐÉÓÏË +(ÈÜÛ-ÆÕÎËÃÉÑ) É Uncompressed (ÓÖÁÔÉÅ), ÅÓÌÉ ÏÎÉ ÎÅ ÄÏÂÁ×ÌÅÎÙ × ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ. .IP "setpref \fBstring\fR" 10 õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ ÄÌÑ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ × @@ -260,7 +314,7 @@ ×Ù×ÏÄÉÔÓÑ ËÏÍÁÎÄÏÊ "pref". éÓÐÏÌØÚÕÑ ÐÕÓÔÕÀ ÓÔÒÏËÕ ÍÏÖÎÏ ÓÂÒÏÓÉÔØ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ Ë ÕÓÔÁÎÏ×ËÁÍ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÉÓÐÏÌØÚÕÑ ÚÎÁÞÅÎÉÅ "none" ÍÏÖÎÏ ÏÂÎÕÌÉÔØ ÓÐÉÓÏË ÐÒÅÄÐÏÞÔÅÎÉÊ. äÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ÄÏÓÔÕÐÎÙÈ ÁÌÇÏÒÉÔÍÏ× -ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ "gpg \-\-version". äÁÎÎÁÑ ËÏÍÁÎÄÁ ÔÏÌØËÏ +ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ "gpg --version". äÁÎÎÁÑ ËÏÍÁÎÄÁ ÔÏÌØËÏ ÉÎÉÃÉÁÌÉÚÉÒÕÅÔ ×ÎÕÔÒÅÎÎÉÊ ÓÐÉÓÏË É ÎÉÞÅÇÏ ÎÅ ÉÚÍÅÎÑÅÔ, ÐÏËÁ ÎÅ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÁ ÄÒÕÇÁÑ ËÏÍÁÎÄÁ (ÔÁËÁÑ, ËÁË updpref) , ËÏÔÏÒÁÑ ÉÚÍÅÎÑÅÔ ÓÁÍÏÐÏÄÐÉÓÉ. .IP "updpref" 10 @@ -276,7 +330,7 @@ õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÅÄÐÏÞÉÔÁÅÍÙÊ ÓÅÒ×ÅÒ ËÌÀÞÅÊ ÄÌÑ ÚÁÄÁÎÎÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÑ. üÔÏ ÐÏÚ×ÏÌÑÅÔ ÓÏÏÂÝÉÔØ ÄÒÕÇÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÇÄÅ ÷Ù ÐÒÅÄÐÏÞÉÔÁÅÔÅ, ÞÔÏÂÙ ÏÎÉ ÂÒÁÌÉ ÷ÁÛ ËÌÀÞ (ÓÍ. ÐÏÄÒÏÂÎÏÓÔÉ × ÏÐÉÓÁÎÉÉ -\-\-keyserver-option honor-keyserver-url). úÁÍÅÔØÔÅ, ÞÔÏ ÎÅËÏÔÏÒÙÅ +--keyserver-option honor-keyserver-url). úÁÍÅÔØÔÅ, ÞÔÏ ÎÅËÏÔÏÒÙÅ ×ÅÒÓÉÉ PGP ×ÏÓÐÒÉÎÉÍÁÀÔ ÎÁÌÉÞÉÅ URL ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ËÁË ÕËÁÚÁÎÉÅ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ PGP/MIME ÐÒÉ ÏÔÐÒÁ×ËÅ ÐÏÞÔÙ. äÌÑ ÕÄÁÌÅÎÉÑ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÚÁÐÉÓÉ Ï ÐÒÅÄÐÏÞÉÔÁÅÍÏÍ ÓÅÒ×ÅÒÅ ÉÓÐÏÌØÚÕÊÔÅ ÚÎÁÞÅÎÉÅ "none". @@ -295,11 +349,11 @@ ×ÙÞÉÓÌÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÄÏÓÔÏ×ÅÒÎÏÓÔÉ ËÌÀÞÁ. óÉÍ×ÏÌÙ ÉÍÅÀÔ ÓÌÅÄÕÀÝÅÅ ÚÎÁÞÅÎÉÅ: .RS -.IP "\-" 10 +.IP "-" 10 ÄÏ×ÅÒÉÅ ÎÅ ÐÒÉÓ×ÏÅÎÏ / ÄÏÓÔÏ×ÅÒÎÏÓÔØ ÎÅ ×ÙÞÉÓÌÅÎÁ. .IP "e" 10 ÷ÙÞÉÓÌÅÎÉÅ -ÄÏÓÔÏ×ÅÒÎÏÓÔÉ ÚÁ×ÅÒÛÉÌÏÓØ Ó ÏÛÉÂËÏÊ; ×ÏÚÍÏÖÎÏ ÉÚ\-ÚÁ ÐÒÏÓÒÏÞÅÎÎÏÇÏ +ÄÏÓÔÏ×ÅÒÎÏÓÔÉ ÚÁ×ÅÒÛÉÌÏÓØ Ó ÏÛÉÂËÏÊ; ×ÏÚÍÏÖÎÏ ÉÚ-ÚÁ ÐÒÏÓÒÏÞÅÎÎÏÇÏ ËÌÀÞÁ. .IP "q" 10 îÅ ÄÏÓÔÁÔÏÞÎÏ ÉÎÆÏÒÍÁÃÉÉ ÄÌÑ ×ÙÞÉÓÌÅÎÉÑ. @@ -312,79 +366,79 @@ .IP "u" 10 âÅÚÏÇÏ×ÏÒÏÞÎÏÅ ÄÏ×ÅÒÉÅ/ÄÏÓÔÏ×ÅÒÎÏÓÔØ. .RE -.IP "\-\-sign-key \fBname\fR" 10 +.IP "--sign-key \fBname\fR" 10 ðÏÄÐÉÓÁÔØ ÏÔËÒÙÔÙÊ ËÌÀÞ ÷ÁÛÉÍ ÓÅËÒÅÔÎÙÍ ËÌÀÞÏÍ. ôÏ ÖÅ, ÞÔÏ É ÐÏÄËÏÍÁÎÄÁ -"sign" ËÏÍÁÎÄÙ \-\-edit-key. -.IP "\-\-lsign-key \fBname\fR" 10 +"sign" ËÏÍÁÎÄÙ --edit-key. +.IP "--lsign-key \fBname\fR" 10 ðÏÄÐÉÓÁÔØ ÏÔËÒÙÔÙÊ ËÌÀÞ ÷ÁÛÉÍ ÓÅËÒÅÔÎÙÍ ËÌÀÞÏÍ ÌÏËÁÌØÎÏ. ôÏ ÖÅ, ÞÔÏ É ÐÏÄËÏÍÁÎÄÁ -"lsign" ËÏÍÁÎÄÙ \-\-edit-key. -.IP "\-\-delete-key \fBname\fR" 10 +"lsign" ËÏÍÁÎÄÙ --edit-key. +.IP "--delete-key \fBname\fR" 10 õÄÁÌÉÔØ ËÌÀÞ ÉÚ ÎÁÂÏÒÁ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ. ÷ ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ ÔÒÅÂÕÅÔÓÑ ÌÉÂÏ -ÉÓÐÏÌØÚÏ×ÁÔØ \-\-yes, ÌÉÂÏ ÚÁÄÁ×ÁÔØ ËÌÀÞ ÅÇÏ ÏÔÐÅÞÁÔËÏÍ. üÔÏ ÚÁÝÉÔÁ ÐÒÏÔÉ× +ÉÓÐÏÌØÚÏ×ÁÔØ --yes, ÌÉÂÏ ÚÁÄÁ×ÁÔØ ËÌÀÞ ÅÇÏ ÏÔÐÅÞÁÔËÏÍ. üÔÏ ÚÁÝÉÔÁ ÐÒÏÔÉ× ÓÌÕÞÁÊÎÏÇÏ ÕÄÁÌÅÎÉÑ ËÌÀÞÅÊ. -.IP "\-\-delete-secret-key \fBname\fR" 10 +.IP "--delete-secret-key \fBname\fR" 10 õÄÁÌÉÔØ ËÌÀÞ ÉÚ ÎÁÂÏÒÏ× ÓÅËÒÅÔÎÙÈ É ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ. ÷ ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ ËÌÀÞ ÄÏÌÖÅÎ ÂÙÔØ ÚÁÄÁÎ ÏÔÐÅÞÁÔËÏÍ. -.IP "\-\-delete-secret-and-public-key \fBname\fR" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-delete-key, ÎÏ ÅÓÌÉ ÓÕÝÅÓÔ×ÕÅÔ ÓÅËÒÅÔÎÙÊ ËÌÀÞ, +.IP "--delete-secret-and-public-key \fBname\fR" 10 +ôÏ ÖÅ, ÞÔÏ É --delete-key, ÎÏ ÅÓÌÉ ÓÕÝÅÓÔ×ÕÅÔ ÓÅËÒÅÔÎÙÊ ËÌÀÞ, ÔÏ ÓÎÁÞÁÌÁ ÂÕÄÅÔ ÕÄẠ́ΠÏÎ. ÷ ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ ËÌÀÞ ÄÏÌÖÅÎ ÂÙÔØ ÚÁÄÁÎ ÏÔÐÅÞÁÔËÏÍ. -.IP "\-\-gen-revoke \fBname\fR" 10 +.IP "--gen-revoke \fBname\fR" 10 çÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÄÌÑ ×ÓÅÇÏ ËÌÀÞÁ. äÌÑ ÏÔÚÙ×Á ÐÏÄËÌÀÞÁ -ÉÌÉ ÐÏÄÐÉÓÉ ÉÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ \-\-edit-key. -.IP "\-\-desig-revoke \fBname\fR" 10 +ÉÌÉ ÐÏÄÐÉÓÉ ÉÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ --edit-key. +.IP "--desig-revoke \fBname\fR" 10 çÅÎÅÒÉÒÏ×ÁÔØ ÎÁÚÎÁÞÅÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÏÔÚÙ×Á ÄÌÑ ËÌÀÞÁ. üÔÏ ÐÏÚ×ÏÌÑÅÔ -ÐÏÌØÚÏ×ÁÔÅÌÀ (Ó ÒÁÚÒÅÛÅÎÉÑ ×ÌÁÄÅÌØÃÁ ËÌÀÞÁ) ÏÔÏÚ×ÁÔØ ÞÅÊ\-ÌÉÂÏ ËÌÀÞ. -.IP "\-\-export [\fBnames\fR]" 10 +ÐÏÌØÚÏ×ÁÔÅÌÀ (Ó ÒÁÚÒÅÛÅÎÉÑ ×ÌÁÄÅÌØÃÁ ËÌÀÞÁ) ÏÔÏÚ×ÁÔØ ÞÅÊ-ÌÉÂÏ ËÌÀÞ. +.IP "--export [\fBnames\fR]" 10 ìÉÂÏ ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ×ÓÅ ËÌÀÞÉ ÉÚ ×ÓÅÈ ÎÁÂÏÒÏ× ËÌÀÞÅÊ (ÎÁÂÏÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ É ÔÅÈ ËÏÔÏÒÙÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÙ ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÁ -\-\-keyring), ÉÌÉ, ÅÓÌÉ ÚÁÄÁÎÏ ÈÏÔÑ ÂÙ ÏÄÎÏ ÉÍÑ, ÔÅ ËÌÀÞÉ ÉÍÅÎÁ ËÏÔÏÒÙÈ +--keyring), ÉÌÉ, ÅÓÌÉ ÚÁÄÁÎÏ ÈÏÔÑ ÂÙ ÏÄÎÏ ÉÍÑ, ÔÅ ËÌÀÞÉ ÉÍÅÎÁ ËÏÔÏÒÙÈ ÚÁÄÁÎÙ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. ðÏÌÕÞÅÎÎÙÊ × ÒÅÚÕÌØÔÁÔÅ ÎÁÂÏÒ ËÌÀÞÅÊ ×Ù×ÏÄÉÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÉÌÉ × ÆÁÊÌ ÚÁÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒÏÍ "output". åÓÌÉ ÷Ù ÎÁÍÅÒÅÎÙ ÏÔÐÒÁ×ÉÔØ ËÌÀÞÉ ÐÏ ÐÏÞÔÅ, ÔÏ ÉÓÐÏÌØÚÕÊÔÅ ÓÏ×ÍÅÓÔÎÏ Ó -ÐÁÒÁÍÅÔÒÏÍ \-\-armor. -.IP "\-\-send-keys [\fBnames\fR]" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-export ÎÏ ÐÏÓÙÌÁÅÔ ËÌÀÞÉ ÎÁ ÓÅÒ×ÅÒ ËÌÀÞÅÊ. +ÐÁÒÁÍÅÔÒÏÍ --armor. +.IP "--send-keys [\fBnames\fR]" 10 +ôÏ ÖÅ, ÞÔÏ É --export ÎÏ ÐÏÓÙÌÁÅÔ ËÌÀÞÉ ÎÁ ÓÅÒ×ÅÒ ËÌÀÞÅÊ. äÌÑ ÚÁÄÁÎÉÑ ÉÍÅÎÉ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒ -\-\-keyserver. îÅ ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ ÓÅÒ×ÅÒ Ó×ÏÊ ÎÁÂÏÒ ËÌÀÞÅÊ ÐÏÌÎÏÓÔØÀ \- +--keyserver. îÅ ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ ÓÅÒ×ÅÒ Ó×ÏÊ ÎÁÂÏÒ ËÌÀÞÅÊ ÐÏÌÎÏÓÔØÀ - ×ÙÂÅÒÉÔÅ ÔÏÌØËÏ ÔÅ ËÌÀÞÉ, ËÏÔÏÒÙÅ ÂÙÌÉ ÄÏÂÁ×ÌÅÎÙ ÉÌÉ ÉÚÍÅÎÅÎÙ ÷ÁÍÉ. -.IP "\-\-export-secret-keys [\fBnames\fR]" 10 -.IP "\-\-export-secret-subkeys [\fBnames\fR]" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-export, ÎÏ ÜËÓÐÏÒÔÉÒÕÅÔ ÓÅËÒÅÔÎÙÅ ËÌÀÞÉ. éÓÐÏÌØÚÕÅÔÓÑ +.IP "--export-secret-keys [\fBnames\fR]" 10 +.IP "--export-secret-subkeys [\fBnames\fR]" 10 +ôÏ ÖÅ, ÞÔÏ É --export, ÎÏ ÜËÓÐÏÒÔÉÒÕÅÔ ÓÅËÒÅÔÎÙÅ ËÌÀÞÉ. éÓÐÏÌØÚÕÅÔÓÑ ÒÅÄËÏ É ÒÉÓËÏ×ÁÎÁ Ó ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ. ÷ÔÏÒÁÑ ÆÏÒÍÁ ËÏÍÁÎÄÙ ÄÅÌÁÅÔ ÓÅËÒÅÔÎÕÀ ÞÁÓÔØ ÐÅÒ×ÉÞÎÏÇÏ ËÌÀÞÁ, × ×Ù×ÏÄÉÍÏÍ ÒÅÚÕÌØÔÁÔÅ, ÎÅÐÒÉÇÏÄÎÏÊ; ÜÔÏ ÒÁÓÛÉÒÅÎÉÅ GNU ÄÌÑ ÓÔÁÎÄÁÒÔÁ OpenPGP É ÄÒÕÇÉÅ ÒÅÁÌÉÚÁÃÉÉ ÎÅ ÓÍÏÇÕÔ ÕÓÐÅÛÎÏ ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÔÁËÉÅ ËÌÀÞÉ. -ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ ÎÁ ÐÁÒÁÍÅÔÒ \-\-simple-sk-checksum, ÅÓÌÉ ÷Ù ÈÏÔÉÔÅ +ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ ÎÁ ÐÁÒÁÍÅÔÒ --simple-sk-checksum, ÅÓÌÉ ÷Ù ÈÏÔÉÔÅ ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÏÌÕÞÅÎÎÙÊ ÒÅÚÕÌØÔÁÔ × ÓÔÁÒÕÀ ÒÅÁÌÉÚÁÃÉÀ OpenPGP. -.IP "\-\-import [\fBfiles\fR]" 10 -.IP "\-\-fast-import [\fBfiles\fR]" 10 +.IP "--import [\fBfiles\fR]" 10 +.IP "--fast-import [\fBfiles\fR]" 10 éÍÐÏÒÔÉÒÏ×ÁÔØ/ÏÂßÅÄÉÎÉÔØ ËÌÀÞÉ. üÔÁ ËÏÍÁÎÄÁ ÄÏÂÁ×ÌÑÅÔ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ Ë -ÎÁÂÏÒÕ ËÌÀÞÅÊ. \-\-fast-import, × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ Ñ×ÌÑÅÔÓÑ ÐÒÏÓÔÏ -ÓÉÎÏÎÉÍÏÍ ÄÌÑ \-\-import. +ÎÁÂÏÒÕ ËÌÀÞÅÊ. --fast-import, × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ Ñ×ÌÑÅÔÓÑ ÐÒÏÓÔÏ +ÓÉÎÏÎÉÍÏÍ ÄÌÑ --import. .IP "" 10 éÍÅÅÔÓÑ ÎÅÓËÏÌØËÏ ÐÁÒÁÍÅÔÒÏ×, ËÏÎÔÒÏÌÉÒÕÀÝÉÈ ÒÁÂÏÔÕ ËÏÍÁÎÄÙ. îÁÉÂÏÌÅÅ -ÚÎÁÞÉÍÙÊ ÓÒÅÄÉ ÎÉÈ \- ÐÁÒÁÍÅÔÒ \-\-keyserver-option \-\-merge-only, ËÏÔÏÒÙÊ +ÚÎÁÞÉÍÙÊ ÓÒÅÄÉ ÎÉÈ - ÐÁÒÁÍÅÔÒ --keyserver-option --merge-only, ËÏÔÏÒÙÊ ÐÒÅÄÏÔ×ÒÁÝÁÅÔ ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÙÈ ËÌÀÞÅÊ É ÄÏÐÕÓËÁÅÔ ÔÏÌØËÏ ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ, ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÑ É ÐÏÄËÌÀÞÅÊ Ë ÕÖÅ ÉÍÅÀÝÉÍÓÑ ËÌÀÞÁÍ. -.IP "\-\-recv-keys \fBkey IDs\fR" 10 +.IP "--recv-keys \fBkey IDs\fR" 10 éÍÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ Ó ÚÁÄÁÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ Ó ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ. -äÌÑ ÕËÁÚÁÎÉÑ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒ \-\-keyserver. -.IP "\-\-refresh-keys \fBkey IDs\fR" 10 +äÌÑ ÕËÁÚÁÎÉÑ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒ --keyserver. +.IP "--refresh-keys \fBkey IDs\fR" 10 úÁÐÒÏÓÉÔØ Ó ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÏÂÎÏ×ÌÅÎÉÑ ÄÌÑ ËÌÀÞÅÊ, ËÏÔÏÒÙÅ ÕÖÅ ÉÍÅÀÔÓÑ × ÌÏËÁÌØÎÙÈ Ó×ÑÚËÁÈ. ðÒÉÍÅÎÉÍÏ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ, ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ É Ô.Ä. ÷ÙÚÏ× ËÏÍÁÎÄÙ ÂÅÚ ÐÁÒÁÍÅÔÒÁ ÐÒÉ×ÅÄ£Ô Ë ÏÂÎÏ×ÌÅÎÉÀ ×ÓÅÊ Ó×ÑÚËÉ ËÌÀÞÅÊ. îÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÐÁÒÁÍÅÔÒ -\-\-keyserver, ÞÔÏÂÙ ÕËÁÚÁÔØ ÓÅÒ×ÅÒ ËÌÀÞÅÊ ÄÌÑ ×ÓÅÈ ËÌÀÞÅÊ, × ËÏÔÏÒÙÈ ÎÅ +--keyserver, ÞÔÏÂÙ ÕËÁÚÁÔØ ÓÅÒ×ÅÒ ËÌÀÞÅÊ ÄÌÑ ×ÓÅÈ ËÌÀÞÅÊ, × ËÏÔÏÒÙÈ ÎÅ ÕËÁÚÁÎ ÐÒÅÄÐÏÞÉÔÁÅÍÙÊ ÓÅÒ×ÅÒ ËÌÀÞÅÊ -(ÓÍ. \-\-keyserver-option honor-keyserver-url). -.IP "\-\-search-keys [\fBnames\fR]" 10 +(ÓÍ. --keyserver-option honor-keyserver-url). +.IP "--search-keys [\fBnames\fR]" 10 ðÏÉÓË ÐÏ ÕËÁÚÁÎÎÙÍ ÉÍÅÎÁÍ ÎÁ ÓÅÒ×ÅÒÅ ËÌÀÞÅÊ. îÅÓËÏÌØËÏ ÉÍ£Î, ÚÁÄÁÎÎÙÈ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ, ÏÂßÅÄÉÎÑÀÔÓÑ ×ÍÅÓÔÅ ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÔÒÏËÉ ÐÏÉÓËÁ. -äÌÑ ÕËÁÚÁÎÉÑ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒ \-\-keyserver. -.IP "\-\-update-trustdb" 10 +äÌÑ ÕËÁÚÁÎÉÑ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒ --keyserver. +.IP "--update-trustdb" 10 éÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÏÄÄÅÒÖËÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ. äÁÎÎÁÑ ËÏÍÁÎÄÁ ÐÒÏÓÍÁÔÒÉ×ÁÅÔ ×ÓÅ ÉÍÅÀÝÉÅÓÑ ËÌÀÞÉ É ÓÔÒÏÉÔ ÓÅÔØ ÄÏ×ÅÒÉÑ (Web of Trust). äÁÎÎÁÑ ËÏÍÁÎÄÁ Ñ×ÌÑÅÔÓÑ ÉÎÔÅÒÁËÔÉ×ÎÏÊ, Ô.Ë. ÏÎÁ ÍÏÖÅÔ ÚÁÐÒÁÛÉ×ÁÔØ Ï @@ -392,53 +446,53 @@ ÎÁÓËÏÌØËÏ ÏÎ ÄÏ×ÅÒÑÅÔ ×ÌÁÄÅÌØÃÕ ÕËÁÚÁÎÎÏÇÏ ËÌÀÞÁ × ×ÏÐÒÏÓÁÈ ÐÒÏ×ÅÒËÉ É ÓÅÒÔÉÆÉËÁÃÉÉ (ÐÏÄÐÉÓÉ) ÄÒÕÇÉÈ ËÌÀÞÅÊ. úÁÐÒÏÓ ×ÙÄÁ£ÔÓÑ ÔÏÌØËÏ × ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ ÄÁÎÎÏÍÕ ËÌÀÞÕ ÅÝ£ ÎÅ ÂÙÌÏ ÐÒÉÓ×ÏÅÎÏ ÚÎÁÞÅÎÉÅ ÄÏ×ÅÒÉÑ. ðÒÉ -ÐÏÍÏÝÉ ËÏÍÁÎÄÙ \-\-edit-key ÍÏÖÎÏ ÐÏÚÖÅ ÉÚÍÅÎÉÔØ ÄÁÎÎÏÅ ÚÎÁÞÅÎÉÅ. -.IP "\-\-check-trustdb" 10 +ÐÏÍÏÝÉ ËÏÍÁÎÄÙ --edit-key ÍÏÖÎÏ ÐÏÚÖÅ ÉÚÍÅÎÉÔØ ÄÁÎÎÏÅ ÚÎÁÞÅÎÉÅ. +.IP "--check-trustdb" 10 ÷ÙÐÏÌÎÑÅÔ ÐÒÏ×ÅÒËÕ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÂÅÚ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÑ Ó ÐÏÌØÚÏ×ÁÔÅÌÅÍ. ðÅÒÉÏÄÉÞÅÓËÉ ÂÁÚÁ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÄÏÌÖÎÁ ÏÂÎÏ×ÌÑÔØÓÑ, ÞÔÏÂÙ ÏÔÓÌÅÖÉ×ÁÔØ ÉÓÔ£ËÛÉÅ ËÌÀÞÉ É ÐÏÄÐÉÓÉ É ×ÎÏÓÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÉÚÍÅÎÅÎÉÑ × ÓÅÔØ ÄÏ×ÅÒÉÑ. GnuPG ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÏÔÓÌÅÖÉ×ÁÅÔ ÔÁËÉÅ ÓÉÔÕÁÃÉÉ É ÏÂÎÏ×ÌÑÅÔ ÂÁÚÕ Á×ÔÏÍÁÔÉÞÅÓËÉ, ÅÓÌÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ -\-\-no-auto-check-trustdb. äÁÎÎÁÑ ËÏÍÁÎÄÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ +--no-auto-check-trustdb. äÁÎÎÁÑ ËÏÍÁÎÄÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÐÒÏ×ÅÒËÉ ÐÒÉÎÕÄÉÔÅÌØÎÏ, × ÌÀÂÏÅ ×ÒÅÍÑ. ÷ÙÐÏÌÎÑÅÍÙÅ ÄÅÊÓÔ×ÉÑ ÁÎÁÌÏÇÉÞÎÙ -ÔÅÍ, ËÏÔÏÒÙÅ ×ÙÐÏÌÎÑÅÔ \-\-update-trustdb, +ÔÅÍ, ËÏÔÏÒÙÅ ×ÙÐÏÌÎÑÅÔ --update-trustdb, ÎÏ ËÌÀÞÉ Ó ÎÅÏÐÒÅÄÅÌ£ÎÎÙÍ ÕÒÏ×ÎÅÍ ÄÏ×ÅÒÉÑ ÐÒÏÐÕÓËÁÀÔÓÑ. .IP "" 10 ðÒÉ ÚÁÐÕÓËÅ Ó ÐÏÍÏÝØÀ cron, ÄÁÎÎÁÑ ËÏÍÁÎÄÁ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó -ÐÁÒÁÍÅÔÒÏÍ \-\-batch, × ÜÔÏÍ ÓÌÕÞÁÅ ÐÒÏ×ÅÒËÁ ×ÙÐÏÌÎÑÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÏÎÁ +ÐÁÒÁÍÅÔÒÏÍ --batch, × ÜÔÏÍ ÓÌÕÞÁÅ ÐÒÏ×ÅÒËÁ ×ÙÐÏÌÎÑÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÏÎÁ ÎÕÖÎÁ. äÌÑ ÐÒÉÎÕÄÉÔÅÌØÎÏÇÏ ×ÙÐÏÌÎÅÎÉÑ ÐÒÏ×ÅÒËÉ × ÜÔÏÍ ÓÌÕÞÁÅ ÍÏÖÎÏ -ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒ \-\-yes. -.IP "\-\-export-ownertrust" 10 +ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒ --yes. +.IP "--export-ownertrust" 10 ÷Ù×ÏÄÉÔ ÚÎÁÞÅÎÉÑ ÄÏ×ÅÒÉÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ. ðÒÉÍÅÎÉÍÁ × ÃÅÌÑÈ ÁÒÈÉ×ÁÃÉÉ, Ô.Ë. ÜÔÉ ÚÎÁÞÅÎÉÑ ÅÄÉÎÓÔ×ÅÎÎÏÅ, ÞÔÏ ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎÏ × ÓÌÕÞÁÅ ÐÏ×ÒÅÖÄÅÎÉÑ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ. -.IP "\-\-import-ownertrust [\fBfiles\fR]" 10 +.IP "--import-ownertrust [\fBfiles\fR]" 10 ÷ÎÏÓÉÔ × ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÚÎÁÞÅÎÉÑ ÓÏÈÒÁΣÎÎÙÅ × ÆÁÊÌÅ \fBfiles\fR (ÉÌÉ ÓÞÉÔÙ×ÁÅÔ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ, ÅÓÌÉ ÆÁÊÌ ÎÅ ÚÁÄÁÎ); ÓÕÝÅÓÔ×ÕÀÝÉÅ ÚÎÁÞÅÎÉÑ ÐÅÒÅÚÁÐÉÓÙ×ÁÀÔÓÑ. -.IP "\-\-rebuild-keydb-caches" 10 +.IP "--rebuild-keydb-caches" 10 ðÒÉ ÏÂÎÏ×ÌÅÎÉÉ Ó ×ÅÒÓÉÉ 1.0.6 ÄÏ 1.0.7 ÜÔÁ ËÏÍÁÎÄÁ ÄÏÌÖÎÁ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÄÌÑ ÓÏÚÄÁÎÉÑ ËÜÛÅÊ ÐÏÄÐÉÓÅÊ × ÎÁÂÏÒÅ ËÌÀÞÅÊ. ïÎÁ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÕÄÏÂÎÏÊ É × ÄÒÕÇÉÈ ÓÌÕÞÁÑÈ. -.IP "\-\-print-md \fBalgo\fR [\fBfiles\fR]" 10 -.IP "\-\-print-mds [\fBfiles\fR]" 10 -÷Ù×ÏÄÉÔ ÚÎÁÞÅÎÉÅ ÈÜÛ\-ÆÕÎËÃÉÉ ALGO ÄÌÑ ËÁÖÄÏÇÏ ÉÚ ÚÁÄÁÎÎÙÈ ÆÁÊÌÏ× ÉÌÉ ÄÌÑ +.IP "--print-md \fBalgo\fR [\fBfiles\fR]" 10 +.IP "--print-mds [\fBfiles\fR]" 10 +÷Ù×ÏÄÉÔ ÚÎÁÞÅÎÉÅ ÈÜÛ-ÆÕÎËÃÉÉ ALGO ÄÌÑ ËÁÖÄÏÇÏ ÉÚ ÚÁÄÁÎÎÙÈ ÆÁÊÌÏ× ÉÌÉ ÄÌÑ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ. ÷ÔÏÒÁÑ ÆÏÒÍÁ (ÉÌÉ "*" × ËÁÞÅÓÔ×Å algo × ÐÅÒ×ÏÍ -ÓÌÕÞÁÅ) ×Ù×ÏÄÉÔ ÚÎÁÞÅÎÉÑ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÈÜÛ\-ÆÕÎËÃÉÊ. -.IP "\-\-gen-random \fB0|1|2\fR [\fBcount\fR]" 10 +ÓÌÕÞÁÅ) ×Ù×ÏÄÉÔ ÚÎÁÞÅÎÉÑ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÈÜÛ-ÆÕÎËÃÉÊ. +.IP "--gen-random \fB0|1|2\fR [\fBcount\fR]" 10 ÷Ù×ÏÄÉÔ COUNT ÓÌÕÞÁÊÎÙÈ ÂÁÊÔ Ó ÚÁÄÁÎÎÙÍ ÕÒÏ×ÎÅÍ ËÁÞÅÓÔ×Á. åÓÌÉ ÐÁÒÁÍÅÔÒ COUNT ÎÅ ÚÁÄÁÎ ÉÌÉ ÒÁ×ÅÎ ÎÕÌÀ, ÔÏ ×Ù×ÏÄÉÔÓÑ ÂÅÓËÏÎÅÞÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÓÌÕÞÁÊÎÙÈ ÂÁÊÔ. ðòåäõðòåöäåîéå! îÅ ÉÓÐÏÌØÚÕÊÔÅ ÜÔÕ ËÏÍÁÎÄÕ ÂÅÚ ÎÅÏÂÈÏÄÉÍÏÓÔÉ; ÜÔÏ ÍÏÖÅÔ ÕÍÅÎØÛÉÔØ ÞÉÓÌÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ ÄÏÓÔÕÐÎÙÈ ÓÉÓÔÅÍÅ! -.IP "\-\-gen-prime \fBmode\fR \fBbits\fR [\fBqbits\fR]" 10 +.IP "--gen-prime \fBmode\fR \fBbits\fR [\fBqbits\fR]" 10 çÅÎÅÒÉÒÕÅÔ ÐÒÏÓÔÏÅ ÞÉÓÌÏ. ðÏÄÒÏÂÎÏÓÔÉ ÓÍ. × ÉÓÈÏÄÎÙÈ ÔÅËÓÔÁÈ. -.IP "\-\-version" 10 +.IP "--version" 10 ÷Ù×ÏÄÉÔ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÙ É ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÁÌÇÏÒÉÔÍÏ×. -.IP "\-\-warranty" 10 +.IP "--warranty" 10 ÷Ù×ÏÄÉÔ ÉÎÆÏÒÍÁÃÉÀ Ï ÇÁÒÁÎÔÉÑÈ. -.IP "\-h, \-\-help" 10 +.IP "-h, --help" 10 ÷Ù×ÏÄÉÔ ËÒÁÔËÕÀ ÓÐÒÁ×ËÕ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ËÏÍÁÎÄÙ. óÐÉÓÏË ÄÏ×ÏÌØÎÏ ÄÌÉÎÎÙÊ, ÈÏÔÑ É ÎÅ ×ËÌÀÞÁÅÔ ÏÐÉÓÁÎÉÑ ×ÓÅÈ ÐÁÒÁÍÅÔÒÏ×. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ, ÏÂÒÁÝÁÊÔÅÓØ Ë ÄÁÎÎÏÍÕ ÒÕËÏ×ÏÄÓÔ×Õ. @@ -446,18 +500,18 @@ .PP äÌÉÎÎÙÅ ÆÏÒÍÙ ÐÁÒÁÍÅÔÒÏ× ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ × ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ "~/.gnupg/gpg.conf"). ëÏÒÏÔËÉÅ ÉÍÅÎÁ ÐÁÒÁÍÅÔÒÏ× ÒÁÂÏÔÁÔØ ÎÅ -ÂÕÄÕÔ \- ÎÁÐÒÉÍÅÒ, "armor" ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ × ÆÁÊÌÅ ËÏÎÆÉÇÕÒÁÃÉÉ, Á "Á" +ÂÕÄÕÔ - ÎÁÐÒÉÍÅÒ, "armor" ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ × ÆÁÊÌÅ ËÏÎÆÉÇÕÒÁÃÉÉ, Á "Á" ÎÅÌØÚÑ. îÅ ÕËÁÚÙ×ÁÊÔÅ Ä×Á ÎÁÞÁÌØÎÙÈ ÄÅÆÉÓÁ, ÐÒÏÓÔÏ ÉÍÑ ÐÁÒÁÍÅÔÒÁ É ÔÒÅÂÕÅÍÙÅ ÁÒÇÕÍÅÎÔÙ. óÔÒÏËÉ ÎÁÞÉÎÁÀÝÉÅÓÑ ÓÉÍ×ÏÌÏÍ "#" (×ÏÚÍÏÖÎÏ ÐÏÓÌÅ ÎÅÓËÏÌØËÉÈ ÐÒÏÂÅÌÏ×) ÉÇÎÏÒÉÒÕÀÔÓÑ. ëÏÍÁÎÄÙ ÔÁË ÖÅ ÍÏÇÕÔ ÐÏÍÅÝÁÔØÓÑ × ÜÔÏÔ ÆÁÊÌ, ÎÏ ÜÔÏ, × ÏÂÝÅÍ ÓÌÕÞÁÅ, ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ. .PP \fBgpg\fR ÒÁÓÐÏÚÎÁ£Ô ÓÌÅÄÕÀÝÉÅ ÐÁÒÁÍÅÔÒÙ: -.IP "\-a, \-\-armor" 10 +.IP "-a, --armor" 10 óÏÚÄÁ£Ô ×Ù×ÏÄ × ASCII ÆÏÒÍÁÔÅ. -.IP "\-o, \-\-output \fBfile\fR" 10 +.IP "-o, --output \fBfile\fR" 10 óÏÈÒÁÎÑÅÔ ÒÅÚÕÌØÔÁÔ × ÆÁÊÌÅ \fBfile\fR. -.IP "\-\-max-output \fBn\fR" 10 +.IP "--max-output \fBn\fR" 10 äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÅÄÅÌØÎÏÅ ÞÉÓÌÏ ÂÁÊÔÏ×, ËÏÔÏÒÙÅ ÇÅÎÅÒÉÒÕÀÔÓÑ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÆÁÊÌÁ. ðÏÓËÏÌØËÕ OpenPGP ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÚÌÉÞÎÙÅ ÓÔÅÐÅÎÉ ÓÖÁÔÉÑ, ÔÏ ×ÏÚÍÏÖÎÏ, ÞÔÏ ÏÔËÒÙÔÙÊ ÔÅËÓÔ ÓÏÏÂÝÅÎÉÑ @@ -465,89 +519,89 @@ ËÏÒÒÅËÔÎÏ ÒÁÂÏÔÁÅÔ Ó ÔÁËÉÍÉ ÆÁÊÌÁÍÉ, ÚÁÞÁÓÔÕÀ ÖÅÌÁÔÅÌØÎÏ ÏÇÒÁÎÉÞÉÔØ ÏÂß£Í ×ÙÄÁ×ÁÅÍÏÊ ÉÎÆÏÒÍÁÃÉÉ. ðÏ ÕÍÏÌÞÁÎÉÀ 0, ÞÔÏ ÏÚÎÁÞÁÅÔ ÏÔÓÕÔÓÔ×ÉÅ ÏÇÒÁÎÉÞÅÎÉÊ. -.IP "\-\-mangle-dos-filenames" 10 -.IP "\-\-no-mangle-dos-filenames" 10 +.IP "--mangle-dos-filenames" 10 +.IP "--no-mangle-dos-filenames" 10 óÔÁÒÙÅ ×ÅÒÓÉÉ Windows ÎÅ ÍÏÇÕÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÉÍÅÎÁ ÆÁÊÌÏ× Ó ÂÏÌÅÅ ÞÅÍ -ÏÄÎÏÊ ÔÏÞËÏÊ. \-\-mangle-dos-filenames ÚÁÓÔÁ×ÌÑÅÔ GnuPG ÚÁÍÅÎÑÔØ ÉÍÅÀÝÅÅÓÑ +ÏÄÎÏÊ ÔÏÞËÏÊ. --mangle-dos-filenames ÚÁÓÔÁ×ÌÑÅÔ GnuPG ÚÁÍÅÎÑÔØ ÉÍÅÀÝÅÅÓÑ ÒÁÓÛÉÒÅÎÉÅ ÆÁÊÌÁ, Á ÎÅ ÄÏÂÁ×ÌÑÔØ ÅÝ£ ÏÄÎÏ, ÄÌÑ ÏÂÈÏÄÁ ÄÁÎÎÏÊ ÐÒÏÂÌÅÍÙ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÔËÌÀÞÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÎÁ ÐÌÁÔÆÏÒÍÁÈ ÏÔÌÉÞÎÙÈ ÏÔ Windows. -.IP "\-u, \-\-local-user \fBname\fR" 10 +.IP "-u, --local-user \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÏÄÐÉÓÉ ËÌÀÞ \fBname\fR. úÁÍÅÔØÔÅ, ÞÔÏ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ -ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ \-\-default-key. -.IP "\-\-default-key \fBname\fR" 10 +ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ --default-key. +.IP "--default-key \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBname\fR × ËÁÞÅÓÔ×Å ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÐÏÄÐÉÓÅÊ. åÓÌÉ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÚÁÄÁÎ, ÔÏ ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÅÒ×ÙÊ ËÌÀÞ ÎÁÊÄÅÎÎÙÊ × Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ. -úÁÍÅÔØÔÅ, ÞÔÏ \-u ÉÌÉ \-\-local-user ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÄÁÎÎÏÇÏ +úÁÍÅÔØÔÅ, ÞÔÏ -u ÉÌÉ --local-user ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ. -.IP "\-r, \-\-recipient \fBname\fR" 10 +.IP "-r, --recipient \fBname\fR" 10 .IP "" 10 úÁÛÉÆÒÏ×ÁÔØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ \fBname\fR. åÓÌÉ ÎÉ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÉ ÐÁÒÁÍÅÔÒ -\-\-hidden-recipient ÎÅ ÕËÁÚÁÎÙ, É ÎÅ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒ \-\-default-recipient, +--hidden-recipient ÎÅ ÕËÁÚÁÎÙ, É ÎÅ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒ --default-recipient, ÔÏ GnuPG ÚÁÐÒÁÛÉ×ÁÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ. -.IP "\-R, \-\-hidden-recipient \fBname\fR" 10 +.IP "-R, --hidden-recipient \fBname\fR" 10 .IP "" 10 úÁÛÉÆÒÏ×ÁÔØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ \fBname\fR, ÎÏ ÓËÒÙÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÓËÒÙ×ÁÅÔ ÐÏÌÕÞÁÔÅÌÑ ÓÏÏÂÝÅÎÉÑ É Ñ×ÌÑÅÔÓÑ ËÏÎÔÒÍÅÒÏÊ ÐÒÏÔÉ× ÁÎÁÌÉÚÁ ÔÒÁÆÆÉËÁ. åÓÌÉ ÎÉ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÉ ÐÁÒÁÍÅÔÒ -\-\-recipient ÎÅ ÕËÁÚÁÎÙ, É ÎÅ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒ \-\-default-recipient, +--recipient ÎÅ ÕËÁÚÁÎÙ, É ÎÅ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒ --default-recipient, ÔÏ GnuPG ÚÁÐÒÁÛÉ×ÁÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ. -.IP "\-\-default-recipient \fBname\fR" 10 +.IP "--default-recipient \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBname\fR ËÁË ÐÏÌÕÞÁÔÅÌÑ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÅÓÌÉ ÎÅ ÚÁÄÁÎ -ÐÁÒÁÍÅÔÒ \-\-recipient É ÎÅ ×ÙÄÁ×ÁÔØ ÚÁÐÒÏÓ Ï ÐÏÌÕÞÁÔÅÌÅ ÅÓÌÉ ÚÎÁÞÅÎÉÅ +ÐÁÒÁÍÅÔÒ --recipient É ÎÅ ×ÙÄÁ×ÁÔØ ÚÁÐÒÏÓ Ï ÐÏÌÕÞÁÔÅÌÅ ÅÓÌÉ ÚÎÁÞÅÎÉÅ \fBname\fR Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ. \fBname\fR ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ. -.IP "\-\-default-recipient-self" 10 +.IP "--default-recipient-self" 10 éÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞ ÐÏ ÕÍÏÌÞÁÎÉÀ ËÁË ÐÏÌÕÞÁÔÅÌÑ, ÅÓÌÉ ÎÅ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒ -\-\-recipient, É ÎÅ ×ÙÄÁ×ÁÔØ ÚÁÐÒÏÓ Ï ÐÏÌÕÞÁÔÅÌÅ ÅÓÌÉ ÚÎÁÞÅÎÉÅ ËÌÀÞÁ -Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ. ëÌÀÞ ÐÏ ÕÍÏÌÞÁÎÉÀ \- ÜÔÏ ÐÅÒ×ÙÊ × ÓÅËÒÅÔÎÏÍ ÎÁÂÏÒÅ -ËÌÀÞÅÊ ÉÌÉ ÔÏÔ, ËÏÔÏÒÙÊ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒÏÍ \-\-default-key. -.IP "\-\-no-default-recipient" 10 -ïÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÏ× \-\-default-recipient É \-\-default-recipient-self. -.IP "\-\-encrypt-to \fBname\fR" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-recipient, ÎÏ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÆÁÊÌÅ +--recipient, É ÎÅ ×ÙÄÁ×ÁÔØ ÚÁÐÒÏÓ Ï ÐÏÌÕÞÁÔÅÌÅ ÅÓÌÉ ÚÎÁÞÅÎÉÅ ËÌÀÞÁ +Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ. ëÌÀÞ ÐÏ ÕÍÏÌÞÁÎÉÀ - ÜÔÏ ÐÅÒ×ÙÊ × ÓÅËÒÅÔÎÏÍ ÎÁÂÏÒÅ +ËÌÀÞÅÊ ÉÌÉ ÔÏÔ, ËÏÔÏÒÙÊ ÚÁÄÁÎ ÐÁÒÁÍÅÔÒÏÍ --default-key. +.IP "--no-default-recipient" 10 +ïÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÏ× --default-recipient É --default-recipient-self. +.IP "--encrypt-to \fBname\fR" 10 +ôÏ ÖÅ, ÞÔÏ É --recipient, ÎÏ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÏ× É ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÷ÁÛÉÍ ÓÏÂÓÔ×ÅÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÐÏÌØÚÏ×ÁÔÅÌÑ. õËÁÚÁÎÎÙÅ ËÌÀÞÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÔÏÌØËÏ × ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ -ÚÁÄÁÎÙ ÄÒÕÇÉÅ ÐÏÌÕÞÁÔÅÌÉ ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÁ \-\-recipient, ÉÌÉ ÐÏÓÌÅ +ÚÁÄÁÎÙ ÄÒÕÇÉÅ ÐÏÌÕÞÁÔÅÌÉ ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÁ --recipient, ÉÌÉ ÐÏÓÌÅ ÔÏÇÏ ËÁË ÂÙÌ ÚÁÐÒÏÛÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌÕÞÁÔÅÌÑ. äÌÑ ÕËÁÚÁÎÎÙÈ ËÌÀÞÅÊ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ ÐÒÏ×ÅÒËÁ ÄÏÓÔÏ×ÅÒÎÏÓÔÉ É ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÁÖÅ ÔÅ, ËÏÔÏÒÙÅ ÏÔËÌÀÞÅÎÙ. -.IP "\-\-hidden-encrypt-to \fBname\fR" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-hidden-recipient, ÎÏ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÆÁÊÌÅ +.IP "--hidden-encrypt-to \fBname\fR" 10 +ôÏ ÖÅ, ÞÔÏ É --hidden-recipient, ÎÏ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÏ× É ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÷ÁÛÉÍ ÓÏÂÓÔ×ÅÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÐÏÌØÚÏ×ÁÔÅÌÑ ËÁË ÓËÒÙÔÙÊ "encrypt-to-self". õËÁÚÁÎÎÙÅ ËÌÀÞÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÔÏÌØËÏ × ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ -ÚÁÄÁÎÙ ÄÒÕÇÉÅ ÐÏÌÕÞÁÔÅÌÉ ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÁ \-\-recipient, ÉÌÉ ÐÏÓÌÅ +ÚÁÄÁÎÙ ÄÒÕÇÉÅ ÐÏÌÕÞÁÔÅÌÉ ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÁ --recipient, ÉÌÉ ÐÏÓÌÅ ÔÏÇÏ ËÁË ÂÙÌ ÚÁÐÒÏÛÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌÕÞÁÔÅÌÑ. äÌÑ ÕËÁÚÁÎÎÙÈ ËÌÀÞÅÊ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ ÐÒÏ×ÅÒËÁ ÄÏÓÔÏ×ÅÒÎÏÓÔÉ É ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÁÖÅ ÔÅ, ËÏÔÏÒÙÅ ÏÔËÌÀÞÅÎÙ. -.IP "\-\-no-encrypt-to" 10 -ïÔÍÅÎÑÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ËÌÀÞÅÊ ÚÁÄÁÎÎÙÈ ÐÁÒÁÍÅÔÒÁÍÉ \-\-encrypt-to É \-\-hidden-encrypt-to. -.IP "\-v, \-\-verbose" 10 +.IP "--no-encrypt-to" 10 +ïÔÍÅÎÑÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ËÌÀÞÅÊ ÚÁÄÁÎÎÙÈ ÐÁÒÁÍÅÔÒÁÍÉ --encrypt-to É --hidden-encrypt-to. +.IP "-v, --verbose" 10 õ×ÅÌÉÞÉ×ÁÅÔ ÄÅÔÁÌØÎÏÓÔØ ×Ù×ÏÄÁ ÉÎÆÏÒÍÁÃÉÉ. åÓÌÉ ÉÓÐÏÌØÚÕÅÔÓÑ Ä×ÁÖÄÙ, ÔÏ ÄÅÔÁÌØÎÏ ÏÐÉÓÙ×ÁÀÔÓÑ É ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ. -.IP "\-q, \-\-quiet" 10 +.IP "-q, --quiet" 10 õÍÅÎØÛÁÅÔ ËÏÌÉÞÅÓÔ×Ï ×Ù×ÏÄÉÍÏÊ ÉÎÆÏÒÍÁÃÉÉ ÎÁÓËÏÌØËÏ ÜÔÏ ×ÏÚÍÏÖÎÏ. -.IP "\-z \fBn\fR" 10 -.IP "\-\-compress-level \fBn\fR" 10 -.IP "\-\-bzip2-compress-level \fBn\fR" 10 -\-\-compress-level ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ ÒÁ×ÎÙÍ \fBn\fR ÄÌÑ +.IP "-z \fBn\fR" 10 +.IP "--compress-level \fBn\fR" 10 +.IP "--bzip2-compress-level \fBn\fR" 10 +--compress-level ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ ÒÁ×ÎÙÍ \fBn\fR ÄÌÑ ÁÌÇÏÒÉÔÍÏ× ZIP É ZLIB. ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ zlib -(ÏÂÙÞÎÏ 6). \-\-bzip2-compress-level ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ +(ÏÂÙÞÎÏ 6). --bzip2-compress-level ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ ÄÌÑ ÁÌÇÏÒÉÔÍÁ BZIP2 (ÔÁËÖÅ 6 ÐÏ ÕÍÏÌÞÁÎÉÀ). äÌÑ BZIP2 ÓÄÅÌÁÎ ÏÔÄÅÌØÎÙÊ ÐÁÒÁÍÅÔÒ, ÐÏÓËÏÌØËÕ ÏÎ ÔÒÅÂÕÅÔ ÚÎÁÞÉÔÅÌØÎÏ ÂÏÌØÛÅÇÏ ÏÂߣÍÁ ÐÁÍÑÔÉ ÐÒÉ Õ×ÅÌÉÞÅÎÉÉ -ÕÒÏ×ÎÑ ÓÖÁÔÉÑ. \-z ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÏÂÁ ÐÁÒÁÍÅÔÒÁ. úÎÁÞÅÎÉÅ 0 ÏÔËÌÀÞÁÅÔ +ÕÒÏ×ÎÑ ÓÖÁÔÉÑ. -z ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÏÂÁ ÐÁÒÁÍÅÔÒÁ. úÎÁÞÅÎÉÅ 0 ÏÔËÌÀÞÁÅÔ ÓÖÁÔÉÅ. -.IP "\-\-bzip2-decompress-lowmem" 10 +.IP "--bzip2-decompress-lowmem" 10 éÓÐÏÌØÚÏ×ÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ ÁÌÇÏÒÉÔÍ ÄÅËÏÍÐÒÅÓÓÉÉ ÄÌÑ ÆÁÊÌÏ× ÓÖÁÔÙÈ BZIP2. üÔÏÔ ÍÅÔÏÄ ÉÓÐÏÌØÚÕÅÔ ÐÏÞÔÉ × Ä×Á ÒÁÚÁ ÍÅÎØÛÅ ÐÁÍÑÔÉ, ÎÏ ÒÁÂÏÔÁÅÔ ÔÁË ÖÅ × Ä×Á ÒÁÚÁ ÍÅÄÌÅÎÎÅÅ. ðÁÒÁÍÅÔÒ ÐÒÉÍÅÎÉÍ × ÓÌÕÞÁÑÈ ÏÓÔÒÏÊ ÎÅÈ×ÁÔËÉ -ÐÁÍÑÔÉ ÄÌÑ ÆÁÊÌÏ× ÓÖÁÔÙÈ Ó ×ÙÓÏËÉÍ \-\-bzip2-compress-level. +ÐÁÍÑÔÉ ÄÌÑ ÆÁÊÌÏ× ÓÖÁÔÙÈ Ó ×ÙÓÏËÉÍ --bzip2-compress-level. -.IP "\-t, \-\-textmode" 10 -.IP "\-\-no-textmode" 10 +.IP "-t, --textmode" 10 +.IP "--no-textmode" 10 ðÏÌÁÇÁÔØ, ÞÔÏ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÔÅËÓÔ É ÓÏÈÒÁÎÑÔØ ÉÈ × ËÁÎÏÎÉÞÅÓËÏÊ ÔÅËÓÔÏ×ÏÊ ÆÏÒÍÅ OpenPGP ÓÏ ÓÔÒÏËÁÍÉ ÚÁËÁÎÞÉ×ÁÀÝÉÍÉÓÑ "CRLF". ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÁÒÁÍÅÔÒÁ ÕÓÔÁÎÁ×ÌÉ×ÁÀÔÓÑ ÆÌÁÇÉ, ÓÏÏÂÝÁÀÝÉÅ ÐÏÌÕÞÁÔÅÌÀ, @@ -555,43 +609,43 @@ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÎÃÏ× ÓÔÒÏË × ÔÅ, ËÏÔÏÒÙÅ ÉÓÐÏÌØÚÕÀÔÓÑ ÌÏËÁÌØÎÏÊ ÓÉÓÔÅÍÏÊ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÐÒÉÍÅÎÉÍ ÐÒÉ ÏÂÍÅÎÅ ÉÎÆÏÒÍÁÃÉÅÊ ÍÅÖÄÕ Ä×ÕÍÑ ÒÁÚÌÉÞÎÙÍÉ ÐÌÁÔÆÏÒÍÁÍÉ ÉÓÐÏÌØÚÕÀÝÉÍÉ ÒÁÚÌÉÞÎÙÅ ÏËÏÎÞÁÎÉÑ -ÓÔÒÏË (UNIX \- Mac, Mac \- Windows É Ô.Ð.). \-\-no-textmode ÏÔËÌÀÞÁÅÔ +ÓÔÒÏË (UNIX - Mac, Mac - Windows É Ô.Ð.). --no-textmode ÏÔËÌÀÞÁÅÔ ÄÁÎÎÙÊ ÒÅÖÉÍ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎ. .IP "" 10 -åÓÌÉ \-t (ÎÏ ÎÅ \-\-textmode) ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏ×ÍÅÓÔÎÏ Ó \-\-armor -É \-\-sign, ÔÏ ÓÏÚÄÁ£ÔÓÑ ÐÒÏÚÒÁÞÎÁÑ ÐÏÄÐÉÓØ. üÔÏÔ ÐÁÒÁÍÅÔÒ ÎÅÏÂÈÏÄÉÍ ÄÌÑ +åÓÌÉ -t (ÎÏ ÎÅ --textmode) ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏ×ÍÅÓÔÎÏ Ó --armor +É --sign, ÔÏ ÓÏÚÄÁ£ÔÓÑ ÐÒÏÚÒÁÞÎÁÑ ÐÏÄÐÉÓØ. üÔÏÔ ÐÁÒÁÍÅÔÒ ÎÅÏÂÈÏÄÉÍ ÄÌÑ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó ËÏÎÓÏÌØÎÙÍÉ ×ÅÒÓÉÑÍÉ PGP; ÏÂÙÞÎÏ ÷ÁÍ ÓÌÅÄÕÅÔ -ÉÓÐÏÌØÚÏ×ÁÔØ \-\-sign ÉÌÉ \-\-clearsign ÄÌÑ ×ÙÂÏÒÁ ÔÉÐÁ ÐÏÄÐÉÓÉ. -.IP "\-n, \-\-dry-run" 10 +ÉÓÐÏÌØÚÏ×ÁÔØ --sign ÉÌÉ --clearsign ÄÌÑ ×ÙÂÏÒÁ ÔÉÐÁ ÐÏÄÐÉÓÉ. +.IP "-n, --dry-run" 10 îÅ ÄÅÌÁÔØ ÎÉËÁËÉÈ ÉÚÍÅÎÅÎÉÊ (ÒÅÁÌÉÚÏ×ÁÎ ÎÅ ÐÏÌÎÏÓÔØÀ). -.IP "\-i, \-\-interactive" 10 +.IP "-i, --interactive" 10 ÷Ù×ÏÄÉÔØ ÚÁÐÒÏÓ ÐÅÒÅÄ ÐÅÒÅÚÁÐÉÓØÀ ÆÁÊÌÏ×. -.IP "\-\-batch" 10 -.IP "\-\-no-batch" 10 +.IP "--batch" 10 +.IP "--no-batch" 10 éÓÐÏÌØÚÏ×ÁÔØ ÐÁËÅÔÎÙÊ ÒÅÖÉÍ. îÅ ×Ù×ÏÄÑÔÓÑ ÎÉËÁËÉÅ ÚÁÐÒÏÓÙ, ÎÅ ÄÏÐÕÓËÁÀÔÓÑ ÉÎÔÅÒÁËÔÉ×ÎÙÅ ËÏÍÁÎÄÙ. -\-\-no-batch ÏÔËÌÀÞÁÅÔ ÐÁËÅÔÎÙÊ ÒÅÖÉÍ. -.IP "\-\-no-tty" 10 +--no-batch ÏÔËÌÀÞÁÅÔ ÐÁËÅÔÎÙÊ ÒÅÖÉÍ. +.IP "--no-tty" 10 îÅ ÉÓÐÏÌØÚÏ×ÁÔØ TTY (ÔÅÒÍÉÎÁÌ) ÄÌÑ ×Ù×ÏÄÁ ÉÎÆÏÒÍÁÃÉÉ. ðÁÒÁÍÅÔÒ ÎÅÏÂÈÏÄÉÍ × ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ, Ô.Ë. GnuPG ÉÎÏÇÄÁ ×Ù×ÏÄÉÔ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ÎÁ TTY ÐÒÉ -ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÁÒÁÍÅÔÒÁ \-\-batch. -.IP "\-\-yes" 10 +ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÁÒÁÍÅÔÒÁ --batch. +.IP "--yes" 10 ðÒÅÄÐÏÌÁÇÁÅÔ ÕÔ×ÅÒÄÉÔÅÌØÎÙÊ ÏÔ×ÅÔ ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×. -.IP "\-\-no" 10 +.IP "--no" 10 ðÒÅÄÐÏÌÁÇÁÅÔ ÏÔÒÉÃÁÔÅÌØÎÙÊ ÏÔ×ÅÔ ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×. -.IP "\-\-ask-cert-level" 10 -.IP "\-\-no-ask-cert-level" 10 +.IP "--ask-cert-level" 10 +.IP "--no-ask-cert-level" 10 ðÒÉ ÐÏÄÐÉÓÙ×ÁÎÉÉ ËÌÀÞÁ, ÚÁÐÒÁÛÉ×ÁÔØ ÕÒÏ×ÅÎØ ÓÅÒÔÉÆÉËÁÃÉÉ. åÓÌÉ ÐÁÒÁÍÅÔÒ ÎÅ ÕËÁÚÁÎ, ÔÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÕÒÏ×ÅÎØ ÚÁÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒÏÍ -\-\-default-cert-level. óÍ. × ÏÐÉÓÁÎÉÉ \-\-default-cert-level ÂÏÌÅÅ +--default-cert-level. óÍ. × ÏÐÉÓÁÎÉÉ --default-cert-level ÂÏÌÅÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÒÁÚÌÉÞÎÙÈ ÕÒÏ×ÎÑÈ É ÉÈ ÉÓÐÏÌØÚÏ×ÁÎÉÉ. -\-\-no-ask-cert-level ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ. +--no-ask-cert-level ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ. ðÏ ÕÍÏÌÞÁÎÉÀ ÐÁÒÁÍÅÔÒ ÏÔËÌÀÞÅÎ. -.IP "\-\-min-cert-level" 10 +.IP "--min-cert-level" 10 ðÒÉ ÐÏÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÞÉÔÙ×ÁÔØ ÐÏÄÐÉÓÉ Ó ÕÒÏ×ÎÅÍ ÓÅÒÔÉÆÉËÁÃÉÉ ÎÉÖÅ ÕËÁÚÁÎÎÏÇÏ. ðÏ ÕÍÏÌÞÁÎÉÀ ÒÁ×ÅÎ 2, ÞÔÏ ÏÚÎÁÞÁÅÔ ÏÔËÁÚ ÏÔ ÐÒÉÎÑÔÉÑ ÐÏÄÐÉÓÅÊ Ó ÕÒÏ×ÎÅÍ 1. -.IP "\-\-default-cert-level \fBn\fR" 10 +.IP "--default-cert-level \fBn\fR" 10 õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÕÒÏ×ÅÎØ ÓÅÒÔÉÆÉËÁÃÉÉ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÅÇÏ ÐÏÄÐÉÓÉ. .IP "" 10 0 ÏÚÎÁÞÁÅÔ, ÞÔÏ ÷Ù ÎÅ ÂÕÄÅÔÅ ÕËÁÚÙ×ÁÔØ ÎÁÓËÏÌØËÏ ÔÝÁÔÅÌØÎÏ ÐÒÏ×ÅÒÉÌÉ @@ -618,14 +672,14 @@ ÐÏ×ÅÒÈÎÏÓÔÎÏÊ, Á ËÁËÁÑ ÔÝÁÔÅÌØÎÏÊ ÏÓÔÁ£ÔÓÑ ÚÁ ÷ÁÍÉ. .IP "" 10 úÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ Ñ×ÌÑÅÔÓÑ 0 (ÕÒÏ×ÅÎØ ÎÅ ÕËÁÚÁÎ). -.IP "\-\-trusted-key \fBlong key ID\fR" 10 +.IP "--trusted-key \fBlong key ID\fR" 10 ðÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÕËÁÚÁÎÎÙÊ ËÌÀÞ (ËÏÔÏÒÙÊ ÄÏÌÖÅÎ ÂÙÔØ ÚÁÄÁÎ ÐÏÌÎÙÍ 8ÍÉ ÂÁÊÔÏ×ÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ) ÄÏÓÔÏ×ÅÒÅÎ, ËÁË ÏÄÉÎ ÉÚ ÷ÁÛÉÈ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÐÒÉÍÅÎÉÍ ÅÓÌÉ ÷Ù ÎÅ ÈÏÔÉÔÅ ÈÒÁÎÉÔØ ÷ÁÛÉ ÓÅËÒÅÔÎÙÅ ËÌÀÞÉ (ÉÌÉ ÏÄÉÎ ÉÚ ÎÉÈ) ÎÁ ÄÁÎÎÏÍ ËÏÍÐØÀÔÅÒÅ, ÎÏ ÈÏÔÉÔÅ ÓÏÈÒÁÎÉÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÒÏ×ÅÒÑÔØ ÄÏÓÔÏ×ÅÒÎÏÓÔØ ËÌÀÞÅÊ ÷ÁÛÉÈ ËÏÒÒÅÓÐÏÎÄÅÎÔÏ×. -.IP "\-\-trust-model \fBpgp|classic|always\fR" 10 +.IP "--trust-model \fBpgp|classic|always\fR" 10 õÓÔÁÎÏ×ÉÔØ ÍÏÄÅÌØ ÄÏ×ÅÒÉÑ, ËÏÔÏÒÏÊ ÄÏÌÖÅÎ ÓÌÅÄÏ×ÁÔØ GnuPG. éÍÅÀÔÓÑ ÓÌÅÄÕÀÝÉÅ ÍÏÄÅÌÉ: @@ -642,25 +696,25 @@ .IP "always" 10 ðÒÏÐÕÓÔÉÔØ ÐÒÏÃÅÄÕÒÕ ÐÒÏ×ÅÒËÉ ËÌÀÞÅÊ É ÐÏÌÁÇÁÔØ, ÞÔÏ ÉÓÐÏÌØÚÕÅÍÙÅ ËÌÀÞÉ ×ÓÅÇÄÁ ÐÏÌÎÏÓÔØÀ ÄÏÓÔÏ×ÅÒÎÙ. ÷Ù ÎÅ ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÕ ÍÏÄÅÌØ, ÅÓÌÉ -ÔÏÌØËÏ ÎÅ ÉÓÐÏÌØÚÕÅÔÅ ËÁËÕÀ\-ÌÉÂÏ ×ÎÅÛÎÀÀ ÓÈÅÍÕ ÐÒÏ×ÅÒËÉ ÄÏÓÔÏ×ÅÒÎÏÓÔÉ +ÔÏÌØËÏ ÎÅ ÉÓÐÏÌØÚÕÅÔÅ ËÁËÕÀ-ÌÉÂÏ ×ÎÅÛÎÀÀ ÓÈÅÍÕ ÐÒÏ×ÅÒËÉ ÄÏÓÔÏ×ÅÒÎÏÓÔÉ ËÌÀÞÅÊ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ, ÔÁËÖÅ, ÐÏÄÁ×ÌÑÅÔ ×Ù×ÏÄ ÓÏÏÂÝÅÎÉÑ "[uncertain]" ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ, ËÏÇÄÁ ÎÅÔ Ó×ÉÄÅÔÅÌØÓÔ× ÔÏÇÏ, ÞÔÏ ËÌÀÞ ÐÒÉÎÁÄÌÅÖÉÔ ÕËÁÚÁÎÎÏÍÕ × Î£Í ×ÌÁÄÅÌØÃÕ. .RE -.IP "\-\-always-trust" 10 -éÄÅÎÔÉÞÅÎ `\-\-trust-model always'. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅ +.IP "--always-trust" 10 +éÄÅÎÔÉÞÅÎ `--trust-model always'. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. -.IP "\-\-keyid-format \fBshort|0xshort|long|0xlong\fR" 10 +.IP "--keyid-format \fBshort|0xshort|long|0xlong\fR" 10 ðÏÚ×ÏÌÑÅÔ ×ÙÂÒÁÔØ ÆÏÒÍÁÔ ÏÔÏÂÒÁÖÅÎÉÑ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ËÌÀÞÅÊ. -"short" \-\- ÜÔÏ ÔÒÁÄÉÃÉÏÎÎÙÊ 8-ÓÉÍ×ÏÌØÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ. -"long" \-\- ÂÏÌÅÅ ÔÏÞÎÙÊ (ÎÏ ÍÅÎÅÅ ÒÁÓÐÒÏÓÔÒÁΣÎÎÙÊ) 16-ÓÉÍ×ÏÌØÎÙÊ +"short" -- ÜÔÏ ÔÒÁÄÉÃÉÏÎÎÙÊ 8-ÓÉÍ×ÏÌØÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ. +"long" -- ÂÏÌÅÅ ÔÏÞÎÙÊ (ÎÏ ÍÅÎÅÅ ÒÁÓÐÒÏÓÔÒÁΣÎÎÙÊ) 16-ÓÉÍ×ÏÌØÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ. äÏÂÁ×ÌÅÎÉÅ "0x" Ë ÆÏÒÍÁÔÕ ÐÒÉ×ÏÄÉÔ Ë ÄÏÂÁ×ÌÅÎÉÀ "0x" Ë ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ËÌÀÞÁ, ÎÁÐÒÉÍÅÒ, 0x99242560. -.IP "\-\-keyserver \fBname\fR" 10 +.IP "--keyserver \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ ÓÅÒ×ÅÒ ËÌÀÞÅÊ \fBname\fR. üÔÏ ÓÅÒ×ÅÒ ËÏÔÏÒÙÊ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÐÏÌÕÞÅÎÉÑ, ÏÔÐÒÁ×ËÉ É ÐÏÉÓËÁ ËÌÀÞÅÊ ÐÒÉ -ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÏÍÁÎÄ \-\-recv-keys, \-\-send-keys É \-\-search-keys. æÏÒÍÁÔ -\fBname\fR ÜÔÏ URI: `scheme:[//]keyservername[:port]' óÈÅÍÁ \-\- ÜÔÏ ÔÉÐ +ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÏÍÁÎÄ --recv-keys, --send-keys É --search-keys. æÏÒÍÁÔ +\fBname\fR ÜÔÏ URI: `scheme:[//]keyservername[:port]' óÈÅÍÁ -- ÜÔÏ ÔÉÐ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ: "hkp" ÄÌÑ HTTP (ÉÌÉ ÓÏ×ÍÅÓÔÉÍÙÈ) ÓÅÒ×ÅÒÏ×, "ldap" ÄÌÑ NAI LDAP ÓÅÒ×ÅÒÏ×, "mailto" ÄÌÑ Graf email keyserver. úÁÍÅÔÉÍ, ÞÔÏ ËÏÎËÒÅÔÎÁÑ ÉÎÓÔÁÌÑÃÉÑ GnuPG ÍÏÖÅÔ ÄÏÐÕÓËÁÔØ É ÄÒÕÇÉÅ ÔÉÐÙ @@ -670,7 +724,7 @@ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÏÓÙÌÁÔØ ËÌÀÞÉ ÂÏÌÅÅ ÞÅÍ ÎÁ ÏÄÉÎ ÓÅÒ×ÅÒ. éÍÑ "hkp://subkeys.pgp.net" Ñ×ÌÑÅÔÓÑ ÐÓÅ×ÄÏÎÉÍÏÍ ÄÌÑ ÎÅÓËÏÌØËÉÈ ÓÅÒ×ÅÒÏ× ËÌÀÞÅÊ. -.IP "\-\-keyserver-options \fBparameters\fR" 10 +.IP "--keyserver-options \fBparameters\fR" 10 äÁÎÎÁÑ ÓÔÒÏËÁ ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË ÒÁÚÄÅÌ£ÎÎÙÈ ÐÒÏÂÅÌÁÍÉ ÉÌÉ ÚÁÐÑÔÙÍÉ ÐÁÒÁÍÅÔÒÏ× ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ. ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ ÐÒÅÆÉËÓÏÍ `no-' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÏÂÒÁÔÎÏÇÏ ÚÎÁÞÅÎÉÑ. @@ -678,7 +732,7 @@ ÔÉÐÁ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ. ïÓÎÏ×ÎÙÅ ÐÁÒÁÍÅÔÒÙ ÓÌÅÄÕÀÝÉÅ: .RS .IP "include-revoked" 10 -ðÒÉ ÐÏÉÓËÅ ËÌÀÞÅÊ ËÏÍÁÎÄÏÊ \-\-search-keys, ÕÞÉÔÙ×ÁÔØ É ÔÅ ËÌÀÞÉ, ËÏÔÏÒÙÅ +ðÒÉ ÐÏÉÓËÅ ËÌÀÞÅÊ ËÏÍÁÎÄÏÊ --search-keys, ÕÞÉÔÙ×ÁÔØ É ÔÅ ËÌÀÞÉ, ËÏÔÏÒÙÅ ÐÏÍÅÞÅÎÙ ÎÁ ÓÅÒ×ÅÒÅ ËÌÀÞÅÊ ËÁË ÏÔÏÚ×ÁÎÎÙÅ. úÁÍÅÔØÔÅ, ÞÔÏ ÎÅ ×ÓÅ ÓÅÒ×ÅÒÙ ËÌÀÞÅÊ ÒÁÚÌÉÞÁÀÔ ÏÔÏÚ×ÁÎÎÙÅ É ÎÅ ÏÔÏÚ×ÁÎÎÙÅ ËÌÀÞÉ, ÄÌÑ ÔÁËÉÈ ÓÅÒ×ÅÒÏ× ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÌÉۣΠÓÍÙÓÌÁ. úÁÍÅÔØÔÅ, ÔÁËÖÅ, ÞÔÏ ÂÏÌØÛÉÎÓÔ×Ï ÓÅÒ×ÅÒÏ× @@ -687,11 +741,11 @@ ÐÒÏÐÕÝÅÎÙ ËÌÀÞÉ ÎÅËÏÒÒÅËÔÎÏ ÐÏÍÅÞÅÎÎÙÅ ËÁË ÏÔÏÚ×ÁÎÎÙÅ. ðÏ ÕÍÏÌÞÁÎÉÀ ÐÁÒÁÍÅÔÒ ×ËÌÀÞÅÎ. .IP "include-disabled" 10 -ðÒÉ ÐÏÉÓËÅ ËÌÀÞÅÊ ËÏÍÁÎÄÏÊ \-\-search-keys, ÕÞÉÔÙ×ÁÔØ É ÔÅ ËÌÀÞÉ, ËÏÔÏÒÙÅ +ðÒÉ ÐÏÉÓËÅ ËÌÀÞÅÊ ËÏÍÁÎÄÏÊ --search-keys, ÕÞÉÔÙ×ÁÔØ É ÔÅ ËÌÀÞÉ, ËÏÔÏÒÙÅ ÐÏÍÅÞÅÎÙ ÎÁ ÓÅÒ×ÅÒÅ ËÌÀÞÅÊ ËÁË ÎÅÉÓÐÏÌØÚÕÅÍÙÅ. úÁÍÅÔÉÍ, ÞÔÏ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ HKP ÓÅÒ×ÅÒÁÍÉ. .IP "honor-keyserver-url" 10 -ðÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ \-\-refresh-keys, ÅÓÌÉ × ÚÁÐÒÁÛÉ×ÁÅÍÏÍ ËÌÀÞÅ +ðÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ --refresh-keys, ÅÓÌÉ × ÚÁÐÒÁÛÉ×ÁÅÍÏÍ ËÌÀÞÅ ÕÓÔÁÎÏ×ÌÅÎ ÐÒÅÄÐÏÞÉÔÁÅÍÙÊ ÓÅÒ×ÅÒ ËÌÀÞÅÊ, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÅÇÏ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ËÌÀÞÁ. ðÏ ÕÍÏÌÞÁÎÉÀ ×ËÌÀÞÅÎ. .IP "include-subkeys" 10 @@ -717,12 +771,12 @@ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ ÏÐÅÒÁÃÉÉ × ÓÅËÕÎÄÁÈ. úÁÍÅÔØÔÅ, ÞÔÏ ÐÒÉ ÏÄÎÏ×ÒÅÍÅÎÎÏÍ ×ÙÐÏÌÎÅÎÉÉ ÎÅÓËÏÌØËÉÈ ÏÐÅÒÁÃÉÊ ÚÎÁÞÅÎÉÅ ÔÁÊÍÁÕÔÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÏÔÄÅÌØÎÏ ÄÌÑ ËÁÖÄÏÊ ÏÐÅÒÁÃÉÉ. îÁÐÒÉÍÅÒ, ÐÒÉ ÐÏÌÕÞÅÎÉÉ ÎÅÓËÏÌØËÉÈ ËÌÀÞÅÊ Ó ÐÏÍÏÝØÀ -\-\-recv-keys, ÏÇÒÁÎÉÞÉ×ÁÅÔÓÑ ×ÒÅÍÑ ÐÏÌÕÞÅÎÉÑ ËÁÖÄÏÇÏ ÉÚ ÎÉÈ ÐÏ +--recv-keys, ÏÇÒÁÎÉÞÉ×ÁÅÔÓÑ ×ÒÅÍÑ ÐÏÌÕÞÅÎÉÑ ËÁÖÄÏÇÏ ÉÚ ÎÉÈ ÐÏ ÏÔÄÅÌØÎÏÓÔÉ. ðÏ ÕÍÏÌÞÁÎÉÀ 30 ÓÅËÕÎÄ. .IP "http-proxy [=value]" 10 äÌÑ ÓÅÒ×ÅÒÏ× ËÌÀÞÅÊ ËÏÔÏÒÙÅ ÉÓÐÏÌØÚÕÀÔ HTTP (ÔÁËÉÈ ËÁË HKP), -ÉÓÐÏÌØÚÏ×ÁÔØ ÄÏÓÔÕÐ ÞÅÒÅÚ ÕËÁÚÁÎÎÙÊ ÐÒÏËÓÉ\-ÓÅÒ×ÅÒ. åÓÌÉ ÁÒÇÕÍÅÎÔ -ÏÐÕÝÅÎ, ÔÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏËÓÉ\-ÓÅÒ×ÅÒ ÚÁÄÁÎÎÙÊ × ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ +ÉÓÐÏÌØÚÏ×ÁÔØ ÄÏÓÔÕÐ ÞÅÒÅÚ ÕËÁÚÁÎÎÙÊ ÐÒÏËÓÉ-ÓÅÒ×ÅÒ. åÓÌÉ ÁÒÇÕÍÅÎÔ +ÏÐÕÝÅÎ, ÔÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏËÓÉ-ÓÅÒ×ÅÒ ÚÁÄÁÎÎÙÊ × ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ "http_proxy". .IP "auto-key-retrieve" 10 äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÒÁÚÒÅÛÁÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÐÏÌÕÞÅÎÉÅ ËÌÀÞÅÊ Ó ÓÅÒ×ÅÒÁ ÐÒÉ @@ -735,7 +789,7 @@ ÷ÁÓ), ÏÎÉ ÍÏÇÕÔ ÏÐÒÅÄÅÌÉÔØ ÷ÁÛ IP ÁÄÒÅÓ É ×ÒÅÍÑ, ËÏÇÄÁ ÷Ù ÐÒÏ×ÅÒÉÌÉ ÐÏÄÐÉÓØ. .RE -.IP "\-\-import-options \fBparameters\fR" 10 +.IP "--import-options \fBparameters\fR" 10 ÷ ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÕËÁÚÙ×ÁÅÔÓÑ ÓÔÒÏËÁ, × ËÏÔÏÒÏÊ, ÞÅÒÅÚ ÐÒÏÂÅÌÙ ÉÌÉ ÚÁÐÑÔÙÅ, ÐÅÒÅÞÉÓÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÉÍÐÏÒÔÁ ËÌÀÞÅÊ. ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ `no-' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÏÂÒÁÔÎÏÇÏ ÚÎÁÞÅÎÉÑ. äÏÐÕÓÔÉÍÙÅ @@ -750,13 +804,13 @@ PKS (ÄÏ ×ÅÒÓÉÉ 0.9.6), ÉÓËÁÖÁÀÝÅÊ ËÌÀÞÉ Ó ÍÎÏÖÅÓÔ×ÅÎÎÙÍÉ ÐÏÄËÌÀÞÁÍÉ. úÁÍÅÔØÔÅ, ÞÔÏ ÜÔÏ ÎÅ ÐÏÚ×ÏÌÑÅÔ ÐÏÌÎÏÓÔØÀ ×ÏÓÓÔÁÎÏ×ÉÔØ ÐÏ×ÒÅÖÄÅÎÎÙÊ ËÌÀÞ, Ô.Ë. ÞÁÓÔØ ÄÁÎÎÙÈ ÕÄÁÌÑÅÔÓÑ ÓÅÒ×ÅÒÏÍ ËÌÀÞÅÊ, ÎÏ ÄÁ£Ô ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ -ÐÏÄËÌÀÞ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎ ÄÌÑ ÏÂÙÞÎÏÇÏ \-\-import É ×ËÌÀÞÅÎ ÄÌÑ -\-\-recv-keys. +ÐÏÄËÌÀÞ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎ ÄÌÑ ÏÂÙÞÎÏÇÏ --import É ×ËÌÀÞÅÎ ÄÌÑ +--recv-keys. .IP "merge-only" 10 ÷Ï ×ÒÅÍÑ ÉÍÐÏÒÔÁ ÒÁÚÒÅÛÉÔØ ÔÏÌØËÏ ÏÂÎÏ×ÌÅÎÉÅ ÓÕÝÅÓÔ×ÕÀÝÉÈ ËÌÀÞÅÊ, ÎÏ ÎÅ ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÎÉËÁËÉÅ ÎÏ×ÙÅ ËÌÀÞÉ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎ. .RE -.IP "\-\-export-options \fBparameters\fR" 10 +.IP "--export-options \fBparameters\fR" 10 ÷ ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÕËÁÚÙ×ÁÅÔÓÑ ÓÔÒÏËÁ, × ËÏÔÏÒÏÊ, ÞÅÒÅÚ ÐÒÏÂÅÌÙ ÉÌÉ ÚÁÐÑÔÙÅ, ÐÅÒÅÞÉÓÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÜËÓÐÏÒÔÁ ËÌÀÞÅÊ. ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ `no-' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÏÂÒÁÔÎÏÇÏ ÚÎÁÞÅÎÉÑ. äÏÐÕÓÔÉÍÙÅ @@ -779,29 +833,29 @@ ÄÏÓÔÉÇÁÅÔÓÑ ÚÁ ÓÞ£Ô ÔÏÇÏ, ÞÔÏ × ÜËÓÐÏÒÔÉÒÕÅÍÙÊ ËÌÀÞ ÎÅ ×ËÌÀÞÁÀÔÓÑ ÎÉËÁËÉÅ ÐÏÄÐÉÓÉ ËÒÏÍÅ ÓÁÍÏÐÏÄÐÉÓÅÊ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .RE -.IP "\-\-list-options \fBparameters\fR" 10 +.IP "--list-options \fBparameters\fR" 10 üÔÏ ÓÐÉÓÏË ÒÁÚÄÅÌ£ÎÎÙÈ ÐÒÏÂÅÌÁÍÉ ÉÌÉ ÚÁÐÑÔÙÍÉ ÐÁÒÁÍÅÔÒÏ×, ÉÓÐÏÌØÚÕÅÍÙÈ -ÐÒÉ ×Ù×ÏÄÅ ÓÐÉÓËÏ× ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ (ÔÁËÉÍÉ ËÏÍÁÎÄÁÍÉ, ËÁË \-\-list-keys, -\-\-list-sigs, \-\-list-public-keys, \-\-list-secret-keys É ÆÕÎËÃÉÑÍÉ -\-\-edit-key). ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ ÐÒÅÆÉËÓÏÍ `no-' ÄÌÑ ÐÒÉÄÁÎÉÑ +ÐÒÉ ×Ù×ÏÄÅ ÓÐÉÓËÏ× ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ (ÔÁËÉÍÉ ËÏÍÁÎÄÁÍÉ, ËÁË --list-keys, +--list-sigs, --list-public-keys, --list-secret-keys É ÆÕÎËÃÉÑÍÉ +--edit-key). ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ ÐÒÅÆÉËÓÏÍ `no-' ÄÌÑ ÐÒÉÄÁÎÉÑ ÉÍ ÐÒÏÔÉ×ÏÐÏÌÏÖÎÏÇÏ ÚÎÁÞÅÎÉÑ. éÍÅÀÔÓÑ ÓÌÅÄÕÀÝÉÅ ÐÁÒÁÍÅÔÒÙ: .RS .IP "show-photos" 10 -úÁÓÔÁ×ÌÑÅÔ \-\-list-keys, \-\-list-sigs, \-\-list-public-keys É -\-\-list-secret-keys ×Ù×ÏÄÉÔØ ×ÓÅ photo ID ÓÏÄÅÒÖÁÝÉÅÓÑ × ËÌÀÞÅ. -ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. óÍ. ÔÁËÖÅ \-\-photo-viewer. +úÁÓÔÁ×ÌÑÅÔ --list-keys, --list-sigs, --list-public-keys É +--list-secret-keys ×Ù×ÏÄÉÔØ ×ÓÅ photo ID ÓÏÄÅÒÖÁÝÉÅÓÑ × ËÌÀÞÅ. +ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. óÍ. ÔÁËÖÅ --photo-viewer. .IP "show-policy-url" 10 -ðÏËÁÚÙ×ÁÔØ URL ÐÏÌÉÔÉË × ×Ù×ÏÄÅ ËÏÍÁÎÄ \-\-list-sigs É \-\-check-sigs. +ðÏËÁÚÙ×ÁÔØ URL ÐÏÌÉÔÉË × ×Ù×ÏÄÅ ËÏÍÁÎÄ --list-sigs É --check-sigs. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-notations" 10 .IP "show-std-notations" 10 .IP "show-user-notations" 10 -ðÏËÁÚÙ×ÁÔØ ÐÒÉÍÅÞÁÎÉÑ Ë ÐÏÄÐÉÓÑÍ × ×Ù×ÏÄÅ ËÏÍÁÎÄ \-\-list-sigs É \-\-check-sigs. +ðÏËÁÚÙ×ÁÔØ ÐÒÉÍÅÞÁÎÉÑ Ë ÐÏÄÐÉÓÑÍ × ×Ù×ÏÄÅ ËÏÍÁÎÄ --list-sigs É --check-sigs. óÏÏÔ×ÅÔÓÔ×ÅÎÎÏ, ×ÓÅ, ÓÔÁÎÄÁÒÔÎÙÅ IETF, ÉÌÉ ÏÐÒÅÄÅÌ£ÎÎÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-keyserver-urls" 10 ðÏËÁÚÙ×ÁÔØ URL ÐÒÅÄÐÏÞÉÔÁÅÍÏÇÏ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ × ×Ù×ÏÄÅ ËÏÍÁÎÄ -\-\-list-sigs É \-\-check-sigs. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. +--list-sigs É --check-sigs. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-uid-validity" 10 ðÏËÁÚÙ×ÁÔØ ×ÙÞÉÓÌÅÎÎÕÀ ÄÏÓÔÏ×ÅÒÎÏÓÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÉ ×Ù×ÏÄÅ ËÌÀÞÅÊ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. @@ -816,22 +870,22 @@ ËÁËÏÊ Ó×ÑÚËÅ ÎÁÈÏÄÉÔÓÑ ËÌÀÞ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-sig-expire" 10 ðÏËÁÚÙ×ÁÔØ ÄÁÔÙ ÄÏ ËÏÔÏÒÙÈ ÄÅÊÓÔ×ÉÔÅÌØÎÙ ÐÏÄÐÉÓÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ -\-\-list-sigs É \-\-check-sigs. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. +--list-sigs É --check-sigs. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-sig-subpackets" 10 ðÏËÁÚÙ×ÁÔØ ÐÏÄÐÁËÅÔÙ ÐÏÄÐÉÓÅÊ ÐÒÉ ×Ù×ÏÄÅ ÓÐÉÓËÁ ËÌÀÞÅÊ. äÌÑ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÁÒÇÕÍÅÎÔ, ÓÏÄÅÒÖÁÝÉÊ ÓÐÉÓÏË ÐÏÄÐÁËÅÔÏ×, ËÏÔÏÒÙÅ ÓÌÅÄÕÅÔ ×Ù×ÅÓÔÉ. åÓÌÉ ÁÒÇÕÍÅÎÔ ÏÐÕÝÅÎ, ÔÏ ×Ù×ÏÄÑÔÓÑ ×ÓÅ ÐÏÄÐÁËÅÔÙ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÉÍÅÅÔ ÓÍÙÓÌ ÔÏÌØËÏ -ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ \-\-with-colons ÓÏ×ÍÅÓÔÎÏ Ó \-\-list-sigs ÉÌÉ \-\-check-sigs. +ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ --with-colons ÓÏ×ÍÅÓÔÎÏ Ó --list-sigs ÉÌÉ --check-sigs. .RE -.IP "\-\-verify-options \fBparameters\fR" 10 +.IP "--verify-options \fBparameters\fR" 10 üÔÏ ÓÐÉÓÏË ÒÁÚÄÅÌ£ÎÎÙÈ ÐÒÏÂÅÌÁÍÉ ÉÌÉ ÚÁÐÑÔÙÍÉ ÐÁÒÁÍÅÔÒÏ×, ÉÓÐÏÌØÚÕÅÍÙÈ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ. ðÁÒÁÍÅÔÒÙ ÍÏÇÕÔ ÐÒÅÄ×ÁÒÑÔØÓÑ ÐÒÅÆÉËÓÏÍ `no-' ÄÌÑ ÐÒÉÄÁÎÉÑ ÉÍ ÐÒÏÔÉ×ÏÐÏÌÏÖÎÏÇÏ ÚÎÁÞÅÎÉÑ. éÍÅÀÔÓÑ ÓÌÅÄÕÀÝÉÅ ÐÁÒÁÍÅÔÒÙ: .RS .IP "show-photos" 10 ðÏËÁÚÙ×ÁÔØ ×ÓÅ photo ID ÉÍÅÀÝÉÅÓÑ × ËÌÀÞÅ, ËÏÔÏÒÙÍ ÓÄÅÌÁÎÁ ÐÏÄÐÉÓØ. -ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. óÍ. ÔÁËÖÅ \-\-photo-viewer. +ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. óÍ. ÔÁËÖÅ --photo-viewer. .IP "show-policy-url" 10 ðÏËÁÚÙ×ÁÔØ URL ÐÏÌÉÔÉË × ÐÒÏ×ÅÒÑÅÍÏÊ ÐÏÄÐÉÓÉ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .IP "show-notations" 10 @@ -850,72 +904,72 @@ ðÏËÁÚÙ×ÁÔØ ÏÔÏÚ×ÁÎÎÙÅ É ÉÓÔ£ËÛÉÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. .RE -.IP "\-\-show-photos" 10 -.IP "\-\-no-show-photos" 10 -ðÒÉ×ÏÄÉÔ Ë ÔÏÍÕ, ÞÔÏ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ \-\-list-keys, \-\-list-sigs, -\-\-list-public-keys, \-\-list-secret-keys É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ ×Ù×ÏÄÑÔÓÑ +.IP "--show-photos" 10 +.IP "--no-show-photos" 10 +ðÒÉ×ÏÄÉÔ Ë ÔÏÍÕ, ÞÔÏ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ --list-keys, --list-sigs, +--list-public-keys, --list-secret-keys É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ ×Ù×ÏÄÑÔÓÑ ÆÏÔÏÇÒÁÆÉÞÅÓËÉÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ Ó×ÑÚÁÎÎÙÅ Ó ËÌÀÞÏÍ, ÅÓÌÉ ÔÁËÏ×ÙÅ ÉÍÅÀÔÓÑ. -óÍ. ÔÁËÖÅ \-\-photo-viewer. éÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. -÷ÍÅÓÔÏ ÎÅÇÏ ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ `\-\-list-options [no-]show-photos' É/ÉÌÉ -`\-\-verify-options [no-]show-photos'. -\-\-no-show-photos ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. -.IP "\-\-photo-viewer \fBstring\fR" 10 +óÍ. ÔÁËÖÅ --photo-viewer. éÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. +÷ÍÅÓÔÏ ÎÅÇÏ ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ `--list-options [no-]show-photos' É/ÉÌÉ +`--verify-options [no-]show-photos'. +--no-show-photos ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. +.IP "--photo-viewer \fBstring\fR" 10 ïÐÒÅÄÅÌÑÅÔ ËÏÍÁÎÄÎÕÀ ÓÔÒÏËÕ, ËÏÔÏÒÁÑ ÄÏÌÖÎÁ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÆÏÔÏÇÒÁÆÉÞÅÓËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ. "%i" ÒÁÓËÒÙ×ÁÅÔÓÑ × ÉÍÑ ÆÁÊÌÁ, ÓÏÄÅÒÖÁÝÅÇÏ ÆÏÔÏÇÒÁÆÉÀ. "%I" ÄÅÌÁÅÔ ÔÏ ÖÅ ÓÁÍÏÅ, ÎÏ ÆÁÊÌ ÎÅ ÂÕÄÅÔ ÕÄẠ́ΠÐÏÓÌÅ ×ÙÈÏÄÁ ÉÚ ÐÒÏÇÒÁÍÍÙ ÐÒÏÓÍÏÔÒÁ. "%k" ÚÁÍÅÎÑÅÔÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ -ËÌÀÞÁ, "%K" \-\- ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ, "%f" \-\- ÏÔÐÅÞÁÔËÏÍ ËÌÀÞÁ, -"%t" \-\- ÒÁÓÛÉÒÅÎÉÅÍ ÄÌÑ ÄÁÎÎÏÇÏ ÔÉÐÁ ÉÚÏÂÒÁÖÅÎÉÊ (ÎÁÐÒ., "jpg"), "%T" \-\- -MIME ÔÉÐÏÍ ÉÚÏÂÒÁÖÅÎÉÑ (ÎÁÐÒ., "image/jpeg"), É "%%" \-\- ÚÎÁËÏÍ ÐÒÏÃÅÎÔÁ. +ËÌÀÞÁ, "%K" -- ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ, "%f" -- ÏÔÐÅÞÁÔËÏÍ ËÌÀÞÁ, +"%t" -- ÒÁÓÛÉÒÅÎÉÅÍ ÄÌÑ ÄÁÎÎÏÇÏ ÔÉÐÁ ÉÚÏÂÒÁÖÅÎÉÊ (ÎÁÐÒ., "jpg"), "%T" -- +MIME ÔÉÐÏÍ ÉÚÏÂÒÁÖÅÎÉÑ (ÎÁÐÒ., "image/jpeg"), É "%%" -- ÚÎÁËÏÍ ÐÒÏÃÅÎÔÁ. åÓÌÉ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÎÉ "%i", ÎÉ "%I", ÔÏ ÆÏÔÏÇÒÁÆÉÑ ÐÅÒÅÄÁ£ÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ ËÏÍÁÎÄÙ ÐÒÏÓÍÏÔÒÁ. .IP "" 10 úÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ: -"xloadimage \-fork \-quiet \-title 'KeyID 0x%k' stdin" +"xloadimage -fork -quiet -title 'KeyID 0x%k' stdin" úÁÍÅÔØÔÅ, ÞÔÏ ÅÓÌÉ ÷ÁÛÁ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ ÎÅ ÚÁÝÉÝÅÎÁ, ÔÏ ×ÙÚÏ× ÉÚ GnuPG ÎÅ ÓÄÅÌÁÅÔ Å£ ÚÁÝÉÝ£ÎÎÏÊ. -.IP "\-\-exec-path \fBstring\fR" 10 +.IP "--exec-path \fBstring\fR" 10 õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÓÐÉÓÏË ËÁÔÁÌÏÇÏ×, ÉÓÐÏÌØÚÕÅÍÙÈ ÄÌÑ ÐÏÉÓËÁ ÐÒÏÇÒÁÍÍÙ ÐÒÏÓÍÏÔÒÁ ÆÏÔÏÇÒÁÆÉÊ É ÐÏÍÏÝÎÉËÁ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ. åÓÌÉ ÐÁÒÁÍÅÔÒ ÎÅ ÚÁÄÁÎ, ÔÏ ÄÌÑ ÐÏÍÏÝÎÉËÁ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÉÓÐÏÌØÚÕÅÔÓÑ ËÁÔÁÌÏÇ ÏÐÒÅÄÅÌ£ÎÎÙÊ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ, Á ÄÌÑ ÐÒÏÇÒÁÍÍÙ ÐÒÏÓÍÏÔÒÁ ÆÏÔÏÇÒÁÆÉÊ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÅÒÅÍÅÎÎÁÑ ÏËÒÕÖÅÎÉÑ $PATH. -.IP "\-\-show-keyring" 10 +.IP "--show-keyring" 10 ÷Ù×ÏÄÉÔØ ÉÍÑ Ó×ÑÚËÉ ËÌÀÞÅÊ × ÎÁÞÁÌÅ ×Ù×ÏÄÁ ÓÐÉÓËÁ ËÌÀÞÅÊ, ÞÔÏÂÙ ÐÏËÁÚÁÔØ × ËÁËÏÊ Ó×ÑÚËÅ ÈÒÁÎÉÔÓÑ ËÌÀÞ. ðÒÉÍÅÎÑÔØ ÐÁÒÁÍÅÔÒ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. -÷ÍÅÓÔÏ ÎÅÇÏ ÓÌÅÄÕÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ `\-\-list-options [no-]show-keyring' -.IP "\-\-keyring \fBfile\fR" 10 +÷ÍÅÓÔÏ ÎÅÇÏ ÓÌÅÄÕÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ `--list-options [no-]show-keyring' +.IP "--keyring \fBfile\fR" 10 äÏÂÁ×ÉÔØ \fBfile\fR Ë ÔÅËÕÝÅÍÕ ÓÐÉÓËÕ ÎÁÂÏÒÏ× ËÌÀÞÅÊ. åÓÌÉ \fBfile\fR ÎÁÞÉÎÁÅÔÓÑ Ó ÔÉÌØÄÙ É ÓÉÍ×ÏÌÁ ËÏÓÏÊ ÞÅÒÔÙ, ÔÏ ÏÎÉ ÚÁÍÅÎÑÀÔÓÑ ÚÎÁÞÅÎÉÅÍ ÄÏÍÁÛÎÅÇÏ ËÁÔÁÌÏÇÁ. åÓÌÉ ÉÍÑ ÆÁÊÌÁ ÎÅ ÓÏÄÅÒÖÉÔ ÓÉÍ×ÏÌÁ ËÏÓÏÊ ÞÅÒÔÙ, ÔÏ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÆÁÊÌ ÎÁÈÏÄÉÔÓÑ × ÄÏÍÁÛÎÅÍ ËÁÔÁÌÏÇÅ GnuPG ("~/.gnupg" -ÅÓÌÉ ÎÅ ÚÁÄÁÎÙ ÐÁÒÁÍÅÔÒ \-\-homedir É ÐÅÒÅÍÅÎÎÁÑ $GNUPGHOME). +ÅÓÌÉ ÎÅ ÚÁÄÁÎÙ ÐÁÒÁÍÅÔÒ --homedir É ÐÅÒÅÍÅÎÎÁÑ $GNUPGHOME). .IP "" 10 úÁÍÅÔØÔÅ, ÞÔÏ ÐÁÒÁÍÅÔÒ ÄÏÂÁ×ÌÑÅÔ Ó×ÑÚËÕ Ë ÔÅËÕÝÅÍÕ ÓÐÉÓËÕ. åÓÌÉ ÎÕÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÄÁÎÎÕÀ Ó×ÑÚËÕ ËÌÀÞÅÊ, ÔÏ ÐÁÒÁÍÅÔÒ ÓÌÅÄÕÅÔ ÚÁÄÁ×ÁÔØ -ÓÏ×ÍÅÓÔÎÏ Ó \-\-no-default-keyring. -.IP "\-\-secret-keyring \fBfile\fR" 10 -ôÏ ÖÅ, ÞÔÏ É \-\-keyring ÎÏ ÄÌÑ ÎÁÂÏÒÏ× ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ. -.IP "\-\-primary-keyring \fBfile\fR" 10 +ÓÏ×ÍÅÓÔÎÏ Ó --no-default-keyring. +.IP "--secret-keyring \fBfile\fR" 10 +ôÏ ÖÅ, ÞÔÏ É --keyring ÎÏ ÄÌÑ ÎÁÂÏÒÏ× ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ. +.IP "--primary-keyring \fBfile\fR" 10 îÁÚÎÁÞÁÅÔ ÆÁÊÌ \fBfile\fR ÇÌÁ×ÎÏÊ Ó×ÑÚËÏÊ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ. üÔÏ ÚÎÁÞÉÔ, -ÞÔÏ ÎÏ×ÙÅ ÉÍÐÏÒÔÉÒÕÅÍÙÅ ËÌÀÞÉ (ÞÅÒÅÚ \-\-import ÉÌÉ \-\-recv-keys) ÂÕÄÕÔ +ÞÔÏ ÎÏ×ÙÅ ÉÍÐÏÒÔÉÒÕÅÍÙÅ ËÌÀÞÉ (ÞÅÒÅÚ --import ÉÌÉ --recv-keys) ÂÕÄÕÔ ÄÏÂÁ×ÌÑÔØÓÑ × ÜÔÕ Ó×ÑÚËÕ. -.IP "\-\-trustdb-name \fBfile\fR" 10 +.IP "--trustdb-name \fBfile\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBfile\fR ×ÍÅÓÔÏ ÂÁÚÙ ÄÁÎÎÙÈ Ï ÄÏ×ÅÒÉÑÈ ÐÏ ÕÍÏÌÞÁÎÉÀ. åÓÌÉ \fBfile\fR ÎÁÞÉÎÁÅÔÓÑ Ó ÔÉÌØÄÙ É ËÏÓÏÊ ÞÅÒÔÙ, ÔÏ ÏÎÉ ÚÁÍÅÎÑÀÔÓÑ ÚÎÁÞÅÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ $HOME. åÓÌÉ ÉÍÑ ÆÁÊÌÁ ÎÅ ÓÏÄÅÒÖÉÔ ËÏÓÏÊ ÞÅÒÔÙ, ÔÏ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÏÎ ÎÁÈÏÄÉÔÓÑ × ÄÏÍÁÛÎÅÍ ËÁÔÁÌÏÇÅ GnuPG -("~/.gnupg", ÅÓÌÉ ÎÅ ÚÁÄÁÎÙ \-\-homedir É $GNUPGHOME). -.IP "\-\-homedir \fBdirectory\fR" 10 +("~/.gnupg", ÅÓÌÉ ÎÅ ÚÁÄÁÎÙ --homedir É $GNUPGHOME). +.IP "--homedir \fBdirectory\fR" 10 õÓÔÁÎÏ×ÉÔØ ÉÍÑ ÄÏÍÁÛÎÅÇÏ ËÁÔÁÌÏÇÁ ÒÁ×ÎÙÍ \fBdirectory\fR åÓÌÉ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ, ÔÏ ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ "~/.gnupg". éÇÎÏÒÉÒÕÅÔÓÑ × ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÏ×. ðÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ $GNUPGHOME. -.IP "\-\-display-charset \fBname\fR" 10 +.IP "--display-charset \fBname\fR" 10 õÓÔÁÎÏ×ÉÔØ ÉÓÐÏÌØÚÕÅÍÙÊ ÎÁÂÏÒ ÓÉÍ×ÏÌÏ×. éÓÐÏÌØÚÕÅÔÓÑ ÐÒÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÉ ÎÅËÏÔÏÒÙÈ ÓÔÒÏË, ÔÁËÉÈ ËÁË ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ, × ËÏÄÉÒÏ×ËÕ UTF-8. åÓÌÉ ÐÁÒÁÍÅÔÒ ÎÅ ÚÁÄÁÎ, ÔÏ ÎÁÂÏÒ ÓÉÍ×ÏÌÏ× ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÔÅËÕÝÅÊ ÌÏËÁÌÉ. îÁÂÏÒ ÓÉÍ×ÏÌÏ× ×Ù×ÏÄÉÔÓÑ ÐÒÉ -ÉÓÐÏÌØÚÏ×ÁÎÉÉ 3È \-v × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. +ÉÓÐÏÌØÚÏ×ÁÎÉÉ 3È -v × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. äÏÐÕÓÔÉÍÙÅ ÚÎÁÞÅÎÉÑ \fBname\fR: .RS .IP "iso-8859-1" 10 @@ -931,157 +985,157 @@ îÅ ×ÙÐÏÌÎÑÔØ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ É ÐÏÌÁÇÁÔØ, ÞÔÏ OS ÉÓÐÏÌØÚÕÅÔ ËÏÄÉÒÏ×ËÕ UTF-8. .RE -.IP "\-\-utf8-strings" 10 -.IP "\-\-no-utf8-strings" 10 +.IP "--utf8-strings" 10 +.IP "--no-utf8-strings" 10 ðÏÌÁÇÁÔØ, ÞÔÏ ÁÒÇÕÍÅÎÔÙ ÚÁÄÁÎÙ ËÁË ÓÔÒÏËÉ × ËÏÄÉÒÏ×ËÅ UTF8. ðÏ ÕÍÏÌÞÁÎÉÀ -(\-\-no-utf8-strings), ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÞÔÏ ÓÔÒÏËÉ ÚÁËÏÄÉÒÏ×ÁÎÙ × ÎÁÂÏÒÅ -ÓÉÍ×ÏÌÏ× ÏÐÒÅÄÅÌ£ÎÎÏÍ ÐÁÒÁÍÅÔÒÏÍ \-\-display-charset. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏËÁÚÙ×ÁÅÔ +(--no-utf8-strings), ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÞÔÏ ÓÔÒÏËÉ ÚÁËÏÄÉÒÏ×ÁÎÙ × ÎÁÂÏÒÅ +ÓÉÍ×ÏÌÏ× ÏÐÒÅÄÅÌ£ÎÎÏÍ ÐÁÒÁÍÅÔÒÏÍ --display-charset. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏËÁÚÙ×ÁÅÔ ×ÌÉÑÎÉÅ ÎÁ ×ÓÅ ÐÏÓÌÅÄÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ. ïÂÁ ÐÁÒÁÍÅÔÒÁ ÍÏÇÕÔ ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ÐÒÏÉÚ×ÏÌØÎÏÅ ÞÉÓÌÏ ÒÁÚ. -.IP "\-\-options \fBfile\fR" 10 +.IP "--options \fBfile\fR" 10 óÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ \fBfile\fR É ÎÅ ÐÙÔÁÔØÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÁÊÌ ÐÏ ÕÍÏÌÞÁÎÉÀ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÉÇÎÏÒÉÒÕÅÔÓÑ ÅÓÌÉ ÏÎ ÕËÁÚÁÎ × ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÏ×. -.IP "\-\-no-options" 10 -óÏËÒÁÝÅÎÉÅ ÄÌÑ "\-\-options /dev/null". äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÐÒÅÄÅÌÑÅÔÓÑ ÄÏ +.IP "--no-options" 10 +óÏËÒÁÝÅÎÉÅ ÄÌÑ "--options /dev/null". äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÐÒÅÄÅÌÑÅÔÓÑ ÄÏ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÐÁÒÁÍÅÔÒÏ×. ðÒÅÄÏÔ×ÒÁÝÁÅÔ, ÔÁËÖÅ, ÓÏÚÄÁÎÉÅ ËÁÔÁÌÏÇÁ "~./gnupg". -.IP "\-\-load-extension \fBname\fR" 10 +.IP "--load-extension \fBname\fR" 10 úÁÇÒÕÚÉÔØ ÍÏÄÕÌØ ÒÁÓÛÉÒÅÎÉÑ. åÓÌÉ \fBname\fR ÎÅ ÓÏÄÅÒÖÉÔ ËÏÓÏÊ ÞÅÒÔÙ, ÔÏ ÍÏÄÕÌØ ÉÝÅÔÓÑ × ËÁÔÁÌÏÇÅ ÚÁÄÁÎÎÏÍ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ (ÏÂÙÞÎÏ "/usr/local/lib/gnupg"). òÁÓÛÉÒÅÎÉÑ, ËÁË ÐÒÁ×ÉÌÏ, ÂÏÌØÛÅ ÎÅ ÉÓÐÏÌØÚÕÀÔÓÑ, É ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ÎÅ ÖÅÌÁÔÅÌØÎÏ. -.IP "\-\-debug \fBflags\fR" 10 +.IP "--debug \fBflags\fR" 10 õÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ. ÷ÓÅ ÆÌÁÇÉ ÏÂßÅÄÉÎÑÀÔÓÑ ÐÒÉ ÏÐÅÒÁÃÉÅÊ OR É \fBflags\fR ÍÏÖÅÔ ÂÙÔØ ÚÁÄÁÎ × ÓÔÉÌÅ C (ÎÁÐÒ., 0x0042). -.IP "\-\-debug-all" 10 +.IP "--debug-all" 10 õÓÔÁÎÏ×ÉÔØ ×ÓÅ ÉÓÐÏÌØÚÕÅÍÙÅ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ. -.IP "\-\-debug-ccid-driver" 10 +.IP "--debug-ccid-driver" 10 ÷ËÌÀÞÉÔØ ×Ù×ÏÄ ÏÔÌÁÄÏÞÎÏÊ ÉÎÆÏÒÍÁÃÉÉ CCID ÄÒÁÊ×ÅÒÁ ÄÌÑ ÓÍÁÒÔËÁÒÔ. úÁÍÅÔØÔÅ, ÞÔÏ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÄÏÓÔÕÐÅÎ ÎÅ ÎÁ ×ÓÅÈ ÓÉÓÔÅÍÁÈ. -.IP "\-\-enable-progress-filter" 10 +.IP "--enable-progress-filter" 10 ÷ËÌÀÞÁÅÔ ×Ù×ÏÄ ÉÎÆÏÒÍÁÃÉÉ Ï ÈÏÄÅ ×ÙÐÏÌÎÅÎÉÑ ÒÁÂÏÔÙ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÐÏÚ×ÏÌÑÅÔ ÏÂÏÌÏÞËÁÍ ÏÔÏÂÒÁÖÁÔØ ÉÎÄÉËÁÔÏÒ ÐÒÏÇÒÅÓÓÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ gpg ÂÏÌØÛÉÈ ÆÁÊÌÏ×. ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÁÒÁÍÅÔÒÁ ÎÅÍÎÏÇÏ ÓÎÉÖÁÅÔÓÑ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ. -.IP "\-\-status-fd \fBn\fR" 10 +.IP "--status-fd \fBn\fR" 10 ÷Ù×ÏÄÉÔØ ÓÔÒÏËÉ ÓÏÓÔÏÑÎÉÑ × ÆÁÊÌ Ó ÄÅÓËÒÉÐÔÏÒÏÍ \fBn\fR. óÍ. ÆÁÊÌ DETAILS × ÄÏËÕÍÅÎÔÁÃÉÉ. -.IP "\-\-logger-fd \fBn\fR" 10 +.IP "--logger-fd \fBn\fR" 10 ÷Ù×ÏÄÉÔØ ÖÕÒÎÁÌ × ÆÁÊÌ Ó ÄÅÓËÒÉÐÔÏÒÏÍ \fBn\fR, Á ÎÅ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ. -.IP "\-\-attribute-fd \fBn\fR" 10 +.IP "--attribute-fd \fBn\fR" 10 ÷Ù×ÏÄÉÔØ ÐÏÄÐÁËÅÔÙ ÁÔÒÉÂÕÔÏ× × ÆÁÊÌ Ó ÄÅÓËÒÉÐÔÏÒÏÍ \fBn\fR. îÁÉÂÏÌÅÅ -ÐÒÉÍÅÎÉÍÏ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÓÏ×ÍÅÓÔÎÏ Ó \-\-status-fd, Ô.Ë. ÓÏÏÂÝÅÎÉÑ +ÐÒÉÍÅÎÉÍÏ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÓÏ×ÍÅÓÔÎÏ Ó --status-fd, Ô.Ë. ÓÏÏÂÝÅÎÉÑ ÓÏÓÔÏÑÎÉÑ ÄÏÌÖÎÙ ÂÙÔØ ÏÔÄÅÌÅÎÙ ÏÔ ÒÁÚÌÉÞÎÙÈ ÐÏÄÐÁËÅÔÏ×. -.IP "\-\-sk-comments" 10 -.IP "\-\-no-sk-comments" 10 +.IP "--sk-comments" 10 +.IP "--no-sk-comments" 10 üËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁËÅÔÙ ËÏÍÍÅÎÔÁÒÉÅ× ÄÌÑ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ ÐÒÉ ÜËÓÐÏÒÔÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ. üÔÏ ÒÁÓÛÉÒÅÎÉÅ GnuPG ÓÔÁÎÄÁÒÔÁ OpenPGP. ïÔËÌÀÞÅÎÏ ÐÏ ÕÍÏÌÞÁÎÉÀ. úÁÍÅÔØÔÅ, ÞÔÏ ÜÔÏÔ ÐÁÒÁÍÅÔÒ ÎÅ ÉÍÅÅÔ ÎÉÞÅÇÏ ÏÂÝÅÇÏ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ × ÐÒÏÚÒÁÞÎÙÈ ÐÏÄÐÉÓÑÈ É ÚÁÇÏÌÏ×ËÁÈ ASCII ÆÏÒÍÁÔÁ. -\-\-no-sk-comments ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. -.IP "\-\-comment \fBstring\fR" 10 -.IP "\-\-no-comments" 10 +--no-sk-comments ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. +.IP "--comment \fBstring\fR" 10 +.IP "--no-comments" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBstring\fR × ËÁÞÅÓÔ×Å ËÏÍÍÅÎÔÁÒÉÑ × ÐÒÏÚÒÁÞÎÙÈ ÐÏÄÐÉÓÑÈ, -ASCII ÚÁËÏÄÉÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÑÈ É ËÌÀÞÁÈ (ÓÍ. \-\-armor). -ðÏ ÕÍÏÌÞÁÎÉÀ ÓÔÒÏËÁ ËÏÍÍÅÎÔÁÒÉÑ ÏÔÓÕÔÓÔ×ÕÅÔ. \-\-comment ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ -ÎÅÓËÏÌØËÏ ÒÁÚ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÎÅÓËÏÌØËÉÈ ÓÔÒÏË ËÏÍÍÅÎÔÁÒÉÅ×. \-\-no-comments +ASCII ÚÁËÏÄÉÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÑÈ É ËÌÀÞÁÈ (ÓÍ. --armor). +ðÏ ÕÍÏÌÞÁÎÉÀ ÓÔÒÏËÁ ËÏÍÍÅÎÔÁÒÉÑ ÏÔÓÕÔÓÔ×ÕÅÔ. --comment ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ +ÎÅÓËÏÌØËÏ ÒÁÚ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÎÅÓËÏÌØËÉÈ ÓÔÒÏË ËÏÍÍÅÎÔÁÒÉÅ×. --no-comments ÕÄÁÌÑÅÔ ×ÓÅ ËÏÍÍÅÎÔÁÒÉÉ. -.IP "\-\-emit-version" 10 -.IP "\-\-no-emit-version" 10 +.IP "--emit-version" 10 +.IP "--no-emit-version" 10 ðÒÉ×ÏÄÉÔ Ë ×ËÌÀÞÅÎÉÀ ÓÔÒÏËÉ ×ÅÒÓÉÉ × ×Ù×ÏÄ × ASCII ÆÏÒÍÁÔÅ. -\-\-no-emit-version ÏÔËÌÀÞÁÅÔ ÐÁÒÁÍÅÔÒ. -.IP "\-\-sig-notation \fBname=value\fR" 10 -.IP "\-\-cert-notation \fBname=value\fR" 10 -.IP "\-N, \-\-set-notation \fBname=value\fR" 10 -ðÏÍÅÓÔÉÔØ ÐÁÒÕ ÉÍÑ \- ÚÎÁÞÅÎÉÅ × ÐÏÄÐÉÓØ, ËÁË ÐÒÉÍÅÞÁÎÉÅ. +--no-emit-version ÏÔËÌÀÞÁÅÔ ÐÁÒÁÍÅÔÒ. +.IP "--sig-notation \fBname=value\fR" 10 +.IP "--cert-notation \fBname=value\fR" 10 +.IP "-N, --set-notation \fBname=value\fR" 10 +ðÏÍÅÓÔÉÔØ ÐÁÒÕ ÉÍÑ - ÚÎÁÞÅÎÉÅ × ÐÏÄÐÉÓØ, ËÁË ÐÒÉÍÅÞÁÎÉÅ. \fBname\fR ÄÏÌÖÎÏ ÓÏÄÅÒÖÁÔØ ÔÏÌØËÏ ÐÅÞÁÔÎÙÅ ÓÉÍ×ÏÌÙ ÉÌÉ ÐÒÏÂÅÌÙ, É ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÉÍ×ÏÌ '@'. üÔÏ ÄÅÌÁÅÔÓÑ Ó ÃÅÌØÀ ÐÒÅÄÏÔ×ÒÁÔÉÔØ -ÚÁÓÏÒÅÎÉÅ ÚÁÒÅÚÅÒ×ÉÒÏ×ÁÎÎÏÇÏ IETF ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍ£Î. æÌÁÇ \-\-expert +ÚÁÓÏÒÅÎÉÅ ÚÁÒÅÚÅÒ×ÉÒÏ×ÁÎÎÏÇÏ IETF ÐÒÏÓÔÒÁÎÓÔ×Á ÉÍ£Î. æÌÁÇ --expert ÏÔÍÅÎÑÅÔ ÐÒÏ×ÅÒËÕ ÎÁÌÉÞÉÑ '@'. \fBvalue\fR ÍÏÖÅÔ ÂÙÔØ ÌÀÂÏÊ ÐÅÞÁÔÎÏÊ ÓÔÒÏËÏÊ; ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÚÁËÏÄÉÒÏ×ÁÎÁ × UTF8, ÔÁË ÞÔÏ ÷ÁÍ ÓÌÅÄÕÅÔ -ÐÒÏ×ÅÒÉÔØ ËÏÒÒÅËÔÎÏÓÔØ ÕÓÔÁÎÏ×ËÉ ÐÁÒÁÍÅÔÒÁ \-\-display-charset. +ÐÒÏ×ÅÒÉÔØ ËÏÒÒÅËÔÎÏÓÔØ ÕÓÔÁÎÏ×ËÉ ÐÁÒÁÍÅÔÒÁ --display-charset. åÓÌÉ ÷Ù ÐÒÅÄ×ÁÒÉÔÅ \fBname\fR ×ÏÓËÌÉÃÁÔÅÌØÎÙÍ ÚÎÁËÏÍ (!), ÔÏ ÐÒÉÍÅÞÁÎÉÅ ÂÕÄÅÔ ÐÏÍÅÞÅÎÏ ËÁË ËÒÉÔÉÞÅÓËÏÅ (rfc2440:5.2.3.15). -\-\-sig-notation ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÉÍÅÞÁÎÉÅ ÄÌÑ ÐÏÄÐÉÓÉ ÄÁÎÎÙÈ, -\-\-cert-notation ÄÌÑ ÐÏÄÐÉÓÉ ËÌÀÞÅÊ (ÓÅÒÔÉÆÉËÁÃÉÉ), \-\-set-notation +--sig-notation ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÉÍÅÞÁÎÉÅ ÄÌÑ ÐÏÄÐÉÓÉ ÄÁÎÎÙÈ, +--cert-notation ÄÌÑ ÐÏÄÐÉÓÉ ËÌÀÞÅÊ (ÓÅÒÔÉÆÉËÁÃÉÉ), --set-notation ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÏÂÁ ÐÁÒÁÍÅÔÒÁ. .IP "" 10 éÍÅÀÔÓÑ ÓÐÅÃÉÁÌØÎÙÅ ËÏÄÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ × ÐÒÉÍÅÞÁÎÉÑÈ. "%k" ÂÕÄÅÔ ÚÁÍÅΣΠÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÐÏÄÐÉÓÙ×ÁÅÍÏÇÏ ËÌÀÞÁ, -"%K" \- ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÐÏÄÐÉÓÙ×ÁÅÍÏÇÏ ËÌÀÞÁ, -"%f" \- ÏÔÐÅÞÁÔËÏÍ ÐÏÄÐÉÓÙ×ÁÅÍÏÇÏ ËÌÀÞÁ, -"%s" \- ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, -"%S" \- ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, -"%g" \- ÏÔÐÅÞÁÔËÏÍ ËÌÀÞÁ (ÐÏÄËÌÀÞÁ) ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, -"%p" \- ÏÔÐÅÞÁÔËÏÍ ÇÌÁ×ÎÏÇÏ ËÌÀÞÁ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, -"%c" \- ÓÞ£ÔÞÉËÏÍ ÐÏÄÐÉÓÅÊ OpenPGP ÓÍÁÒÔËÁÒÔÙ, +"%K" - ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÐÏÄÐÉÓÙ×ÁÅÍÏÇÏ ËÌÀÞÁ, +"%f" - ÏÔÐÅÞÁÔËÏÍ ÐÏÄÐÉÓÙ×ÁÅÍÏÇÏ ËÌÀÞÁ, +"%s" - ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, +"%S" - ÄÌÉÎÎÙÍ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, +"%g" - ÏÔÐÅÞÁÔËÏÍ ËÌÀÞÁ (ÐÏÄËÌÀÞÁ) ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, +"%p" - ÏÔÐÅÞÁÔËÏÍ ÇÌÁ×ÎÏÇÏ ËÌÀÞÁ ËÌÀÞÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÐÏÄÐÉÓÉ, +"%c" - ÓÞ£ÔÞÉËÏÍ ÐÏÄÐÉÓÅÊ OpenPGP ÓÍÁÒÔËÁÒÔÙ, "%%" ÂÕÄÅÔ ÚÁÍÅΣΠÏÄÎÉÍ ÚÎÁËÏÍ "%". %k, %K, É %f ÉÍÅÀÔ ÓÍÙÓÌ ÔÏÌØËÏ ÐÒÉ ÐÏÄÐÉÓÉ ËÌÀÞÅÊ (ÓÅÒÔÉÆÉËÁÃÉÉ), Á %c ÔÏÌØËÏ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ OpenPGP ÓÍÁÒÔËÁÒÔÙ. -.IP "\-\-show-notation" 10 -.IP "\-\-no-show-notation" 10 -ðÏËÁÚÙ×ÁÔØ ÐÒÉÍÅÞÁÎÉÑ × ÐÏÄÐÉÓÑÈ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ \-\-list-sigs É -\-\-check-sigs É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ, ÓÏÄÅÒÖÁÝÉÈ ÐÒÉÍÅÞÁÎÉÑ. éÓÐÏÌØÚÏ×ÁÔØ +.IP "--show-notation" 10 +.IP "--no-show-notation" 10 +ðÏËÁÚÙ×ÁÔØ ÐÒÉÍÅÞÁÎÉÑ × ÐÏÄÐÉÓÑÈ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ --list-sigs É +--check-sigs É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ, ÓÏÄÅÒÖÁÝÉÈ ÐÒÉÍÅÞÁÎÉÑ. éÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. éÓÐÏÌØÚÕÊÔÅ ×ÍÅÓÔÏ ÎÅÇÏ -`\-\-list-options [no-]show-notation' É/ÉÌÉ -`\-\-verify-options [no-]show-notation'. -.IP "\-\-sig-policy-url \fBstring\fR" 10 -.IP "\-\-cert-policy-url \fBstring\fR" 10 -.IP "\-\-set-policy-url \fBstring\fR" 10 +`--list-options [no-]show-notation' É/ÉÌÉ +`--verify-options [no-]show-notation'. +.IP "--sig-policy-url \fBstring\fR" 10 +.IP "--cert-policy-url \fBstring\fR" 10 +.IP "--set-policy-url \fBstring\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBstring\fR × ËÁÞÅÓÔ×Å URL ÐÏÌÉÔÉËÉ ÄÌÑ ÐÏÄÐÉÓÅÊ (rfc2440:5.2.3.19). åÓÌÉ ÷Ù ÐÒÅÄ×ÁÒÉÔÅ ÅÇÏ ×ÏÓËÌÉÃÁÔÅÌØÎÙÍ ÚÎÁËÏÍ (!), -ÔÏ ÐÁËÅÔ Ó URL ÂÕÄÅÔ ÐÏÍÅÞÅÎ ËÁË ËÒÉÔÉÞÅÓËÉÊ. \-\-sig-policy-url -ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ URL ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ ÄÁÎÎÙÈ, \-\-cert-policy-url URL -ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ ËÌÀÞÅÊ (ÓÅÒÔÉÆÉËÁÃÉÉ), Á \-set-policy-url +ÔÏ ÐÁËÅÔ Ó URL ÂÕÄÅÔ ÐÏÍÅÞÅÎ ËÁË ËÒÉÔÉÞÅÓËÉÊ. --sig-policy-url +ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ URL ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ ÄÁÎÎÙÈ, --cert-policy-url URL +ÐÏÌÉÔÉËÉ ÐÏÄÐÉÓÉ ËÌÀÞÅÊ (ÓÅÒÔÉÆÉËÁÃÉÉ), Á -set-policy-url ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÏÂÁ ÐÁÒÁÍÅÔÒÁ. .IP "" 10 äÏÓÔÕÐÎÙ ÔÅ ÖÅ ÐÏÄÓÔÁÎÏ×ËÉ Ó '%', ÞÔÏ É ÄÌÑ ÐÒÉÍÅÞÁÎÉÊ. -.IP "\-\-show-policy-url" 10 -.IP "\-\-no-show-policy-url" 10 -ðÏËÁÚÙ×ÁÔØ URL ÐÏÌÉÔÉË ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ \-\-list-sigs É -\-\-check-sigs É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ, ÓÏÄÅÒÖÁÝÉÈ URL ÐÏÌÉÔÉË. éÓÐÏÌØÚÏ×ÁÔØ +.IP "--show-policy-url" 10 +.IP "--no-show-policy-url" 10 +ðÏËÁÚÙ×ÁÔØ URL ÐÏÌÉÔÉË ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄ --list-sigs É +--check-sigs É ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÅÊ, ÓÏÄÅÒÖÁÝÉÈ URL ÐÏÌÉÔÉË. éÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ. éÓÐÏÌØÚÕÊÔÅ ×ÍÅÓÔÏ ÎÅÇÏ -`\-\-list-options [no-]show-policy-url' É/ÉÌÉ -`\-\-verify-options [no-]show-policy-url'. -.IP "\-\-sig-keyserver-url \fBstring\fR" 10 +`--list-options [no-]show-policy-url' É/ÉÌÉ +`--verify-options [no-]show-policy-url'. +.IP "--sig-keyserver-url \fBstring\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBstring\fR × ËÁÞÅÓÔ×Å URL ÐÒÅÄÐÏÞÉÔÁÅÍÏÇÏ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ × ÐÏÄÐÉÓÑÈ ÄÁÎÎÙÈ. åÓÌÉ ÷Ù ÐÒÅÄ×ÁÒÉÔÅ ÅÇÏ ×ÏÓËÌÉÃÁÔÅÌØÎÙÍ ÚÎÁËÏÍ, ÔÏ ÐÁËÅÔ Ó URL ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ ÂÕÄÅÔ ÐÏÍÅÞÅÎ ËÁË ËÒÉÔÉÞÅÓËÉÊ. .IP "" 10 äÏÓÔÕÐÎÙ ÔÅ ÖÅ ÐÏÄÓÔÁÎÏ×ËÉ Ó '%', ÞÔÏ É ÄÌÑ ÐÒÉÍÅÞÁÎÉÊ. -.IP "\-\-set-filename \fBstring\fR" 10 +.IP "--set-filename \fBstring\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ \fBstring\fR ËÁË ÉÍÑ ÆÁÊÌÁ, ÓÏÄÅÒÖÁÝÅÇÏÓÑ × ÓÏÏÂÝÅÎÉÉ. ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÅÊÓÔ×ÉÔÅÌØÎÏÅ ÉÍÑ ÚÁÛÉÆÒÏ×Ù×ÁÅÍÏÇÏ ÆÁÊÌÁ. -.IP "\-\-for-your-eyes-only" 10 -.IP "\-\-no-for-your-eyes-only" 10 +.IP "--for-your-eyes-only" 10 +.IP "--no-for-your-eyes-only" 10 õÓÔÁÎÁ×ÌÉ×ÁÅÔ × ÓÏÏÂÝÅÎÉÉ ÆÌÁÇ `for your eyes only'. üÔÏ ÐÒÉ×ÏÄÉÔ Ë ÔÏÍÕ, ÞÔÏ GnuPG ÎÅ ÓÏÈÒÁÎÑÅÔ ÒÁÓÛÉÆÒÏ×ÁÎÎÙÊ ÆÁÊÌ ÅÓÌÉ ÎÅ ÕËÁÚÁÎ ÐÁÒÁÍÅÔÒ -\-\-output, Á PGP ÉÓÐÏÌØÚÕÅÔ "secure viewer" ÄÌÑ ×Ù×ÏÄÁ ÓÏÏÂÝÅÎÉÑ. äÁÎÎÙÊ -ÐÁÒÁÍÅÔÒ ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ \-\-set-filename. -\-\-no-for-your-eyes-only ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. -.IP "\-\-use-embedded-filename" 10 -.IP "\-\-no-use-embedded-filename" 10 +--output, Á PGP ÉÓÐÏÌØÚÕÅÔ "secure viewer" ÄÌÑ ×Ù×ÏÄÁ ÓÏÏÂÝÅÎÉÑ. äÁÎÎÙÊ +ÐÁÒÁÍÅÔÒ ÐÅÒÅËÒÙ×ÁÅÔ ÚÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ --set-filename. +--no-for-your-eyes-only ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÐÁÒÁÍÅÔÒÁ. +.IP "--use-embedded-filename" 10 +.IP "--no-use-embedded-filename" 10 ðÏÐÙÔÁÔØÓÑ ÓÏÚÄÁÔØ ÆÁÊÌ Ó ÉÍÅÎÅÍ ÕËÁÚÁÎÎÙÍ × ÄÁÎÎÙÈ. íÏÖÅÔ ÂÙÔØ ÎÅÂÅÚÏÐÁÓÎÏÊ, Ô.Ë. ÐÏÚ×ÏÌÑÅÔ ÐÅÒÅÚÁÐÉÓÙ×ÁÔØ ÆÁÊÌÙ. ðÏ ÕÍÏÌÞÁÎÉÀ ÏÔËÌÀÞÅÎÏ. -.IP "\-\-completes-needed \fBn\fR" 10 +.IP "--completes-needed \fBn\fR" 10 þÉÓÌÏ ÐÏÄÐÉÓÅÊ ÎÁ ËÌÀÞÅ, ÓÄÅÌÁÎÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ËÏÔÏÒÙÍ ÷Ù ÐÏÌÎÏÓÔØÀ ÄÏ×ÅÒÑÅÔÅ, ÎÅÏÂÈÏÄÉÍÙÈ ÄÌÑ ÐÒÉÚÎÁÎÉÑ ËÌÀÞÁ ÄÏÓÔÏ×ÅÒÎÙÍ (ÐÏ ÕÍÏÌÞÁÎÉÀ 1). -.IP "\-\-marginals-needed \fBn\fR" 10 +.IP "--marginals-needed \fBn\fR" 10 þÉÓÌÏ ÐÏÄÐÉÓÅÊ ÎÁ ËÌÀÞÅ, ÓÄÅÌÁÎÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ËÏÔÏÒÙÍ ÷Ù ÄÏ×ÅÒÑÅÔÅ ÎÅ ÐÏÌÎÏÓÔØÀ, ÎÅÏÂÈÏÄÉÍÙÈ ÄÌÑ ÐÒÉÚÎÁÎÉÑ ËÌÀÞÁ ÄÏÓÔÏ×ÅÒÎÙÍ (ÐÏ ÕÍÏÌÞÁÎÉÀ 3). -.IP "\-\-max-cert-depth \fBn\fR" 10 +.IP "--max-cert-depth \fBn\fR" 10 íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ÃÅÐÏÞËÉ ÓÅÒÔÉÆÉËÁÃÉÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ 5). -.IP "\-\-cipher-algo \fBname\fR" 10 +.IP "--cipher-algo \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ \fBname\fR. úÁÐÕÓË ÐÒÏÇÒÁÍÍÙ Ó -ËÏÍÁÎÄÏÊ \-\-version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÁÌÇÏÒÉÔÍÏ× ÛÉÆÒÏ×ÁÎÉÑ. +ËÏÍÁÎÄÏÊ --version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÁÌÇÏÒÉÔÍÏ× ÛÉÆÒÏ×ÁÎÉÑ. åÓÌÉ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ, ÔÏ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ ×ÙÂÉÒÁÅÔÓÑ ÉÚ ÕËÁÚÁÎÎÙÈ × ÓÐÉÓËÅ ÐÒÅÄÐÏÞÔÅÎÉÊ ËÌÀÞÁ. -.IP "\-\-digest-algo \fBname\fR" 10 -éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ\-ÆÕÎËÃÉÀ \fBname\fR. úÁÐÕÓË ÐÒÏÇÒÁÍÍÙ Ó -ËÏÍÁÎÄÏÊ \-\-version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÈÜÛ\-ÆÕÎËÃÉÊ. -.IP "\-\-compress-algo \fBname\fR" 10 +.IP "--digest-algo \fBname\fR" 10 +éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÆÕÎËÃÉÀ \fBname\fR. úÁÐÕÓË ÐÒÏÇÒÁÍÍÙ Ó +ËÏÍÁÎÄÏÊ --version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÈÜÛ-ÆÕÎËÃÉÊ. +.IP "--compress-algo \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ \fBname\fR. "zlib" ÄÌÑ ÁÌÇÏÒÉÔÍÁ ZLIB ÏÐÒÅÄÅÌ£ÎÎÏÇÏ × RFC1950. "zip" ÄÌÑ ÁÌÇÏÒÉÔÍÁ ZIP ÏÐÒÅÄÅÌ£ÎÎÏÇÏ × RFC-1951 É ÉÓÐÏÌØÚÕÅÍÏÇÏ PGP. "bzip2" ÂÏÌÅÅ ÓÏ×ÒÅÍÅÎÎÙÊ ÁÌÇÏÒÉÔÍ @@ -1098,27 +1152,27 @@ ÚÎÁÞÉÍÙÍ ÐÒÉ ÏÇÒÁÎÉÞÅÎÎÏÍ ÏÂߣÍÅ ÐÁÍÑÔÉ. úÁÍÅÔÉÍ, ÏÄÎÁËÏ, ÞÔÏ PGP (×ÓÅ ×ÅÒÓÉÉ) ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ZIP. éÓÐÏÌØÚÏ×ÁÎÉÅ ÁÌÇÏÒÉÔÍÏ× ÏÔÌÉÞÎÙÈ ÏÔ ZIP ÉÌÉ "none" ÄÅÌÁÅÔ ÓÏÏÂÝÅÎÉÅ ÎÅÞÉÔÁÂÅÌØÎÙÍ ÄÌÑ PGP. -.IP "\-\-cert-digest-algo \fBname\fR" 10 -éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ\-ÆÕÎËÃÉÀ \fBname\fR ÐÒÉ ÐÏÄÐÉÓÉ ËÌÀÞÁ. úÁÐÕÓË ÐÒÏÇÒÁÍÍÙ Ó -ËÏÍÁÎÄÏÊ \-\-version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÈÜÛ\-ÆÕÎËÃÉÊ. âÕÄØÔÅ +.IP "--cert-digest-algo \fBname\fR" 10 +éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÆÕÎËÃÉÀ \fBname\fR ÐÒÉ ÐÏÄÐÉÓÉ ËÌÀÞÁ. úÁÐÕÓË ÐÒÏÇÒÁÍÍÙ Ó +ËÏÍÁÎÄÏÊ --version ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÈÜÛ-ÆÕÎËÃÉÊ. âÕÄØÔÅ ÏÓÔÏÒÏÖÎÙ, Ô.Ë. ÅÓÌÉ ÷Ù ×ÙÂÅÒÅÔÅ ÁÌÇÏÒÉÔÍ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ GnuPG, ÎÏ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÄÒÕÇÉÍÉ ÒÅÁÌÉÚÁÃÉÑÍÉ OpenPGP, ÔÏ ÎÅËÏÔÏÒÙÅ ÐÏÌØÚÏ×ÁÔÅÌÉ ÎÅ ÓÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÄÅÌÁÎÎÕÀ ÷ÁÍÉ ÐÏÄÐÉÓØ, ÉÌÉ ÄÁÖÅ ×ÅÓØ ËÌÀÞ. -.IP "\-\-s2k-cipher-algo \fBname\fR" 10 +.IP "--s2k-cipher-algo \fBname\fR" 10 éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÚÁÝÉÔÙ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ \fBname\fR. ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ CAST5. äÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÉÓÐÏÌØÚÕÅÔÓÑ, ÔÁËÖÅ, ÄÌÑ ÓÉÍÍÅÔÒÉÞÎÏÇÏ ÛÉÆÒÏ×ÁÎÉÑ, × ÓÌÕÞÁÅ ÅÓÌÉ ÎÅ ÚÁÄÁÎÙ ÐÁÒÁÍÅÔÒÙ -\-\-personal-cipher-preferences É \-\-cipher-algo. -.IP "\-\-s2k-digest-algo \fBname\fR" 10 -éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ\-ÆÕÎËÃÉÀ \fBname\fR ÄÌÑ ÏÂÒÁÂÏÔËÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ +--personal-cipher-preferences É --cipher-algo. +.IP "--s2k-digest-algo \fBname\fR" 10 +éÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÆÕÎËÃÉÀ \fBname\fR ÄÌÑ ÏÂÒÁÂÏÔËÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ (ÐÁÒÏÌÑ). ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ SHA-1. -.IP "\-\-s2k-mode \fBn\fR" 10 +.IP "--s2k-mode \fBn\fR" 10 ïÐÒÅÄÅÌÑÅÔ ÍÅÔÏÄ ÏÂÒÁÂÏÔËÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ (ÐÁÒÏÌÑ). åÓÌÉ \fBn\fR ÒÁ×ÅÎ 0, ÔÏ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÏÂÒÁÂÁÔÙ×ÁÅÔÓÑ (ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ), ÅÓÌÉ 1, ÔÏ Ë ËÌÀÞÅ×ÏÊ ÆÒÁÚÅ ÄÏÂÁ×ÌÑÅÔÓÑ "ÓÏÌØ" (ÓÌÕÞÁÊÎÙÅ ÄÁÎÎÙÅ) É ÅÓÌÉ 3 (ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏ ÕÍÏÌÞÁÎÉÀ), ÔÏ ×ÅÓØ ÐÒÏÃÅÓÓ ÐÏ×ÔÏÒÑÅÔÓÑ ÎÅÓËÏÌØËÏ ÒÁÚ. åÓÌÉ ÎÅ ÚÁÄÁÎ -ÐÁÒÁÍÅÔÒ \-\-rfc1991, ÔÏ ÄÁÎÎÙÊ ÒÅÖÉÍ ÉÓÐÏÌØÚÕÅÔÓÑ É ÐÒÉ ÓÉÍÍÅÔÒÉÞÎÏÍ ÛÉÆÒÏ×ÁÎÉÉ. -.IP "\-\-simple-sk-checksum" 10 +ÐÁÒÁÍÅÔÒ --rfc1991, ÔÏ ÄÁÎÎÙÊ ÒÅÖÉÍ ÉÓÐÏÌØÚÕÅÔÓÑ É ÐÒÉ ÓÉÍÍÅÔÒÉÞÎÏÍ ÛÉÆÒÏ×ÁÎÉÉ. +.IP "--simple-sk-checksum" 10 ãÅÌÏÓÔÎÏÓÔØ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ ÚÁÝÉÝÁÅÔÓÑ ÐÒÉ ÐÏÍÏÝÉ ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÙ SHA-1. äÁÎÎÙÊ ÍÅÔÏÄ Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ÒÁÓÛÉÒÅÎÎÏÊ ÓÐÅÃÉÆÉËÁÃÉÉ OpenPGP, ÎÏ GnuPG ÕÖÅ ÉÓÐÏÌØÚÕÅÔ ÅÇÏ × ËÁÞÅÓÔ×Å ËÏÎÔÒÍÅÒÙ ÐÒÏÔÉ× @@ -1126,24 +1180,24 @@ ÐÁÒÁÍÅÔÒ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÐÅÒÅÄÁÞÉ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ ÔÁËÉÍ ÐÒÉÌÏÖÅÎÉÑÍ. éÓÐÏÌØÚÏ×ÁÎÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ÒÉÓËÏ×ÁÎÏ Ó ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ. úÁÍÅÔØÔÅ, ÞÔÏ ÐÁÒÁÍÅÔÒ ÏËÁÚÙ×ÁÅÔ ÜÆÆÅËÔ ÔÏÌØËÏ ÐÒÉ -ÛÉÆÒÏ×ÁÎÉÉ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÐÒÏÓÔÅÊÛÉÊ ÓÐÏÓÏ ÄÏÂÉÔØÓÑ ÜÔÏÇÏ \- ÓÍÅÎÉÔØ +ÛÉÆÒÏ×ÁÎÉÉ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ, ÐÒÏÓÔÅÊÛÉÊ ÓÐÏÓÏ ÄÏÂÉÔØÓÑ ÜÔÏÇÏ - ÓÍÅÎÉÔØ ÐÁÒÏÌØ ÎÁ ËÌÀÞÅ (ÐÕÓÔØ ÄÁÖÅ ÎÁ ÔÏÔ ÖÅ ÓÁÍÙÊ). -.IP "\-\-disable-cipher-algo \fBname\fR" 10 +.IP "--disable-cipher-algo \fBname\fR" 10 îÉËÏÇÄÁ ÎÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ \fBname\fR. úÁÄÁÎÎÏÅ ÉÍÑ ÎÅ ÐÒÏ×ÅÒÑÅÔÓÑ, ÐÏÜÔÏÍÕ ÁÌÇÏÒÉÔÍ ÚÁÇÒÕÖÅÎÎÙÊ ÐÏÚÖÅ ÏÓÔÁÎÅÔÓÑ ÏÔËÌÀÞÅÎÎÙÍ. -.IP "\-\-disable-pubkey-algo \fBname\fR" 10 +.IP "--disable-pubkey-algo \fBname\fR" 10 îÉËÏÇÄÁ ÎÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ \fBname\fR. úÁÄÁÎÎÏÅ ÉÍÑ ÎÅ ÐÒÏ×ÅÒÑÅÔÓÑ, ÐÏÜÔÏÍÕ ÁÌÇÏÒÉÔÍ ÚÁÇÒÕÖÅÎÎÙÊ ÐÏÚÖÅ ÏÓÔÁÎÅÔÓÑ ÏÔËÌÀÞÅÎÎÙÍ. -.IP "\-\-no-sig-cache" 10 +.IP "--no-sig-cache" 10 îÅ ËÜÛÉÒÏ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ ÐÒÏ×ÅÒËÉ ÐÏÄÐÉÓÅÊ. ëÜÛÉÒÏ×ÁÎÉÅ ÚÎÁÞÉÔÅÌØÎÏ Õ×ÅÌÉÞÉ×ÁÅÔ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ ÐÒÉ ×Ù×ÏÄÅ ÓÐÉÓËÁ ËÌÀÞÅÊ. ïÄÎÁËÏ, ÅÓÌÉ ÷Ù ÓÏÍÎÅ×ÁÅÔÅÓØ × ÚÁÝÉÝÅÎÎÏÓÔÉ ÷ÁÛÅÇÏ ÎÁÂÏÒÁ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÏÔ ÉÚÍÅÎÅÎÉÊ, ÔÏ ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÄÌÑ ÏÔËÌÀÞÅÎÉÑ ËÜÛÉÒÏ×ÁÎÉÑ. ÷ÅÒÏÑÔÎÏ ÄÁÎÎÁÑ ÏÐÅÒÁÃÉÑ ÌÉÛÅÎÁ ÏÓÏÂÏÇÏ ÓÍÙÓÌÁ, -ÐÏÓËÏÌØËÕ ÅÓÌÉ ËÔÏ\-ÌÉÂÏ ÉÍÅÅÔ ÄÏÓÔÕÐ ÎÁ ÚÁÐÉÓØ × ÷ÁÛ ÎÁÂÏÒ ÏÔËÒÙÔÙÈ +ÐÏÓËÏÌØËÕ ÅÓÌÉ ËÔÏ-ÌÉÂÏ ÉÍÅÅÔ ÄÏÓÔÕÐ ÎÁ ÚÁÐÉÓØ × ÷ÁÛ ÎÁÂÏÒ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ, ÔÏ ÏÎ ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÌÀÂÙÅ ×ÉÄÙ ÐÏ×ÒÅÖÄÅÎÉÊ. -.IP "\-\-no-sig-create-check" 10 +.IP "--no-sig-create-check" 10 GnuPG, ËÁË ÐÒÁ×ÉÌÏ, ÐÒÏ×ÅÒÑÅÔ ËÁÖÄÕÀ ÐÏÄÐÉÓØ ÐÏÓÌŠţ ÓÏÚÄÁÎÉÑ ÄÌÑ ÚÁÝÉÔÙ ÏÔ ÏÛÉÂÏË É ÓÂÏÅ× ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÐÒÉ×ÅÓÔÉ Ë ÉÚÍÅÎÅÎÉÀ ÂÉÔÏ× ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ. üÔÁ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÐÒÏ×ÅÒËÁ ÚÁÎÉÍÁÅÔ @@ -1151,21 +1205,21 @@ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÏÔËÌÀÞÅÎÉÑ ÐÒÏ×ÅÒËÉ. ïÄÎÁËÏ, ÐÏÓËÏÌØËÕ ÓÏÚÄÁÎÉÅ ÐÏÄÐÉÓÉ ÐÒÏÉÓÈÏÄÉÔ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ, ×ÙÉÇÒÙÛ ×ÒÅÍÅÎÉ ÏÔ ÕÓÔÁÎÏ×ËÉ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ÂÕÄÅÔ ÎÅÚÁÍÅÔÅÎ × ÂÏÌØÛÉÎÓÔ×Å ËÏÎÆÉÇÕÒÁÃÉÊ. -.IP "\-\-auto-check-trustdb" 10 -.IP "\-\-no-auto-check-trustdb" 10 +.IP "--auto-check-trustdb" 10 +.IP "--no-auto-check-trustdb" 10 åÓÌÉ GnuPG ÐÏÌÁÇÁÅÔ, ÞÔÏ ÉÎÆÏÒÍÁÃÉÑ × ÓÅÔÉ ÄÏ×ÅÒÉÑ ÄÏÌÖÎÁ ÂÙÔØ -ÏÂÎÏ×ÌÅÎÁ, ÔÏ ÏÎ Á×ÔÏÍÁÔÉÞÅÓËÉ ×ÙÐÏÌÎÑÅÔ ËÏÍÁÎÄÕ \-\-check-trustdb. +ÏÂÎÏ×ÌÅÎÁ, ÔÏ ÏÎ Á×ÔÏÍÁÔÉÞÅÓËÉ ×ÙÐÏÌÎÑÅÔ ËÏÍÁÎÄÕ --check-trustdb. ðÒÏÃÅÓÓ ÏÂÎÏ×ÌÅÎÉÑ ÍÏÖÅÔ ÚÁÎÉÍÁÔØ ÎÅËÏÔÏÒÏÅ ×ÒÅÍÑ. -\-\-no-auto-check-trustdb ÏÔËÌÀÞÁÅÔ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÒÏ×ÅÒËÕ. -.IP "\-\-throw-keyids" 10 -.IP "\-\-no-throw-keyids" 10 +--no-auto-check-trustdb ÏÔËÌÀÞÁÅÔ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÒÏ×ÅÒËÕ. +.IP "--throw-keyids" 10 +.IP "--no-throw-keyids" 10 îÅ ÐÏÍÅÝÁÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ × ÚÁÛÉÆÒÏ×ÁÎÎÙÊ ÐÁËÅÔ. äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÓËÒÙ×ÁÅÔ ÐÏÌÕÞÁÔÅÌÑ ÓÏÏÂÝÅÎÉÑ É Ñ×ÌÑÅÔÓÑ ËÏÎÔÒÍÅÒÏÊ ÐÒÏÔÉ× ÁÎÁÌÉÚÁ ÔÒÁÆÆÉËÁ. òÁÓÛÉÆÒÏ×ËÁ ÓÏÏÂÝÅÎÉÑ ÍÏÖÅÔ ÐÒÏÉÓÈÏÄÉÔØ ÍÅÄÌÅÎÎÅÅ, ÐÏÓËÏÌØËÕ GnuPG ÂÕÄÅÔ ÐÙÔÁÔØÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÅ ÄÏÓÔÕÐÎÙÅ ÓÅËÒÅÔÎÙÅ ËÌÀÞÉ ÄÏ -ÎÁÈÏÖÄÅÎÉÑ ÐÒÁ×ÉÌØÎÏÇÏ. \-\-no-throw-keyids ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÄÁÎÎÏÇÏ +ÎÁÈÏÖÄÅÎÉÑ ÐÒÁ×ÉÌØÎÏÇÏ. --no-throw-keyids ÏÔÍÅÎÑÅÔ ÄÅÊÓÔ×ÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ. -.IP "\-\-not-dash-escaped" 10 +.IP "--not-dash-escaped" 10 äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÉÚÍÅÎÑÅÔ ÐÒÁ×ÉÌÁ ÓÏÚÄÁÎÉÑ ÐÒÏÚÒÁÞÎÙÈ ÐÏÄÐÉÓÅÊ ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÞÔÏ ÏÎÉ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÐÁÔÞÅÊ. ÷Ù ÎÅ ÄÏÌÖÎÙ ÐÏÓÙÌÁÔØ ÔÁËÉÅ ÆÁÊÌÙ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÏÊ, Ô.Ë. ÐÒÉ ÐÏÄÐÉÓÉ ÕÞÉÔÙ×ÁÀÔÓÑ ×ÓÅ @@ -1173,36 +1227,36 @@ ÐÁÒÁÍÅÔÒ ÄÌÑ ÄÁÎÎÙÈ ÓÏÄÅÒÖÁÝÉÈ ÓÔÒÏËÉ ÎÁÞÉÎÁÀÝÉÅÓÑ Ó ÐÑÔÉ ÄÅÆÉÓÏ×. ÷ ÎÁÞÁÌÏ ÐÏÄÐÉÓÉ ÄÏÂÁ×ÌÑÅÔÓÑ ÓÐÅÃÉÁÌØÎÙÊ ÚÁÇÏÌÏ×ÏË, ÕËÁÚÙ×ÁÀÝÉÊ GnuPG ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÄÁÎÎÏÇÏ ÐÁÒÁÍÅÔÒÁ. -.IP "\-\-escape-from-lines" 10 -.IP "\-\-no-escape-from-lines" 10 +.IP "--escape-from-lines" 10 +.IP "--no-escape-from-lines" 10 ðÏÓËÏÌØËÕ ÍÎÏÇÉÅ ÐÏÞÔÏ×ÙÅ ÁÇÅÎÔÙ ÍÅÎÑÀÔ "From " × ÎÁÞÁÌÅ ÓÔÒÏË ÎÁ "" 10 @@ -1571,7 +1625,7 @@ úÁÍÅÔÉÍ, ÞÔÏ ÷Ù ÍÏÖÅÔÅ ÄÏÂÁ×ÉÔØ ×ÏÓËÌÉÃÁÔÅÌØÎÙÊ ÚÎÁË (!) Ë ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ËÌÀÞÁ ÉÌÉ ÏÔÐÅÞÁÔËÕ. üÔÏ ÆÌÁÇ, ËÏÔÏÒÙÊ ÕËÁÚÙ×ÁÅÔ GnuPG, ÞÔÏ ÓÌÅÄÕÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÍÅÎÎÏ ÜÔÏÔ ÐÅÒ×ÉÞÎÙÊ ÉÌÉ ×ÔÏÒÉÞÎÙÊ ËÌÀÞ É ÎÅ ÐÙÔÁÔØÓÑ -ÉÓÐÏÌØÚÏ×ÁÔØ ËÁËÏÊ\-ÌÉÂÏ ÄÒÕÇÏÊ ÐÅÒ×ÉÞÎÙÊ ÉÌÉ ×ÔÏÒÉÞÎÙÊ ËÌÀÞ. +ÉÓÐÏÌØÚÏ×ÁÔØ ËÁËÏÊ-ÌÉÂÏ ÄÒÕÇÏÊ ÐÅÒ×ÉÞÎÙÊ ÉÌÉ ×ÔÏÒÉÞÎÙÊ ËÌÀÞ. .SH "÷ïú÷òáýáåíïå úîáþåîéå" .PP @@ -1580,21 +1634,21 @@ ÓÌÕÞÁÅ ÆÁÔÁÌØÎÏÊ ÏÛÉÂËÉ. .SH "ðòéíåòù" -.IP "gpg \-se \-r \fBBob\fR \fBfile\fR" 10 +.IP "gpg -se -r \fBBob\fR \fBfile\fR" 10 ÐÏÄÐÉÓÁÔØ É ÚÁÛÉÆÒÏ×ÁÔØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ Bob -.IP "gpg \-\-clearsign \fBfile\fR" 10 +.IP "gpg --clearsign \fBfile\fR" 10 ÓÏÚÄÁÔØ ÐÒÏÚÒÁÞÎÕÀ ÐÏÄÐÉÓØ -.IP "gpg \-sb \fBfile\fR" 10 +.IP "gpg -sb \fBfile\fR" 10 ÓÏÚÄÁÔØ ÏÔÄÅÌ£ÎÎÕÀ ÐÏÄÐÉÓØ -.IP "gpg \-\-list-keys \fBuser_ID\fR" 10 +.IP "gpg --list-keys \fBuser_ID\fR" 10 ÐÏËÁÚÁÔØ ËÌÀÞ -.IP "gpg \-\-fingerprint \fBuser_ID\fR" 10 +.IP "gpg --fingerprint \fBuser_ID\fR" 10 ÐÏËÁÚÁÔØ ÏÔÐÅÞÁÔÏË ËÌÀÞÁ -.IP "gpg \-\-verify \fBpgpfile\fR" 10 -.IP "gpg \-\-verify \fBsigfile\fR [\fBfiles\fR]" 10 +.IP "gpg --verify \fBpgpfile\fR" 10 +.IP "gpg --verify \fBsigfile\fR [\fBfiles\fR]" 10 ðÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ÆÁÊÌÅ, ÎÏ ÎÅ ×Ù×ÏÄÉÔØ ÅÇÏ ÓÏÄÅÒÖÉÍÏÅ. ÷ÔÏÒÁÑ ÆÏÒÍÁ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÏÔÄÅÌ£ÎÎÙÈ ÐÏÄÐÉÓÅÊ, ÇÄÅ \fBsigfile\fR -\-\-- ÏÔÄÅÌ£ÎÎÁÑ ÐÏÄÐÉÓØ (Ä×ÏÉÞÎÁÑ ÉÌÉ × ASCII ÆÏÒÍÁÔÅ), Á [\fBfiles\fR] ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ; ÅÓÌÉ ÉÍÑ ÆÁÊÌÁ ÎÅ ÚÁÄÁÎÏ, ÔÏ ÏÎÏ ÏÂÒÁÚÕÅÔÓÑ +--- ÏÔÄÅÌ£ÎÎÁÑ ÐÏÄÐÉÓØ (Ä×ÏÉÞÎÁÑ ÉÌÉ × ASCII ÆÏÒÍÁÔÅ), Á [\fBfiles\fR] ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ; ÅÓÌÉ ÉÍÑ ÆÁÊÌÁ ÎÅ ÚÁÄÁÎÏ, ÔÏ ÏÎÏ ÏÂÒÁÚÕÅÔÓÑ ÕÄÁÌÅÎÉÅÍ ÒÁÓÛÉÒÅÎÉÑ (".sig" ÉÌÉ ".asc") Õ ÉÍÅÎÉ \fBsigfile\fR ÉÌÉ ÚÁÐÒÁÛÉ×ÁÅÔÓÑ Õ ÐÏÌØÚÏ×ÁÔÅÌÑ. .SH "ðåòåíåîîùå ïëòõöåîéñ" @@ -1604,16 +1658,16 @@ ëÁÔÁÌÏÇ, ÚÁÍÅÎÑÀÝÉÊ "~/.gnupg". .IP "GPG_AGENT_INFO" 10 éÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÍÅÓÔÏÐÏÌÏÖÅÎÉÑ gpg-agent; -ÉÓÐÏÌØÚÕÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ \-\-use-agent. úÎÁÞÅÎÉÅ -ÓÏÓÔÏÉÔ ÉÚ 3 ÐÏÌÅÊ, ÒÁÚÄÅÌ£ÎÎÙÈ Ä×ÏÅÔÏÞÉÑÍÉ. ðÅÒ×ÏÅ \-\- ÐÕÔØ Ë ÄÏÍÅÎÎÏÍÕ -ÓÏËÅÔÕ UNIX, ×ÔÏÒÏÅ \-\- ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÒÏÃÅÓÓÁ gpg-agent, É ÔÒÅÔØÅ \-\- +ÉÓÐÏÌØÚÕÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ --use-agent. úÎÁÞÅÎÉÅ +ÓÏÓÔÏÉÔ ÉÚ 3 ÐÏÌÅÊ, ÒÁÚÄÅÌ£ÎÎÙÈ Ä×ÏÅÔÏÞÉÑÍÉ. ðÅÒ×ÏÅ -- ÐÕÔØ Ë ÄÏÍÅÎÎÏÍÕ +ÓÏËÅÔÕ UNIX, ×ÔÏÒÏÅ -- ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÒÏÃÅÓÓÁ gpg-agent, É ÔÒÅÔØÅ -- ×ÅÒÓÉÑ ÐÒÏÔÏËÏÌÁ, ËÏÔÏÒÁÑ ÄÏÌÖÎÁ ÂÙÔØ ÒÁ×ÎÁ 1. ðÒÉ ÚÁÐÕÓËÅ gpg-agent, ËÁË ÏÐÉÓÁÎÏ × ÄÏËÕÍÅÎÔÁÃÉÉ, ÄÁÎÎÏÊ ÐÅÒÅÍÅÎÎÏÊ ÐÒÉÓ×ÁÉ×ÁÅÔÓÑ ËÏÒÒÅËÔÎÏÅ -ÚÎÁÞÅÎÉÅ. ðÁÒÁÍÅÔÒ \-\-gpg-agent-info ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÐÅÒÅËÒÙÔÉÑ +ÚÎÁÞÅÎÉÅ. ðÁÒÁÍÅÔÒ --gpg-agent-info ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÐÅÒÅËÒÙÔÉÑ ÚÎÁÞÅÎÉÑ ÄÁÎÎÏÊ ÐÅÒÅÍÅÎÎÏÊ. .IP "http_proxy" 10 éÓÐÏÌØÚÕÅÔÓÑ ÔÏÌØËÏ ÅÓÌÉ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ ÓÅÒ×ÅÒÁ ËÌÀÞÅÊ -\-\-honor-http-proxy. +--honor-http-proxy. .IP "COLUMNS" 10 .IP "LINES" 10 éÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÒÁÚÍÅÒÁ ÎÅËÏÔÏÒÙÈ ÄÉÓÐÌÅÅ×. @@ -1660,10 +1714,10 @@ .PP GnuPG ÓÔÒÅÍÉÔÓÑ ÂÙÔØ ÏÞÅÎØ ÇÉÂËÏÊ ÒÅÁÌÉÚÁÃÉÅÊ ÓÔÁÎÄÁÒÔÁ OpenPGP. ÷ ÞÁÓÔÎÏÓÔÉ, GnuPG ÒÅÁÌÉÚÕÅÔ ÍÎÏÖÅÓÔ×Ï ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÞÁÓÔÅÊ ÓÔÁÎÄÁÒÔÁ, -ÔÁËÉÈ ËÁË ÈÜÛ\-ÆÕÎËÃÉÑ SHA-512 É ÁÌÇÏÒÉÔÍÙ ÓÖÁÔÉÑ ZLIB É BZIP2. ÷ÁÖÎÏ ÐÏÍÎÉÔØ, +ÔÁËÉÈ ËÁË ÈÜÛ-ÆÕÎËÃÉÑ SHA-512 É ÁÌÇÏÒÉÔÍÙ ÓÖÁÔÉÑ ZLIB É BZIP2. ÷ÁÖÎÏ ÐÏÍÎÉÔØ, ÞÔÏ ÎÅ ×ÓÅ ÐÒÏÇÒÁÍÍÙ OpenPGP ÒÅÁÌÉÚÕÀÔ ÜÔÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÁÌÇÏÒÉÔÍÙ, É ÞÔÏ ÐÒÉÎÕÄÉÔÅÌØÎÁÑ ÕÓÔÁÎÏ×ËÁ ÜÔÉÈ ÁÌÇÏÒÉÔÍÏ× ÐÒÉ ÐÏÍÏÝÉ ÐÁÒÁÍÅÔÒÏ× -\-\-cipher-algo, \-\-digest-algo, \-\-cert-digest-algo ÉÌÉ \-\-compress-algo × +--cipher-algo, --digest-algo, --cert-digest-algo ÉÌÉ --compress-algo × GnuPG ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÔÏÍÕ, ÞÔÏ ÓÏÚÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ, ÂÕÄÕÞÉ ÐÏÌÎÏÓÔØÀ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÓÔÁÎÄÁÒÔÕ OpenPGP, ÎÅ ÓÍÏÖÅÔ ÂÙÔØ ÐÒÏÞÉÔÁÎÏ ÐÏÌÕÞÁÔÅÌÅÍ, ÉÓÐÏÌØÚÕÀÝÉÍ ÄÒÕÇÕÀ ÒÅÁÌÉÚÁÃÉÀ OpenPGP. @@ -1680,10 +1734,10 @@ ËÏÇÄÁ ÚÎÁÅÔÅ, ÞÔÏ ÄÅÌÁÅÔÅ. .PP åÓÌÉ ÷ÁÍ ÁÂÓÏÌÀÔÎÏ ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÚÁÐÉÓÁÔØ ÂÅÚÏÐÁÓÎÙÅ ÕÓÔÁÎÏ×ËÉ, -ÐÒÉÎÑÔÙÅ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÉÌÉ ÐÒÅÄÐÏÞÔÅÎÉÑ ÎÁ ÄÁÎÎÏÍ ËÌÀÞÅ ÐÏ ËÁËÉÍ\-ÔÏ -ÐÒÉÞÉÎÁÍ ÎÅ×ÅÒÎÙ, ÔÏ ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ \-\-pgp6, -\-\-pgp7 ÉÌÉ \-\-pgp8. üÔÉ ÐÁÒÁÍÅÔÒÙ ÂÅÚÏÐÁÓÎÙ, Ô.Ë. ÏÎÉ ÎÅ ÐÒÉ×ÏÄÑÔ Ë -ÉÓÐÏÌØÚÏ×ÁÎÉÀ ËÁËÏÇÏ\-ÌÉÂÏ ËÏÎËÒÅÔÎÏÇÏ ÁÌÇÏÒÉÔÍÁ × ÎÁÒÕÛÅÎÉÅ OpenPGP, Á +ÐÒÉÎÑÔÙÅ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÉÌÉ ÐÒÅÄÐÏÞÔÅÎÉÑ ÎÁ ÄÁÎÎÏÍ ËÌÀÞÅ ÐÏ ËÁËÉÍ-ÔÏ +ÐÒÉÞÉÎÁÍ ÎÅ×ÅÒÎÙ, ÔÏ ÌÕÞÛÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ --pgp6, +--pgp7 ÉÌÉ --pgp8. üÔÉ ÐÁÒÁÍÅÔÒÙ ÂÅÚÏÐÁÓÎÙ, Ô.Ë. ÏÎÉ ÎÅ ÐÒÉ×ÏÄÑÔ Ë +ÉÓÐÏÌØÚÏ×ÁÎÉÀ ËÁËÏÇÏ-ÌÉÂÏ ËÏÎËÒÅÔÎÏÇÏ ÁÌÇÏÒÉÔÍÁ × ÎÁÒÕÛÅÎÉÅ OpenPGP, Á ÔÏÌØËÏ ÕÍÅÎØÛÁÀÔ ËÏÌÉÞÅÓÔ×Ï ÄÏÐÕÓÔÉÍÙÈ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÁÌÇÏÒÉÔÍÏ×. .SH "ïûéâëé" .PP @@ -1699,4 +1753,4 @@ .SH "ðåòå÷ïä" .PP ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË: ðÁ×ÅÌ ûÁÊÄÏ . -.\" created by instant / docbook-to-man, Tue 23 Oct 2007, 12:42 +.\" created by instant / docbook-to-man, Thu 11 Dec 2008, 17:41 diff -Nru gnupg-1.4.9/doc/gpg.texi gnupg-1.4.10/doc/gpg.texi --- gnupg-1.4.9/doc/gpg.texi 2007-12-12 18:38:21.000000000 +0000 +++ gnupg-1.4.10/doc/gpg.texi 2009-09-02 13:31:17.000000000 +0100 @@ -1,5 +1,5 @@ -@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -@c 2007 Free Software Foundation, Inc. +@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +@c 2008, 2009 Free Software Foundation, Inc. @c This is part of the GnuPG manual. @c For copying conditions, see the file gnupg.texi. @@ -149,7 +149,7 @@ @itemx -h @opindex help Print a usage message summarizing the most useful command line options. -Not that you cannot abbreviate this command. +Note that you cannot abbreviate this command. @item --warranty @opindex warranty @@ -175,18 +175,23 @@ @itemx -s @opindex sign Make a signature. This command may be combined with @option{--encrypt} -(for a signed and encrypted message), @option{--symmetric} (for a signed -and symmetrically encrypted message), or @option{--encrypt} and +(for a signed and encrypted message), @option{--symmetric} (for a +signed and symmetrically encrypted message), or @option{--encrypt} and @option{--symmetric} together (for a signed message that may be -decrypted via a secret key or a passphrase). +decrypted via a secret key or a passphrase). The key to be used for +signing is chosen by default or can be set with the +@option{--local-user} and @option{--default-key} options. @item --clearsign @opindex clearsign -Make a clear text signature. The content in a clear text signature is -readable without any special software. OpenPGP software is only -needed to verify the signature. Clear text signatures may modify -end-of-line whitespace for platform independence and are not intended -to be reversible. +Make a clear text signature. The content in a clear text signature is +readable without any special software. OpenPGP software is only needed +to verify the signature. Clear text signatures may modify end-of-line +whitespace for platform independence and are not intended to be +reversible. The key to be used for signing is chosen by default or +can be set with the @option{--local-user} and @option{--default-key} +options. + @item --detach-sign @itemx -b @@ -221,8 +226,8 @@ @item --decrypt @itemx -d @opindex decrypt -Decrypt the file given on the command line (or @code{stdin} if no file -is specified) and write it to stdout (or the file specified with +Decrypt the file given on the command line (or STDIN if no file +is specified) and write it to STDOUT (or the file specified with @option{--output}). If the decrypted file is signed, the signature is also verified. This command differs from the default operation, as it never writes to the filename which is included in the file and it rejects @@ -232,19 +237,19 @@ @opindex verify Assume that the first argument is a signed file or a detached signature and verify it without generating any output. With no arguments, the -signature packet is read from stdin. If only a sigfile is given, it may +signature packet is read from STDIN. If only a sigfile is given, it may be a complete signature or a detached signature, in which case the signed stuff is expected in a file without the ".sig" or ".asc" extension. With more than 1 argument, the first should be a detached signature and the remaining files are the signed stuff. To read the -signed stuff from stdin, use @samp{-} as the second filename. For +signed stuff from STDIN, use @samp{-} as the second filename. For security reasons a detached signature cannot read the signed material -from stdin without denoting it in the above way. +from STDIN without denoting it in the above way. @item --multifile @opindex multifile This modifies certain other commands to accept multiple files for -processing on the command line or read from stdin with each filename on +processing on the command line or read from STDIN with each filename on a separate line. This allows for many files to be processed at once. @option{--multifile} may currently be used along with @option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that @@ -291,6 +296,10 @@ @item --list-sigs @opindex list-sigs Same as @option{--list-keys}, but the signatures are listed too. +@ifclear gpgone +This command has the same effect as +using @option{--list-keys} with @option{--with-sig-list}. +@end ifclear For each signature listed, there are several flags in between the "sig" tag and keyid. These flags give additional information about each @@ -307,15 +316,31 @@ @item --check-sigs @opindex check-sigs -Same as @option{--list-sigs}, but the signatures are verified. +Same as @option{--list-sigs}, but the signatures are verified. Note +that for performance reasons the revocation status of a signing key is +not shown. +@ifclear gpgone +This command has the same effect as +using @option{--list-keys} with @option{--with-sig-check}. +@end ifclear The status of the verification is indicated by a flag directly following the "sig" tag (and thus before the flags described above for @option{--list-sigs}). A "!" indicates that the signature has been successfully verified, a "-" denotes a bad signature and a "%" is used -if an error occured while checking the signature (e.g. a non supported +if an error occurred while checking the signature (e.g. a non supported algorithm). +@ifclear gpgone +@item --locate-keys +@opindex locate-keys +Locate the keys given as arguments. This command basically uses the +same algorithm as used when locating keys for encryption or signing and +may thus be used to see what keys @command{@gpgname} might use. In +particular external methods as defined by @option{--auto-key-locate} may +be used to locate a key. Only public keys are listed. +@end ifclear + @item --fingerprint @opindex fingerprint @@ -369,7 +394,7 @@ @opindex export Either export all keys from all keyrings (default keyrings and those registered via option @option{--keyring}), or if at least one name is given, -those of the given name. The new keyring is written to stdout or to the +those of the given name. The new keyring is written to STDOUT or to the file given with option @option{--output}. Use together with @option{--armor} to mail those keys. @@ -379,7 +404,7 @@ Fingerprints may be used instead of key IDs. Option @option{--keyserver} must be used to give the name of this keyserver. Don't send your complete keyring to a keyserver --- select only those keys which are new -or changed by you. +or changed by you. If no key IDs are given, @command{gpg} does nothing. @item --export-secret-keys @itemx --export-secret-subkeys @@ -400,7 +425,7 @@ keyring. The fast version is currently just a synonym. There are a few other options which control how this command works. -Most notable here is the @option{--keyserver-options merge-only} option +Most notable here is the @option{--import-options merge-only} option which does not insert new keys but does only the merging of new signatures, user-IDs and subkeys. @@ -460,16 +485,34 @@ a check is needed. To force a run even in batch mode add the option @option{--yes}. +@anchor{option --export-ownertrust} @item --export-ownertrust @opindex export-ownertrust -Send the ownertrust values to stdout. This is useful for backup purposes +Send the ownertrust values to STDOUT. This is useful for backup purposes as these values are the only ones which can't be re-created from a -corrupted trust DB. +corrupted trustdb. Example: +@c man:.RS +@example + @gpgname{} --export-ownertrust > otrust.txt +@end example +@c man:.RE + @item --import-ownertrust @opindex import-ownertrust Update the trustdb with the ownertrust values stored in @code{files} (or -stdin if not given); existing values will be overwritten. +STDIN if not given); existing values will be overwritten. In case of a +severely damaged trustdb and if you have a recent backup of the +ownertrust values (e.g. in the file @file{otrust.txt}, you may re-create +the trustdb using these commands: +@c man:.RS +@example + cd ~/.gnupg + rm trustdb.gpg + @gpgname{} --import-ownertrust < otrust.txt +@end example +@c man:.RE + @item --rebuild-keydb-caches @opindex rebuild-keydb-caches @@ -480,7 +523,7 @@ @item --print-md @code{algo} @itemx --print-mds @opindex print-md -Print message digest of algorithm ALGO for all given files or stdin. +Print message digest of algorithm ALGO for all given files or STDIN. With the second form (or a deprecated "*" as algo) digests for all available algorithms are printed. @@ -546,6 +589,16 @@ @c ******** Begin Edit-key Options ********** @table @asis +@item uid @code{n} +@opindex keyedit:uid +Toggle selection of user ID or photographic user ID with index @code{n}. +Use 0 to deselect all. + +@item key @code{n} +@opindex keyedit:key +Toggle selection of subkey with index @code{n}. +Use 0 to deselect all. + @item sign @opindex keyedit:sign Make a signature on key of user @code{name} If the key is not yet @@ -582,51 +635,108 @@ @table @asis +@item delsig +@opindex keyedit:delsig +Delete a signature. Note that it is not possible to retract a signature, +once it has been send to the public (i.e. to a keyserver). In that case +you better use @code{revsig}. + @item revsig @opindex keyedit:revsig Revoke a signature. For every signature which has been generated by one of the secret keys, GnuPG asks whether a revocation certificate should be generated. -@item trust -@opindex keyedit:trust -Change the owner trust value. This updates the -trust-db immediately and no save is required. - -@item disable -@itemx enable -@opindex keyedit:disable -@opindex keyedit:enable -Disable or enable an entire key. A disabled key can not normally be -used for encryption. +@item check +@opindex keyedit:check +Check the signatures on all selected user IDs. @item adduid @opindex keyedit:adduid -Create an alternate user id. +Create an additional user ID. @item addphoto @opindex keyedit:addphoto -Create a photographic user id. This will prompt for a JPEG file that +Create a photographic user ID. This will prompt for a JPEG file that will be embedded into the user ID. Note that a very large JPEG will make for a very large key. Also note that some programs will display your JPEG unchanged (GnuPG), and some programs will scale it to fit in a dialog box (PGP). +@item showphoto +@opindex keyedit:showphoto +Display the selected photographic user ID. + @item deluid @opindex keyedit:deluid -Delete a user id. Note that it is not possible to retract a user id, -once it has been send to the public (i.e. to a keyserver). In that case -you better use @code{revuid}. - -@item delsig -@opindex keyedit:delsig -Delete a signature. Note that it is not possible to retract a signature, -once it has been send to the public (i.e. to a keyserver). In that case -you better use @code{revsig}. +Delete a user ID or photographic user ID. Note that it is not +possible to retract a user id, once it has been send to the public +(i.e. to a keyserver). In that case you better use @code{revuid}. @item revuid @opindex keyedit:revuid -Revoke a user id. +Revoke a user ID or photographic user ID. + +@item primary +@opindex keyedit:primary +Flag the current user id as the primary one, removes the primary user +id flag from all other user ids and sets the timestamp of all affected +self-signatures one second ahead. Note that setting a photo user ID +as primary makes it primary over other photo user IDs, and setting a +regular user ID as primary makes it primary over other regular user +IDs. + +@item keyserver +@opindex keyedit: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 +@option{--keyserver-options honor-keyserver-url} for more on how this +works. Setting a value of "none" removes an existing preferred +keyserver. + +@item notation +@opindex keyedit:notation +Set a name=value notation for the specified user ID(s). See +@option{--cert-notation} for more on how this works. Setting a value of +"none" removes all notations, setting a notation prefixed with a minus +sign (-) removes that notation, and setting a notation name (without the +=value) prefixed with a minus sign removes all notations with that name. + +@item pref +@opindex keyedit:pref +List preferences from the selected user ID. This shows the actual +preferences, without including any implied preferences. + +@item showpref +@opindex keyedit:showpref +More verbose preferences listing for the selected user ID. This shows +the preferences in effect by including the implied preferences of 3DES +(cipher), SHA-1 (digest), and Uncompressed (compression) if they are +not already included in the preference list. In addition, the +preferred keyserver and signature notations (if any) are shown. + +@item setpref @code{string} +@opindex keyedit:setpref +Set the list of user ID preferences to @code{string} for all (or just +the selected) user IDs. Calling setpref with no arguments sets the +preference list to the default (either built-in or set via +@option{--default-preference-list}), and calling setpref with "none" +as the argument sets an empty preference list. Use @command{@gpgname +--version} to get a list of available algorithms. Note that while you +can change the preferences on an attribute user ID (aka "photo ID"), +GnuPG does not select keys via attribute user IDs so these preferences +will not be used by GnuPG. + +When setting preferences, you should list the algorithms in the order +which you'd like to see them used by someone else when encrypting a +message to your key. If you don't include 3DES, it will be +automatically added at the end. Note that there are many factors that +go into choosing an algorithm (for example, your key may not be the +only recipient), and so the remote OpenPGP application being used to +send to you may or may not follow your exact chosen order for a given +message. It will, however, only choose an algorithm that is present +on the preference list of every recipient key. See also the +INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below. @item addkey @opindex keyedit:addkey @@ -634,18 +744,18 @@ @item addcardkey @opindex keyedit:addcardkey -Generate a key on a card and add it to this key. +Generate a subkey on a card and add it to this key. @item keytocard @opindex keyedit:keytocard -Transfer the selected secret key (or the primary key if no key has been -selected) to a smartcard. The secret key in the keyring will be replaced -by a stub if the key could be stored successfully on the card and you -use the save command later. Only certain key types may be transferred to -the card. A sub menu allows you to select on what card to store the -key. Note that it is not possible to get that key back from the card - -if the card gets broken your secret key will be lost unless you have a -backup somewhere. +Transfer the selected secret subkey (or the primary key if no subkey +has been selected) to a smartcard. The secret key in the keyring will +be replaced by a stub if the key could be stored successfully on the +card and you use the save command later. Only certain key types may be +transferred to the card. A sub menu allows you to select on what card +to store the key. Note that it is not possible to get that key back +from the card - if the card gets broken your secret key will be lost +unless you have a backup somewhere. @item bkuptocard @code{file} @opindex keyedit:bkuptocard @@ -663,94 +773,37 @@ a subkey, once it has been send to the public (i.e. to a keyserver). In that case you better use @code{revkey}. -@item addrevoker -@opindex keyedit:addrevoker -Add a designated revoker. This takes one optional argument: -"sensitive". If a designated revoker is marked as sensitive, it will not -be exported by default (see export-options). - @item revkey @opindex keyedit:revkey Revoke a subkey. @item expire @opindex keyedit:expire -Change the key expiration time. If a subkey is selected, the -expiration time of this subkey will be changed. With no selection, -the key expiration of the primary key is changed. - -@item passwd -@opindex keyedit:passwd -Change the passphrase of the secret key. - -@item primary -@opindex keyedit:primary -Flag the current user id as the primary one, removes the primary user -id flag from all other user ids and sets the timestamp of all affected -self-signatures one second ahead. Note that setting a photo user ID -as primary makes it primary over other photo user IDs, and setting a -regular user ID as primary makes it primary over other regular user -IDs. +Change the key or subkey expiration time. If a subkey is selected, the +expiration time of this subkey will be changed. With no selection, the +key expiration of the primary key is changed. -@item uid @code{n} -@opindex keyedit:uid -Toggle selection of user id with index @code{n}. -Use 0 to deselect all. - -@item key @code{n} -@opindex keyedit:key -Toggle selection of subkey with index @code{n}. -Use 0 to deselect all. - -@item check -@opindex keyedit:check -Check all selected user ids. - -@item showphoto -@opindex keyedit:showphoto -Display the selected photographic user -id. - -@item pref -@opindex keyedit:pref -List preferences from the selected user ID. This shows the actual -preferences, without including any implied preferences. - -@item showpref -@opindex keyedit:showpref -More verbose preferences listing for the selected user ID. This shows -the preferences in effect by including the implied preferences of 3DES -(cipher), SHA-1 (digest), and Uncompressed (compression) if they are -not already included in the preference list. In addition, the -preferred keyserver and signature notations (if any) are shown. +@item trust +@opindex keyedit:trust +Change the owner trust value for the key. This updates the trust-db +immediately and no save is required. -@item setpref @code{string} -@opindex keyedit:setpref -Set the list of user ID preferences to @code{string} for all (or just -the selected) user IDs. Calling setpref with no arguments sets the -preference list to the default (either built-in or set via -@option{--default-preference-list}), and calling setpref with "none" as -the argument sets an empty preference list. Use @command{@gpgname ---version} to get a list of available algorithms. Note that while you -can change the preferences on an attribute user ID (aka "photo ID"), -GnuPG does not select keys via attribute user IDs so these preferences -will not be used by GnuPG. +@item disable +@itemx enable +@opindex keyedit:disable +@opindex keyedit:enable +Disable or enable an entire key. A disabled key can not normally be +used for encryption. -@item keyserver -@opindex keyedit: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 -@option{--keyserver-options honor-keyserver-url} for more on how this -works. Setting a value of "none" removes an existing preferred -keyserver. +@item addrevoker +@opindex keyedit:addrevoker +Add a designated revoker to the key. This takes one optional argument: +"sensitive". If a designated revoker is marked as sensitive, it will +not be exported by default (see export-options). -@item notation -@opindex keyedit:notation -Set a name=value notation for the specified user ID(s). See -@option{--cert-notation} for more on how this works. Setting a value of -"none" removes all notations, setting a notation prefixed with a minus -sign (-) removes that notation, and setting a notation name (without the -=value) prefixed with a minus sign removes all notations with that name. +@item passwd +@opindex keyedit:passwd +Change the passphrase of the secret key. @item toggle @opindex keyedit:toggle @@ -775,7 +828,9 @@ Add cross-certification signatures to signing subkeys that may not currently have them. Cross-certification signatures protect against a subtle attack against signing subkeys. See -@option{--require-cross-certification}. +@option{--require-cross-certification}. All new keys generated have +this signature by default, so this option is only useful to bring +older keys up to date. @item save @opindex keyedit:save @@ -921,7 +976,12 @@ @opindex batch @opindex no-batch Use batch mode. Never ask, do not allow interactive commands. -@option{--no-batch} disables this option. +@option{--no-batch} disables this option. Note that even with a +filename given on the command line, gpg might still need to read from +STDIN (in particular if gpg figures that the input is a +detached signature and no data file has been specified). Thus if you +do not want to feed data via STDIN, you should connect STDIN to +@file{/dev/null}. @item --no-tty @opindex no-tty @@ -1052,10 +1112,10 @@ @item --enable-dsa2 @itemx --disable-dsa2 -Enables new-style DSA keys which (unlike the old style) may be larger -than 1024 bit and use hashes other than SHA-1 and RIPEMD/160. Note -that very few programs currently support these keys and signatures -from them. +Enable hash truncation for all DSA keys even for old DSA Keys up to +1024 bit. This is also the default with @option{--openpgp}. Note +that older versions of GnuPG also required this flag to allow the +generation of DSA larger than 1024 bit. @item --photo-viewer @code{string} This is the command line that should be run to view a photo ID. "%i" @@ -1068,7 +1128,7 @@ then the photo will be supplied to the viewer on standard input. The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' -stdin". Note that if your image viewer program is not secure, then +STDIN". Note that if your image viewer program is not secure, then executing it from GnuPG does not make it secure. @item --exec-path @code{string} @@ -1305,29 +1365,42 @@ GnuPG can automatically locate and retrieve keys as needed using this option. This happens when encrypting to an email address (in the "user@@example.com" form), and there are no user@@example.com keys on -the local keyring. This option takes any number of the following -arguments, in the order they are to be tried: +the local keyring. This option takes any number of the following +mechanisms, in the order they are to be tried: @table @asis @item cert -locate a key using DNS CERT, as specified in 2538bis (currently in -draft): http://www.josefsson.org/rfc2538bis/ +Locate a key using DNS CERT, as specified in rfc4398. @item pka -locate a key using DNS PKA. +Locate a key using DNS PKA. @item ldap -locate a key using the PGP Universal method of checking -"ldap://keys.(thedomain)". +Using DNS Service Discovery, check the domain in question for any LDAP +keyservers to use. If this fails, attempt to locate the key using the +PGP Universal method of checking @samp{ldap://keys.(thedomain)}. @item keyserver -locate a key using whatever keyserver is defined using the +Locate a key using whatever keyserver is defined using the @option{--keyserver} option. -@item (keyserver URL) -In addition, a keyserver URL as used in the @option{--keyserver} option may be -used here to query that particular keyserver. +@item keyserver-URL +In addition, a keyserver URL as used in the @option{--keyserver} option +may be used here to query that particular keyserver. + +@item local +Locate the key using the local keyrings. This mechanism allows to +select the order a local key lookup is done. Thus using +@samp{--auto-key-locate local} is identical to +@option{--no-auto-key-locate}. + +@item nodefault +This flag disables the standard local key lookup, done before any of the +mechanisms defined by the @option{--auto-key-locate} are tried. The +position of this mechanism in the list does not matter. It is not +required if @code{local} is also used. + @end table @item --keyid-format @code{short|0xshort|long|0xlong} @@ -1352,16 +1425,16 @@ Most keyservers synchronize with each other, so there is generally no need to send keys to more than one server. The keyserver -@code{hkp://subkeys.pgp.net} uses round robin DNS to give a different +@code{hkp://keys.gnupg.net} uses round robin DNS to give a different keyserver each time you use it. @item --keyserver-options @code{name=value1 } This is a space or comma delimited string that gives options for the -keyserver. Options can be prepended with a `no-' to give the opposite -meaning. Valid import-options or export-options may be used here as well -to apply to importing (@option{--recv-key}) or exporting -(@option{--send-key}) a key from a keyserver. While not all options are -available for all keyserver types, some common options are: +keyserver. Options can be prefixed with a `no-' to give the opposite +meaning. Valid import-options or export-options may be used here as +well to apply to importing (@option{--recv-key}) or exporting +(@option{--send-key}) a key from a keyserver. While not all options +are available for all keyserver types, some common options are: @table @asis @@ -1437,6 +1510,22 @@ @item max-cert-size When retrieving a key via DNS CERT, only accept keys up to this size. Defaults to 16384 bytes. + +@item debug +Turn on debug output in the keyserver helper program. Note that the +details of debug output depends on which keyserver helper program is +being used, and in turn, on any libraries that the keyserver helper +program uses internally (libcurl, openldap, etc). + +@item check-cert +Enable certificate checking if the keyserver presents one (for hkps or +ldaps). Defaults to on. + +@item ca-cert-file +Provide a certificate file to override the system default. Only +necessary if check-cert is enabled, and the keyserver is using a +certificate that is not present in a system default certificate list. + @end table @item --completes-needed @code{n} @@ -1809,6 +1898,10 @@ @opindex fixed-list-mode Do not merge primary user ID and primary key in @option{--with-colon} listing mode and print all timestamps as seconds since 1970-01-01. +@ifclear gpgone +Since GnuPG 2.0.10, this mode is always used and thus this option is +obsolete; it does not harm to use it though. +@end ifclear @item --with-fingerprint @opindex with-fingerprint @@ -1876,17 +1969,19 @@ Set the list of personal cipher preferences to @code{string}. Use @command{@gpgname --version} to get a list of available algorithms, and use @code{none} to set no preference at all. This allows the user -to factor in their own preferred algorithms when algorithms are chosen -via recipient key preferences. The most highly ranked cipher in this -list is also used for the @option{--symmetric} encryption command. +to safely override the algorithm chosen by the recipient key +preferences, as GPG will only select an algorithm that is usable by +all recipients. The most highly ranked cipher in this list is also +used for the @option{--symmetric} encryption command. @item --personal-digest-preferences @code{string} Set the list of personal digest preferences to @code{string}. Use @command{@gpgname --version} to get a list of available algorithms, and use @code{none} to set no preference at all. This allows the user -to factor in their own preferred algorithms when algorithms are chosen -via recipient key preferences. The most highly ranked digest -algorithm in this list is algo used when signing without encryption +to safely override the algorithm chosen by the recipient key +preferences, as GPG will only select an algorithm that is usable by +all recipients. The most highly ranked digest algorithm in this list +is also used when signing without encryption (e.g. @option{--clearsign} or @option{--sign}). The default value is SHA-1. @@ -1894,10 +1989,11 @@ Set the list of personal compression preferences to @code{string}. Use @command{@gpgname --version} to get a list of available algorithms, and use @code{none} to set no preference at all. This -allows the user to factor in their own preferred algorithms when -algorithms are chosen via recipient key preferences. The most highly -ranked compression algorithm in this list is algo used when there are -no recipient keys to consider (e.g. @option{--symmetric}). +allows the user to safely override the algorithm chosen by the +recipient key preferences, as GPG will only select an algorithm that +is usable by all recipients. The most highly ranked compression +algorithm in this list is also used when there are no recipient keys +to consider (e.g. @option{--symmetric}). @item --s2k-cipher-algo @code{name} Use @code{name} as the cipher algorithm used to protect secret keys. @@ -1980,9 +2076,9 @@ available, but the MIT release is a good common baseline. This option implies @option{--rfc1991 --disable-mdc ---no-force-v4-certs --no-sk-comment --escape-from-lines ---force-v3-sigs --cipher-algo IDEA --digest-algo MD5 --compress-algo -ZIP}. It also disables @option{--textmode} when encrypting. +--no-force-v4-certs --escape-from-lines --force-v3-sigs --cipher-algo +IDEA --digest-algo MD5 --compress-algo ZIP}. It also disables +@option{--textmode} when encrypting. @item --pgp6 @opindex pgp6 @@ -1993,8 +2089,8 @@ --throw-keyids, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. -This option implies @option{--disable-mdc --no-sk-comment ---escape-from-lines --force-v3-sigs}. +This option implies @option{--disable-mdc --escape-from-lines +--force-v3-sigs}. @item --pgp7 @opindex pgp7 @@ -2066,11 +2162,13 @@ @code{file}. @item --logger-fd @code{n} -Write log output to file descriptor @code{n} and not to stderr. +Write log output to file descriptor @code{n} and not to STDERR. -@item --logger-file @code{file} +@item --log-file @code{file} +@itemx --logger-file @code{file} Same as @option{--logger-fd}, except the logger data is written to file -@code{file}. +@code{file}. Note that @option{--log-file} is only implemented for +GnuPG-2. @item --attribute-fd @code{n} Write attribute subpackets to the file descriptor @code{n}. This is most @@ -2152,10 +2250,10 @@ @item --for-your-eyes-only @itemx --no-for-your-eyes-only -Set the `for your eyes only' flag in the message. This causes GnuPG -to refuse to save the file unless the @option{--output} option is given, and -PGP to use the "secure viewer" with a Tempest-resistant font to -display the message. This option overrides @option{--set-filename}. +Set the `for your eyes only' flag in the message. This causes GnuPG to +refuse to save the file unless the @option{--output} option is given, +and PGP to use a "secure viewer" with a claimed Tempest-resistant font +to display the message. This option overrides @option{--set-filename}. @option{--no-for-your-eyes-only} disables this option. @item --use-embedded-filename @@ -2221,12 +2319,15 @@ @item --throw-keyids @itemx --no-throw-keyids -Do not put the recipient key IDs into encrypted messages. This helps -to hide the receivers of the message and is a limited countermeasure -against traffic analysis. On the receiving side, it may slow down the -decryption process because all available secret keys must be tried. -@option{--no-throw-keyids} disables this option. This option is essentially -the same as using @option{--hidden-recipient} for all recipients. +Do not put the recipient key IDs into encrypted messages. This helps to +hide the receivers of the message and is a limited countermeasure +against traffic analysis.@footnote{Using a little social engineering +anyone who is able to decrypt the message can check whether one of the +other recipients is the one he suspects.} On the receiving side, it may +slow down the decryption process because all available secret keys must +be tried. @option{--no-throw-keyids} disables this option. This option +is essentially the same as using @option{--hidden-recipient} for all +recipients. @item --not-dash-escaped This option changes the behavior of cleartext signatures @@ -2253,7 +2354,7 @@ @item --passphrase-fd @code{n} Read the passphrase from file descriptor @code{n}. Only the first line will be read from file descriptor @code{n}. If you use 0 for @code{n}, -the passphrase will be read from stdin. This can only be used if only +the passphrase will be read from STDIN. This can only be used if only one passphrase is supplied. @ifclear gpgone Note that this passphrase is only used if the option @option{--batch} @@ -2415,11 +2516,15 @@ @item --allow-multiple-messages @item --no-allow-multiple-messages -Allow processing of multiple OpenPGP messages contained in a single -file or stream. Some programs that call GPG are not prepared to deal -with multiple messages being processed together, so this option -defaults to no. Note that versions of GPG prior to 1.4.7 always -allowed multiple messages. +Allow processing of multiple OpenPGP messages contained in a single file +or stream. Some programs that call GPG are not prepared to deal with +multiple messages being processed together, so this option defaults to +no. Note that versions of GPG prior to 1.4.7 always allowed multiple +messages. + +Warning: Do not use this option unless you need it as a temporary +workaround! + @item --enable-special-filenames This options enables a mode in which filenames of the form @@ -2542,12 +2647,12 @@ @table @file @item gpg.conf -@cindex gpgsm.conf +@cindex gpg.conf This is the standard configuration file read by @command{@gpgname} on startup. It may contain any valid long option; the leading two dashes may not be entered and the option may not be abbreviated. This default -name may be changed on the command line (@pxref{option - --options}). +name may be changed on the command line (@pxref{option --options}). +You should backup this file. @end table @@ -2567,31 +2672,32 @@ @table @file @item ~/.gnupg/secring.gpg -The secret keyring. +The secret keyring. You should backup this file. @item ~/.gnupg/secring.gpg.lock -and the lock file +The lock file for the secret keyring. @item ~/.gnupg/pubring.gpg -The public keyring +The public keyring. You should backup this file. @item ~/.gnupg/pubring.gpg.lock -and the lock file +The lock file for the public keyring. @item ~/.gnupg/trustdb.gpg -The trust database +The trust database. There is no need to backup this file; it is better +to backup the ownertrust values (@pxref{option --export-ownertrust}). @item ~/.gnupg/trustdb.gpg.lock -and the lock file +The lock file for the trust database. @item ~/.gnupg/random_seed -used to preserve the internal random pool +A file used to preserve the state of the internal random pool. @item /usr[/local]/share/gnupg/options.skel -Skeleton options file +The skeleton options file. @item /usr[/local]/lib/gnupg/ -Default location for extensions +Default location for extensions. @end table @@ -2619,7 +2725,7 @@ @item PINENTRY_USER_DATA This value is passed via gpg-agent to pinentry. It is useful to convey -extra information to a custom pinentry +extra information to a custom pinentry. @item COLUMNS @itemx LINES @@ -2628,12 +2734,13 @@ @item LANGUAGE Apart from its use by GNU, it is used in the W32 version to override the -language selection done through the Registry. If used and set to a a +language selection done through the Registry. If used and set to a valid and available language name (@var{langid}), the file with the translation is loaded from @code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}. Here @var{gpgdir} is the -directory out of which the gpg binary has been laoded. If it can't be -loaded the Registry is tried as a fallback. +directory out of which the gpg binary has been loaded. If it can't be +loaded the Registry is tried and as last resort the native Windows +locale system is used. @end table @@ -2658,6 +2765,9 @@ @item gpg -sb @code{file} make a detached signature +@item gpg -u 0x12345678 -sb @code{file} +make a detached signature with the key 0x12345678 + @item gpg --list-keys @code{user_ID} show keys @@ -2706,7 +2816,7 @@ If you are going to verify detached signatures, make sure that the program knows about it; either give both filenames on the command line -or use @samp{-} to specify stdin. +or use @samp{-} to specify STDIN. @mansect interoperability @chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS diff -Nru gnupg-1.4.9/doc/gpgv.texi gnupg-1.4.10/doc/gpgv.texi --- gnupg-1.4.9/doc/gpgv.texi 2007-03-05 09:12:44.000000000 +0000 +++ gnupg-1.4.10/doc/gpgv.texi 2009-09-02 13:31:17.000000000 +0100 @@ -55,8 +55,8 @@ @mansect description @code{@gpgvname} is an OpenPGP signature verification tool. -This program is actually a stripped down version of @code{gpg} which is -only able to check signatures. It is somewhat smaller than the fully blown +This program is actually a stripped-down version of @code{gpg} which is +only able to check signatures. It is somewhat smaller than the fully-blown @code{gpg} and uses a different (and simpler) way to check that the public keys used to make the signature are valid. There are no configuration files and only a few options are implemented. @@ -114,7 +114,7 @@ @mansect return value -The program returns 0 if everything was fine, 1 if at least +The program returns 0 if everything is fine, 1 if at least one signature was bad, and other error codes for fatal errors. @mansect examples @@ -123,13 +123,14 @@ @table @asis @item @gpgvname @code{pgpfile} -@itemx @gpgvname @code{sigfile} -Verify the signature of the file. The second form -is used for detached signatures, where @code{sigfile} is the detached -signature (either ASCII armored or binary) and are the signed -data; if this is not given the name of the file holding the signed data is -constructed by cutting off the extension (".asc", ".sig" or ".sign") from -@code{sigfile}. +@itemx @gpgvname @code{sigfile} [@code{datafile}] +Verify the signature of the file. The second form is used for detached +signatures, where @code{sigfile} is the detached signature (either +ASCII-armored or binary) and @code{datafile} contains the signed data; +if @code{datafile} is "-" the signed data is expected on +@code{stdin}; if @code{datafile} is not given the name of the file +holding the signed data is constructed by cutting off the extension +(".asc", ".sig" or ".sign") from @code{sigfile}. @end table @@ -152,7 +153,7 @@ @table @asis @item ~/.gnupg/trustedkeys.gpg -The default keyring with the allowed keys +The default keyring with the allowed keys. @end table diff -Nru gnupg-1.4.9/doc/gpg-zip.1 gnupg-1.4.10/doc/gpg-zip.1 --- gnupg-1.4.9/doc/gpg-zip.1 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/doc/gpg-zip.1 2008-12-11 16:39:51.000000000 +0000 @@ -0,0 +1,102 @@ +.TH "gpg-zip" 1 "November 2006" + +.SH NAME +gpg\-zip \- encrypt or sign files into an archive + +.SH SYNOPSIS +.B gpg\-zip +.RB [ OPTIONS ] +.IR filename1 " [" "filename2, ..." ] +.IR directory1 " [" "directory2, ..." ] + +.SH DESCRIPTION +This manual page documents briefly the +.B gpg\-zip +command. +.PP +.B gpg\-zip +encrypts or signs files into an archive. It is an gpg-ized tar using the +same format as PGP's PGP Zip. + +.SH OPTIONS +.TP +.BR \-e ", " \-\-encrypt +Encrypt data. This option may be combined with +.B \-\-symmetric +(for output that may be decrypted via a secret key or a passphrase). +.TP +.BR \-d ", " \-\-decrypt +Decrypt data. +.TP +.BR \-c ", " \-\-symmetric +Encrypt with a symmetric cipher using a passphrase. The default +symmetric cipher used is CAST5, but may be chosen with the +.B \-\-cipher\-algo +option to +.BR gpg (1). +.TP +.BR \-s ", " \-\-sign +Make a signature. See +.BR gpg (1). +.TP +.BR \-r ", " \-\-recipient " \fIUSER\fR" +Encrypt for user id \fIUSER\fR. See +.BR gpg (1). +.TP +.BR \-u ", " \-\-local\-user " \fIUSER\fR" +Use \fIUSER\fR as the key to sign with. See +.BR gpg (1). +.TP +.B \-\-list\-archive +List the contents of the specified archive. +.TP +.BR \-o ", " \-\-output " " \fIFILE\fR +Write output to specified file +.IR FILE . +.TP +.BI \-\-gpg " GPG" +Use the specified command instead of +.BR gpg . +.TP +.BI \-\-gpg\-args " ARGS" +Pass the specified options to +.BR gpg (1). +.TP +.BI \-\-tar " TAR" +Use the specified command instead of +.BR tar . +.TP +.BI \-\-tar\-args " ARGS" +Pass the specified options to +.BR tar (1). +.TP +.BR \-h ", " \-\-help +Output a short usage information. +.TP +.B \-\-version +Output the program version. + +.SH DIAGNOSTICS +The program returns \fB0\fR if everything was fine, \fB1\fR otherwise. + +.SH EXAMPLES +Encrypt the contents of directory \fImydocs\fR for user Bob to file \fItest1\fR: +.IP +.B gpg\-zip \-\-encrypt \-\-output test1 \-\-gpg-args ""\-r Bob"" mydocs +.PP +List the contents of archive \fItest1\fR: +.IP +.B gpg\-zip \-\-list\-archive test1 + +.SH SEE ALSO +.BR gpg (1), +.BR tar (1) + +.SH AUTHOR +Copyright (C) 2005 Free Software Foundation, Inc. Please report bugs to +<\&bug-gnupg@gnu.org\&>. + +This manpage was written by \fBColin Tuckley\fR <\&colin@tuckley.org\&> +and \fBDaniel Leidert\fR <\&daniel.leidert@wgdd.de\&> for the Debian +distribution (but may be used by others). + diff -Nru gnupg-1.4.9/doc/Makefile.am gnupg-1.4.10/doc/Makefile.am --- gnupg-1.4.9/doc/Makefile.am 2007-10-23 10:16:58.000000000 +0100 +++ gnupg-1.4.10/doc/Makefile.am 2009-08-18 09:12:15.000000000 +0100 @@ -20,14 +20,19 @@ HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \ TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt \ gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \ - opt-homedir.texi texi.css yat2m.c gpl.texi + opt-homedir.texi texi.css yat2m.c gpl.texi gpg-zip.1 + myman_sources = gpg.texi gpgv.texi myman_pages = gpg.1 gpgv.1 + +sources_from_trunk = $(myman_sources) \ + opt-homedir.texi specify-user-id.texi see-also-note.texi + info_TEXINFOS = gnupg1.texi -man_MANS = $(myman_pages) gnupg.7 gpg.ru.1 +man_MANS = $(myman_pages) gnupg.7 gpg.ru.1 gpg-zip.1 gnupg1_TEXINFOS = gnupg1.texi @@ -105,3 +110,14 @@ dist-hook: @if test "`wc -c < gpg.1`" -lt 200; then \ echo 'ERROR: dummy man page'; false; fi + +# Helper to update some source files. +update-source-from-gnupg-2: + @set -e; \ + if test -d ../../gnupg/scd; then dir="../../gnupg"; \ + else exit 1; \ + fi; \ + for i in $(sources_from_trunk); do \ + cp $$dir/doc/$$i $$i; echo $$i; \ + done ;\ + echo "Please remember to update the ChangeLog!" diff -Nru gnupg-1.4.9/doc/Makefile.in gnupg-1.4.10/doc/Makefile.in --- gnupg-1.4.9/doc/Makefile.in 2008-03-26 17:30:46.000000000 +0000 +++ gnupg-1.4.10/doc/Makefile.in 2009-09-02 17:20:22.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -55,11 +55,11 @@ $(srcdir)/version.texi ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -137,7 +137,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -286,12 +285,15 @@ HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \ TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt \ gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \ - opt-homedir.texi texi.css yat2m.c gpl.texi + opt-homedir.texi texi.css yat2m.c gpl.texi gpg-zip.1 myman_sources = gpg.texi gpgv.texi myman_pages = gpg.1 gpgv.1 +sources_from_trunk = $(myman_sources) \ + opt-homedir.texi specify-user-id.texi see-also-note.texi + info_TEXINFOS = gnupg1.texi -man_MANS = $(myman_pages) gnupg.7 gpg.ru.1 +man_MANS = $(myman_pages) gnupg.7 gpg.ru.1 gpg-zip.1 gnupg1_TEXINFOS = gnupg1.texi # Need this to avoid building of dvis with automake 1.4 @@ -877,6 +879,17 @@ dist-hook: @if test "`wc -c < gpg.1`" -lt 200; then \ echo 'ERROR: dummy man page'; false; fi + +# Helper to update some source files. +update-source-from-gnupg-2: + @set -e; \ + if test -d ../../gnupg/scd; then dir="../../gnupg"; \ + else exit 1; \ + fi; \ + for i in $(sources_from_trunk); do \ + cp $$dir/doc/$$i $$i; echo $$i; \ + done ;\ + echo "Please remember to update the ChangeLog!" # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru gnupg-1.4.9/doc/opt-homedir.texi gnupg-1.4.10/doc/opt-homedir.texi --- gnupg-1.4.9/doc/opt-homedir.texi 2006-12-04 13:31:56.000000000 +0000 +++ gnupg-1.4.10/doc/opt-homedir.texi 2009-09-02 13:31:17.000000000 +0100 @@ -1,14 +1,10 @@ @c This option is included at several places. @item --homedir @var{dir} @opindex homedir -Set the name of the home directory to @var{dir}. If his option is not +Set the name of the home directory to @var{dir}. If this 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 @env{GNUPGHOME} or -(on W32 systems) by means on the Registry entry -@ifset isman -@var{HKCU\\Software\\GNU\\GnuPG:HomeDir}. -@end ifset -@ifclear isman +(on W32 systems) by means of the Registry entry @var{HKCU\Software\GNU\GnuPG:HomeDir}. -@end ifclear + diff -Nru gnupg-1.4.9/doc/see-also-note.texi gnupg-1.4.10/doc/see-also-note.texi --- gnupg-1.4.9/doc/see-also-note.texi 2006-12-04 13:55:39.000000000 +0000 +++ gnupg-1.4.10/doc/see-also-note.texi 2009-09-02 13:31:17.000000000 +0100 @@ -6,7 +6,7 @@ command @example -info gnupg1 +info gnupg @end example should give you access to the complete manual including a menu structure diff -Nru gnupg-1.4.9/doc/stamp-vti gnupg-1.4.10/doc/stamp-vti --- gnupg-1.4.9/doc/stamp-vti 2008-03-26 17:33:02.000000000 +0000 +++ gnupg-1.4.10/doc/stamp-vti 2009-09-02 14:50:58.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 23 October 2007 -@set UPDATED-MONTH October 2007 -@set EDITION 1.4.9 -@set VERSION 1.4.9 +@set UPDATED 11 December 2008 +@set UPDATED-MONTH December 2008 +@set EDITION 1.4.10 +@set VERSION 1.4.10 diff -Nru gnupg-1.4.9/doc/version.texi gnupg-1.4.10/doc/version.texi --- gnupg-1.4.9/doc/version.texi 2008-03-26 17:33:02.000000000 +0000 +++ gnupg-1.4.10/doc/version.texi 2009-09-02 14:50:58.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 23 October 2007 -@set UPDATED-MONTH October 2007 -@set EDITION 1.4.9 -@set VERSION 1.4.9 +@set UPDATED 11 December 2008 +@set UPDATED-MONTH December 2008 +@set EDITION 1.4.10 +@set VERSION 1.4.10 diff -Nru gnupg-1.4.9/doc/yat2m.c gnupg-1.4.10/doc/yat2m.c --- gnupg-1.4.9/doc/yat2m.c 2007-12-12 18:40:17.000000000 +0000 +++ gnupg-1.4.10/doc/yat2m.c 2008-12-11 16:39:51.000000000 +0000 @@ -42,7 +42,7 @@ the next input line if that line begins with @section, @subsection or @chapheading. - To insert verbatim troff markup, the follwing texinfo code may be + To insert verbatim troff markup, the following texinfo code may be used: @ifset manverb @@ -449,7 +449,7 @@ { "code", 0, "\\fB", "\\fR" }, { "sc", 0, "\\fB", "\\fR" }, { "var", 0, "\\fI", "\\fR" }, - { "samp", 0, "'", "'" }, + { "samp", 0, "\\(aq", "\\(aq'" }, { "file", 0, "`\\fI","\\fR'" }, { "env", 0, "`\\fI","\\fR'" }, { "acronym", 0 }, @@ -675,6 +675,8 @@ } *eol_action = 0; } + else if (*s == '\\') + fputs ("\\\\", fp); else putc (*s, fp); } @@ -842,7 +844,7 @@ { char *line; int lnr = 0; - /* Fixme: The follwing state variables don't carry over to include + /* Fixme: The following state variables don't carry over to include files. */ int in_verbatim = 0; int skip_to_end = 0; /* Used to skip over menu entries. */ diff -Nru gnupg-1.4.9/g10/apdu.c gnupg-1.4.10/g10/apdu.c --- gnupg-1.4.9/g10/apdu.c 2007-10-23 11:40:11.000000000 +0100 +++ gnupg-1.4.10/g10/apdu.c 2009-07-21 14:21:44.000000000 +0100 @@ -1,5 +1,5 @@ /* apdu.c - ISO 7816 APDU functions and low level I/O - * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: apdu.c 4603 2007-10-23 10:48:09Z wk $ + * $Id: apdu.c 5085 2009-07-21 14:30:13Z wk $ */ /* NOTE: This module is also used by other software, thus the use of @@ -31,9 +31,9 @@ #include #include #ifdef USE_GNU_PTH -# include # include # include +# include #endif @@ -54,13 +54,14 @@ #include "memory.h" #include "util.h" #include "i18n.h" +#include "dynload.h" #include "cardglue.h" #else /* GNUPG_MAJOR_VERSION != 1 */ #include "scdaemon.h" +#include "exechelp.h" #endif /* GNUPG_MAJOR_VERSION != 1 */ #include "apdu.h" -#include "dynload.h" #include "ccid-driver.h" @@ -82,13 +83,8 @@ #define DLSTDCALL #endif -#ifdef _POSIX_OPEN_MAX -#define MAX_OPEN_FDS _POSIX_OPEN_MAX -#else -#define MAX_OPEN_FDS 20 -#endif -/* Helper to pass patrameters related to keypad based operations. */ +/* Helper to pass parameters related to keypad based operations. */ struct pininfo_s { int mode; @@ -104,6 +100,8 @@ unsigned short port; /* Port number: 0 = unused, 1 - dev/tty */ /* Function pointers intialized to the various backends. */ + int (*connect_card)(int); + int (*disconnect_card)(int); int (*close_reader)(int); int (*shutdown_reader)(int); int (*reset_reader)(int); @@ -112,6 +110,7 @@ unsigned char *, size_t *, struct pininfo_s *); int (*check_keypad)(int, int, int, int, int, int); void (*dump_status_reader)(int); + int (*set_progress_cb)(int, gcry_handler_progress_t, void*); struct { ccid_driver_t handle; @@ -132,6 +131,7 @@ } rapdu; #endif /*USE_G10CODE_RAPDU*/ char *rdrname; /* Name of the connected reader or NULL if unknown. */ + int any_status; /* True if we have seen any status. */ int last_status; int status; int is_t0; /* True if we know that we are running T=0. */ @@ -220,6 +220,11 @@ #define PCSC_E_READER_UNAVAILABLE 0x80100017 #define PCSC_W_REMOVED_CARD 0x80100069 +/* The PC/SC error is defined as a long as per specs. Due to left + shifts bit 31 will get sign extended. We use this mask to fix + it. */ +#define PCSC_ERR_MASK(a) ((a) & 0xffffffff) + struct pcsc_io_request_s { @@ -272,7 +277,8 @@ unsigned long *r_protocol, unsigned char *atr, unsigned long *atrlen); long (* DLSTDCALL pcsc_begin_transaction) (unsigned long card); -long (* DLSTDCALL pcsc_end_transaction) (unsigned long card); +long (* DLSTDCALL pcsc_end_transaction) (unsigned long card, + unsigned long disposition); long (* DLSTDCALL pcsc_transmit) (unsigned long card, const pcsc_io_request_t send_pci, const unsigned char *send_buffer, @@ -286,6 +292,10 @@ /* Prototypes. */ static int pcsc_get_status (int slot, unsigned int *status); +static int reset_pcsc_reader (int slot); +static int apdu_get_status_internal (int slot, int hang, int no_atr_reset, + unsigned int *status, + unsigned int *changed); @@ -322,6 +332,8 @@ reader_table[reader].lock_initialized = 1; } #endif /*USE_GNU_PTH*/ + reader_table[reader].connect_card = NULL; + reader_table[reader].disconnect_card = NULL; reader_table[reader].close_reader = NULL; reader_table[reader].shutdown_reader = NULL; reader_table[reader].reset_reader = NULL; @@ -329,8 +341,10 @@ reader_table[reader].send_apdu_reader = NULL; reader_table[reader].check_keypad = NULL; reader_table[reader].dump_status_reader = NULL; + reader_table[reader].set_progress_cb = NULL; - reader_table[reader].used = 1; + reader_table[reader].used = 1; + reader_table[reader].any_status = 0; reader_table[reader].last_status = 0; reader_table[reader].is_t0 = 1; #ifdef NEED_PCSC_WRAPPER @@ -381,6 +395,7 @@ case SW_HOST_NO_READER: return "no reader"; case SW_HOST_ABORTED: return "aborted"; case SW_HOST_NO_KEYPAD: return "no keypad"; + case SW_HOST_ALREADY_CONNECTED: return "already connected"; default: return "unknown host status error"; } } @@ -402,6 +417,7 @@ case SW_FILE_NOT_FOUND : return "file not found"; case SW_RECORD_NOT_FOUND:return "record not found"; case SW_REF_NOT_FOUND : return "reference not found"; + case SW_BAD_LC : return "bad Lc"; case SW_BAD_P0_P1 : return "bad P0 or P1"; case SW_INS_NOT_SUP : return "instruction not supported"; case SW_CLA_NOT_SUP : return "class not supported"; @@ -531,10 +547,11 @@ static int ct_get_status (int slot, unsigned int *status) { - *status = 1|2|4; /* FIXME */ + (void)slot; + /* The status we returned is wrong but we don't care becuase ctAPI + is not anymore required. */ + *status = APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE; return 0; - - return SW_HOST_NOT_SUPPORTED; } /* Actually send the APDU of length APDULEN to SLOT and return a @@ -548,6 +565,8 @@ unsigned char dad[1], sad[1]; unsigned short ctbuflen; + (void)pininfo; + /* If we don't have an ATR, we need to reset the reader first. */ if (!reader_table[slot].atrlen && (rc = reset_ct_reader (slot))) @@ -655,6 +674,9 @@ while (nleft > 0) { #ifdef USE_GNU_PTH +# ifdef HAVE_W32_SYSTEM +# error Cannot use pth_read here because it expects a system HANDLE. +# endif n = pth_read (fd, buf, nleft); #else n = read (fd, buf, nleft); @@ -736,7 +758,7 @@ { int rc; - switch (ec) + switch ( PCSC_ERR_MASK (ec) ) { case 0: rc = 0; break; @@ -762,177 +784,87 @@ static void dump_pcsc_reader_status (int slot) { - log_info ("reader slot %d: active protocol:", slot); - if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T0)) - log_printf (" T0"); - else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1)) - log_printf (" T1"); - else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_RAW)) - log_printf (" raw"); - log_printf ("\n"); + if (reader_table[slot].pcsc.card) + { + log_info ("reader slot %d: active protocol:", slot); + if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T0)) + log_printf (" T0"); + else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1)) + log_printf (" T1"); + else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_RAW)) + log_printf (" raw"); + log_printf ("\n"); + } + else + log_info ("reader slot %d: not connected\n", slot); } -/* Send an PC/SC reset command and return a status word on error or 0 - on success. */ +#ifndef NEED_PCSC_WRAPPER static int -reset_pcsc_reader (int slot) +pcsc_get_status_direct (int slot, unsigned int *status) { -#ifdef NEED_PCSC_WRAPPER long err; - reader_table_t slotp; - size_t len; - int i, n; - unsigned char msgbuf[9]; - unsigned int dummy_status; - int sw = SW_HOST_CARD_IO_ERROR; - - slotp = reader_table + slot; - - if (slotp->pcsc.req_fd == -1 - || slotp->pcsc.rsp_fd == -1 - || slotp->pcsc.pid == (pid_t)(-1) ) - { - log_error ("pcsc_get_status: pcsc-wrapper not running\n"); - return sw; - } - - msgbuf[0] = 0x05; /* RESET command. */ - len = 0; - msgbuf[1] = (len >> 24); - msgbuf[2] = (len >> 16); - msgbuf[3] = (len >> 8); - msgbuf[4] = (len ); - if ( writen (slotp->pcsc.req_fd, msgbuf, 5) ) - { - log_error ("error sending PC/SC RESET request: %s\n", - strerror (errno)); - goto command_failed; - } + struct pcsc_readerstate_s rdrstates[1]; - /* Read the response. */ - if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9) - { - log_error ("error receiving PC/SC RESET response: %s\n", - i? strerror (errno) : "premature EOF"); - goto command_failed; - } - len = (msgbuf[1] << 24) | (msgbuf[2] << 16) | (msgbuf[3] << 8 ) | msgbuf[4]; - if (msgbuf[0] != 0x81 || len < 4) - { - log_error ("invalid response header from PC/SC received\n"); - goto command_failed; - } - len -= 4; /* Already read the error code. */ - if (len > DIM (slotp->atr)) - { - log_error ("PC/SC returned a too large ATR (len=%lx)\n", - (unsigned long)len); - sw = SW_HOST_GENERAL_ERROR; - goto command_failed; - } - err = (msgbuf[5] << 24) | (msgbuf[6] << 16) | (msgbuf[7] << 8 ) | msgbuf[8]; + memset (rdrstates, 0, sizeof *rdrstates); + rdrstates[0].reader = reader_table[slot].rdrname; + rdrstates[0].current_state = PCSC_STATE_UNAWARE; + err = pcsc_get_status_change (reader_table[slot].pcsc.context, + 0, + rdrstates, 1); + if (err == PCSC_E_TIMEOUT) + err = 0; /* Timeout is no error error here. */ if (err) { - log_error ("PC/SC RESET failed: %s (0x%lx)\n", + log_error ("pcsc_get_status_change failed: %s (0x%lx)\n", pcsc_error_string (err), err); - /* If the error code is no smart card, we should not considere - this a major error and close the wrapper. */ - sw = pcsc_error_to_sw (err); - if (err == PCSC_E_NO_SMARTCARD) - return sw; - goto command_failed; - } - - /* The open function may return a zero for the ATR length to - indicate that no card is present. */ - n = len; - if (n) - { - if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n) - { - log_error ("error receiving PC/SC RESET response: %s\n", - i? strerror (errno) : "premature EOF"); - goto command_failed; - } - } - slotp->atrlen = len; - - /* Read the status so that IS_T0 will be set. */ - pcsc_get_status (slot, &dummy_status); - - return 0; - - command_failed: - close (slotp->pcsc.req_fd); - close (slotp->pcsc.rsp_fd); - slotp->pcsc.req_fd = -1; - slotp->pcsc.rsp_fd = -1; - kill (slotp->pcsc.pid, SIGTERM); - slotp->pcsc.pid = (pid_t)(-1); - slotp->used = 0; - return sw; - -#else /* !NEED_PCSC_WRAPPER */ - long err; - char reader[250]; - unsigned long nreader, atrlen; - unsigned long card_state, card_protocol; - - if (reader_table[slot].pcsc.card) - { - err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD); - if (err) - { - log_error ("pcsc_disconnect failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - return SW_HOST_CARD_IO_ERROR; - } - reader_table[slot].pcsc.card = 0; - } - - err = pcsc_connect (reader_table[slot].pcsc.context, - reader_table[slot].rdrname, - PCSC_SHARE_EXCLUSIVE, - PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1, - &reader_table[slot].pcsc.card, - &reader_table[slot].pcsc.protocol); - if (err) - { - log_error ("pcsc_connect failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - reader_table[slot].pcsc.card = 0; return pcsc_error_to_sw (err); } + /* log_debug */ + /* ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n", */ + /* (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_CHANGED)? " changed":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_UNKNOWN)? " unknown":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_UNAVAILABLE)?" unavail":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_EMPTY)? " empty":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_PRESENT)? " present":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_ATRMATCH)? " atr":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_EXCLUSIVE)? " excl":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_INUSE)? " unuse":"", */ + /* (rdrstates[0].event_state & PCSC_STATE_MUTE)? " mute":"" ); */ - atrlen = 33; - nreader = sizeof reader - 1; - err = pcsc_status (reader_table[slot].pcsc.card, - reader, &nreader, - &card_state, &card_protocol, - reader_table[slot].atr, &atrlen); - if (err) - { - log_error ("pcsc_status failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - reader_table[slot].atrlen = 0; - return pcsc_error_to_sw (err); - } - if (atrlen >= DIM (reader_table[0].atr)) - log_bug ("ATR returned by pcsc_status is too large\n"); - reader_table[slot].atrlen = atrlen; - reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0); + *status = 0; + if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) ) + *status |= APDU_CARD_PRESENT; + if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) ) + *status |= APDU_CARD_ACTIVE; +#ifndef HAVE_W32_SYSTEM + /* We indicate a useful card if it is not in use by another + application. This is because we only use exclusive access + mode. */ + if ( (*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE)) + == (APDU_CARD_PRESENT|APDU_CARD_ACTIVE) + && !(rdrstates[0].event_state & PCSC_STATE_INUSE) ) + *status |= APDU_CARD_USABLE; +#else + /* Some winscard drivers may set EXCLUSIVE and INUSE at the same + time when we are the only user (SCM SCR335) under Windows. */ + if ((*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE)) + == (APDU_CARD_PRESENT|APDU_CARD_ACTIVE)) + *status |= APDU_CARD_USABLE; +#endif return 0; -#endif /* !NEED_PCSC_WRAPPER */ } +#endif /*!NEED_PCSC_WRAPPER*/ +#ifdef NEED_PCSC_WRAPPER static int -pcsc_get_status (int slot, unsigned int *status) +pcsc_get_status_wrapped (int slot, unsigned int *status) { -#ifdef NEED_PCSC_WRAPPER long err; reader_table_t slotp; size_t len, full_len; @@ -978,7 +910,8 @@ goto command_failed; } len -= 4; /* Already read the error code. */ - err = (msgbuf[5] << 24) | (msgbuf[6] << 16) | (msgbuf[7] << 8 ) | msgbuf[8]; + err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16) + | (msgbuf[7] << 8 ) | msgbuf[8]); if (err) { log_error ("pcsc_status failed: %s (0x%lx)\n", @@ -1023,7 +956,6 @@ /* We are lucky: The wrapper already returns the data in the required format. */ *status = buffer[3]; - return 0; command_failed: @@ -1035,67 +967,63 @@ slotp->pcsc.pid = (pid_t)(-1); slotp->used = 0; return sw; +} +#endif /*NEED_PCSC_WRAPPER*/ -#else /*!NEED_PCSC_WRAPPER*/ - long err; - struct pcsc_readerstate_s rdrstates[1]; +static int +pcsc_get_status (int slot, unsigned int *status) +{ +#ifdef NEED_PCSC_WRAPPER + return pcsc_get_status_wrapped (slot, status); +#else + return pcsc_get_status_direct (slot, status); +#endif +} - memset (rdrstates, 0, sizeof *rdrstates); - rdrstates[0].reader = reader_table[slot].rdrname; - rdrstates[0].current_state = PCSC_STATE_UNAWARE; - err = pcsc_get_status_change (reader_table[slot].pcsc.context, - 0, - rdrstates, 1); - if (err == PCSC_E_TIMEOUT) - err = 0; /* Timeout is no error error here. */ - if (err) - { - log_error ("pcsc_get_status_change failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - return pcsc_error_to_sw (err); - } +#ifndef NEED_PCSC_WRAPPER +static int +pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen, + unsigned char *buffer, size_t *buflen, + struct pininfo_s *pininfo) +{ + long err; + struct pcsc_io_request_s send_pci; + unsigned long recv_len; - /* log_debug */ - /* ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n", */ - /* (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_CHANGED)? " changed":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_UNKNOWN)? " unknown":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_UNAVAILABLE)?" unavail":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_EMPTY)? " empty":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_PRESENT)? " present":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_ATRMATCH)? " atr":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_EXCLUSIVE)? " excl":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_INUSE)? " unuse":"", */ - /* (rdrstates[0].event_state & PCSC_STATE_MUTE)? " mute":"" ); */ + if (!reader_table[slot].atrlen + && (err = reset_pcsc_reader (slot))) + return err; - *status = 0; - if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) ) - *status |= 2; - if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) ) - *status |= 4; - /* We indicate a useful card if it is not in use by another - application. This is because we only use exclusive access - mode. */ - if ( (*status & 6) == 6 - && !(rdrstates[0].event_state & PCSC_STATE_INUSE) ) - *status |= 1; + if (DBG_CARD_IO) + log_printhex (" PCSC_data:", apdu, apdulen); - return 0; -#endif /*!NEED_PCSC_WRAPPER*/ + if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1)) + send_pci.protocol = PCSC_PROTOCOL_T1; + else + send_pci.protocol = PCSC_PROTOCOL_T0; + send_pci.pci_len = sizeof send_pci; + recv_len = *buflen; + err = pcsc_transmit (reader_table[slot].pcsc.card, + &send_pci, apdu, apdulen, + NULL, buffer, &recv_len); + *buflen = recv_len; + if (err) + log_error ("pcsc_transmit failed: %s (0x%lx)\n", + pcsc_error_string (err), err); + + return pcsc_error_to_sw (err); } +#endif /*!NEED_PCSC_WRAPPER*/ -/* Actually send the APDU of length APDULEN to SLOT and return a - maximum of *BUFLEN data in BUFFER, the actual returned size will be - set to BUFLEN. Returns: CT API error code. */ +#ifdef NEED_PCSC_WRAPPER static int -pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen, - unsigned char *buffer, size_t *buflen, - struct pininfo_s *pininfo) +pcsc_send_apdu_wrapped (int slot, unsigned char *apdu, size_t apdulen, + unsigned char *buffer, size_t *buflen, + struct pininfo_s *pininfo) { -#ifdef NEED_PCSC_WRAPPER long err; reader_table_t slotp; size_t len, full_len; @@ -1103,6 +1031,8 @@ unsigned char msgbuf[9]; int sw = SW_HOST_CARD_IO_ERROR; + (void)pininfo; + if (!reader_table[slot].atrlen && (err = reset_pcsc_reader (slot))) return err; @@ -1148,7 +1078,8 @@ goto command_failed; } len -= 4; /* Already read the error code. */ - err = (msgbuf[5] << 24) | (msgbuf[6] << 16) | (msgbuf[7] << 8 ) | msgbuf[8]; + err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16) + | (msgbuf[7] << 8 ) | msgbuf[8]); if (err) { log_error ("pcsc_transmit failed: %s (0x%lx)\n", @@ -1174,7 +1105,7 @@ err = SW_HOST_INV_VALUE; } /* We need to read any rest of the response, to keep the - protocol runnng. */ + protocol running. */ while (full_len) { unsigned char dummybuf[128]; @@ -1200,43 +1131,43 @@ slotp->pcsc.pid = (pid_t)(-1); slotp->used = 0; return sw; +} +#endif /*NEED_PCSC_WRAPPER*/ -#else /*!NEED_PCSC_WRAPPER*/ - - long err; - struct pcsc_io_request_s send_pci; - unsigned long recv_len; - if (!reader_table[slot].atrlen - && (err = reset_pcsc_reader (slot))) - return err; - - if (DBG_CARD_IO) - log_printhex (" PCSC_data:", apdu, apdulen); +/* Send the APDU of length APDULEN to SLOT and return a maximum of + *BUFLEN data in BUFFER, the actual returned size will be stored at + BUFLEN. Returns: A status word. */ +static int +pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen, + unsigned char *buffer, size_t *buflen, + struct pininfo_s *pininfo) +{ +#ifdef NEED_PCSC_WRAPPER + return pcsc_send_apdu_wrapped (slot, apdu, apdulen, buffer, buflen, pininfo); +#else + return pcsc_send_apdu_direct (slot, apdu, apdulen, buffer, buflen, pininfo); +#endif +} - if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1)) - send_pci.protocol = PCSC_PROTOCOL_T1; - else - send_pci.protocol = PCSC_PROTOCOL_T0; - send_pci.pci_len = sizeof send_pci; - recv_len = *buflen; - err = pcsc_transmit (reader_table[slot].pcsc.card, - &send_pci, apdu, apdulen, - NULL, buffer, &recv_len); - *buflen = recv_len; - if (err) - log_error ("pcsc_transmit failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - return pcsc_error_to_sw (err); -#endif /*!NEED_PCSC_WRAPPER*/ +#ifndef NEED_PCSC_WRAPPER +static int +close_pcsc_reader_direct (int slot) +{ + pcsc_release_context (reader_table[slot].pcsc.context); + xfree (reader_table[slot].rdrname); + reader_table[slot].rdrname = NULL; + reader_table[slot].used = 0; + return 0; } +#endif /*!NEED_PCSC_WRAPPER*/ +#ifdef NEED_PCSC_WRAPPER static int -close_pcsc_reader (int slot) +close_pcsc_reader_wrapped (int slot) { -#ifdef NEED_PCSC_WRAPPER long err; reader_table_t slotp; size_t len; @@ -1280,7 +1211,8 @@ goto command_failed; } len -= 4; /* Already read the error code. */ - err = (msgbuf[5] << 24) | (msgbuf[6] << 16) | (msgbuf[7] << 8 ) | msgbuf[8]; + err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16) + | (msgbuf[7] << 8 ) | msgbuf[8]); if (err) log_error ("pcsc_close failed: %s (0x%lx)\n", pcsc_error_string (err), err); @@ -1297,152 +1229,165 @@ slotp->pcsc.pid = (pid_t)(-1); slotp->used = 0; return 0; +} +#endif /*NEED_PCSC_WRAPPER*/ -#else /*!NEED_PCSC_WRAPPER*/ - pcsc_release_context (reader_table[slot].pcsc.context); - xfree (reader_table[slot].rdrname); - reader_table[slot].rdrname = NULL; - reader_table[slot].used = 0; - return 0; -#endif /*!NEED_PCSC_WRAPPER*/ +static int +close_pcsc_reader (int slot) +{ +#ifdef NEED_PCSC_WRAPPER + return close_pcsc_reader_wrapped (slot); +#else + return close_pcsc_reader_direct (slot); +#endif } -/* Note: It is a pitty that we can't return proper error codes. */ + +/* Connect a PC/SC card. */ +#ifndef NEED_PCSC_WRAPPER static int -open_pcsc_reader (const char *portstr) +connect_pcsc_card (int slot) { -#ifdef NEED_PCSC_WRAPPER -/* Open the PC/SC reader using the pcsc_wrapper program. This is - needed to cope with different thread models and other peculiarities - of libpcsclite. */ - int slot; - reader_table_t slotp; - int fd, rp[2], wp[2]; - int n, i; - pid_t pid; - size_t len; - unsigned char msgbuf[9]; - int err; - unsigned int dummy_status; - int sw = SW_HOST_CARD_IO_ERROR; + long err; - slot = new_reader_slot (); - if (slot == -1) - return -1; - slotp = reader_table + slot; + assert (slot >= 0 && slot < MAX_READER); - /* Fire up the pcsc wrapper. We don't use any fork/exec code from - the common directy but implement it direclty so that this file - may still be source copied. */ + if (reader_table[slot].pcsc.card) + return SW_HOST_ALREADY_CONNECTED; - if (pipe (rp) == -1) + reader_table[slot].atrlen = 0; + reader_table[slot].last_status = 0; + reader_table[slot].is_t0 = 0; + + err = pcsc_connect (reader_table[slot].pcsc.context, + reader_table[slot].rdrname, + PCSC_SHARE_EXCLUSIVE, + PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1, + &reader_table[slot].pcsc.card, + &reader_table[slot].pcsc.protocol); + if (err) { - log_error ("error creating a pipe: %s\n", strerror (errno)); - slotp->used = 0; - return -1; + reader_table[slot].pcsc.card = 0; + if (err != PCSC_E_NO_SMARTCARD) + log_error ("pcsc_connect failed: %s (0x%lx)\n", + pcsc_error_string (err), err); } - if (pipe (wp) == -1) + else { - log_error ("error creating a pipe: %s\n", strerror (errno)); - close (rp[0]); - close (rp[1]); - slotp->used = 0; - return -1; + char reader[250]; + unsigned long readerlen, atrlen; + unsigned long card_state, card_protocol; + + atrlen = DIM (reader_table[0].atr); + readerlen = sizeof reader -1 ; + err = pcsc_status (reader_table[slot].pcsc.card, + reader, &readerlen, + &card_state, &card_protocol, + reader_table[slot].atr, &atrlen); + if (err) + log_error ("pcsc_status failed: %s (0x%lx) %lu\n", + pcsc_error_string (err), err, readerlen); + else + { + if (atrlen > DIM (reader_table[0].atr)) + log_bug ("ATR returned by pcsc_status is too large\n"); + reader_table[slot].atrlen = atrlen; + /* If we got to here we know that a card is present + and usable. Remember this. */ + reader_table[slot].last_status = ( APDU_CARD_USABLE + | APDU_CARD_PRESENT + | APDU_CARD_ACTIVE); + reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0); + } } - pid = fork (); - if (pid == -1) + dump_reader_status (slot); + return pcsc_error_to_sw (err); +} +#endif /*!NEED_PCSC_WRAPPER*/ + + +/* Disconnect a PC/SC card. Note that this succeeds even if the card + is not connected. */ +#ifndef NEED_PCSC_WRAPPER +static int +disconnect_pcsc_card (int slot) +{ + long err; + + assert (slot >= 0 && slot < MAX_READER); + + if (!reader_table[slot].pcsc.card) + return 0; + + err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD); + if (err) { - log_error ("error forking process: %s\n", strerror (errno)); - close (rp[0]); - close (rp[1]); - close (wp[0]); - close (wp[1]); - slotp->used = 0; - return -1; + log_error ("pcsc_disconnect failed: %s (0x%lx)\n", + pcsc_error_string (err), err); + return SW_HOST_CARD_IO_ERROR; } - slotp->pcsc.pid = pid; + reader_table[slot].pcsc.card = 0; + return 0; +} +#endif /*!NEED_PCSC_WRAPPER*/ - if (!pid) - { /* - === Child === - */ - /* Double fork. */ - pid = fork (); - if (pid == -1) - _exit (31); - if (pid) - _exit (0); /* Immediate exit this parent, so that the child - gets cleaned up by the init process. */ +#ifndef NEED_PCSC_WRAPPER +static int +reset_pcsc_reader_direct (int slot) +{ + int sw; - /* Connect our pipes. */ - if (wp[0] != 0 && dup2 (wp[0], 0) == -1) - log_fatal ("dup2 stdin failed: %s\n", strerror (errno)); - if (rp[1] != 1 && dup2 (rp[1], 1) == -1) - log_fatal ("dup2 stdout failed: %s\n", strerror (errno)); + sw = disconnect_pcsc_card (slot); + if (!sw) + sw = connect_pcsc_card (slot); - /* Send stderr to the bit bucket. */ - fd = open ("/dev/null", O_WRONLY); - if (fd == -1) - log_fatal ("can't open `/dev/null': %s", strerror (errno)); - if (fd != 2 && dup2 (fd, 2) == -1) - log_fatal ("dup2 stderr failed: %s\n", strerror (errno)); + return sw; +} +#endif /*NEED_PCSC_WRAPPER*/ - /* 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; - execl (GNUPG_LIBDIR "/pcsc-wrapper", - "pcsc-wrapper", - "--", - "1", /* API version */ - opt.pcsc_driver, /* Name of the PC/SC library. */ - NULL); - _exit (31); - } +#ifdef NEED_PCSC_WRAPPER +static int +reset_pcsc_reader_wrapped (int slot) +{ + long err; + reader_table_t slotp; + size_t len; + int i, n; + unsigned char msgbuf[9]; + unsigned int dummy_status; + int sw = SW_HOST_CARD_IO_ERROR; - /* - === Parent === - */ - close (wp[0]); - close (rp[1]); - slotp->pcsc.req_fd = wp[1]; - slotp->pcsc.rsp_fd = rp[0]; + slotp = reader_table + slot; - /* Wait for the intermediate child to terminate. */ -#ifdef USE_GNU_PTH -#define WAIT pth_waitpid -#else -#define WAIT waitpid -#endif - while ( (i=WAIT (pid, NULL, 0)) == -1 && errno == EINTR) - ; -#undef X + if (slotp->pcsc.req_fd == -1 + || slotp->pcsc.rsp_fd == -1 + || slotp->pcsc.pid == (pid_t)(-1) ) + { + log_error ("pcsc_get_status: pcsc-wrapper not running\n"); + return sw; + } - /* Now send the open request. */ - msgbuf[0] = 0x01; /* OPEN command. */ - len = portstr? strlen (portstr):0; + msgbuf[0] = 0x05; /* RESET command. */ + len = 0; msgbuf[1] = (len >> 24); msgbuf[2] = (len >> 16); msgbuf[3] = (len >> 8); msgbuf[4] = (len ); - if ( writen (slotp->pcsc.req_fd, msgbuf, 5) - || (portstr && writen (slotp->pcsc.req_fd, portstr, len))) + if ( writen (slotp->pcsc.req_fd, msgbuf, 5) ) { - log_error ("error sending PC/SC OPEN request: %s\n", + log_error ("error sending PC/SC RESET request: %s\n", strerror (errno)); goto command_failed; } + /* Read the response. */ if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9) { - log_error ("error receiving PC/SC OPEN response: %s\n", + log_error ("error receiving PC/SC RESET response: %s\n", i? strerror (errno) : "premature EOF"); goto command_failed; } @@ -1457,47 +1402,41 @@ { log_error ("PC/SC returned a too large ATR (len=%lx)\n", (unsigned long)len); + sw = SW_HOST_GENERAL_ERROR; goto command_failed; } - err = (msgbuf[5] << 24) | (msgbuf[6] << 16) | (msgbuf[7] << 8 ) | msgbuf[8]; + err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16) + | (msgbuf[7] << 8 ) | msgbuf[8]); if (err) { - log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err)); + log_error ("PC/SC RESET failed: %s (0x%lx)\n", + pcsc_error_string (err), err); + /* If the error code is no smart card, we should not considere + this a major error and close the wrapper. */ sw = pcsc_error_to_sw (err); + if (err == PCSC_E_NO_SMARTCARD) + return sw; goto command_failed; } - slotp->last_status = 0; - - /* The open request may return a zero for the ATR length to + /* The open function may return a zero for the ATR length to indicate that no card is present. */ n = len; if (n) { if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n) { - log_error ("error receiving PC/SC OPEN response: %s\n", + log_error ("error receiving PC/SC RESET response: %s\n", i? strerror (errno) : "premature EOF"); goto command_failed; } - /* If we got to here we know that a card is present - and usable. Thus remember this. */ - slotp->last_status = (1|2|4| 0x8000); } slotp->atrlen = len; - reader_table[slot].close_reader = close_pcsc_reader; - reader_table[slot].reset_reader = reset_pcsc_reader; - reader_table[slot].get_status_reader = pcsc_get_status; - reader_table[slot].send_apdu_reader = pcsc_send_apdu; - reader_table[slot].check_keypad = NULL; - reader_table[slot].dump_status_reader = dump_pcsc_reader_status; - /* Read the status so that IS_T0 will be set. */ pcsc_get_status (slot, &dummy_status); - dump_reader_status (slot); - return slot; + return 0; command_failed: close (slotp->pcsc.req_fd); @@ -1507,21 +1446,42 @@ kill (slotp->pcsc.pid, SIGTERM); slotp->pcsc.pid = (pid_t)(-1); slotp->used = 0; - /* There is no way to return SW. */ - return -1; + return sw; +} +#endif /* !NEED_PCSC_WRAPPER */ + + +/* Send an PC/SC reset command and return a status word on error or 0 + on success. */ +static int +reset_pcsc_reader (int slot) +{ +#ifdef NEED_PCSC_WRAPPER + return reset_pcsc_reader_wrapped (slot); +#else + return reset_pcsc_reader_direct (slot); +#endif +} + -#else /*!NEED_PCSC_WRAPPER */ +/* Open the PC/SC reader without using the wrapper. Returns -1 on + error or a slot number for the reader. */ +#ifndef NEED_PCSC_WRAPPER +static int +open_pcsc_reader_direct (const char *portstr) +{ long err; int slot; char *list = NULL; - unsigned long nreader, listlen, atrlen; + unsigned long nreader, listlen; char *p; - unsigned long card_state, card_protocol; slot = new_reader_slot (); if (slot == -1) return -1; + /* Fixme: Allocating a context for each slot is not required. One + global context should be sufficient. */ err = pcsc_establish_context (PCSC_SCOPE_SYSTEM, NULL, NULL, &reader_table[slot].pcsc.context); if (err) @@ -1554,7 +1514,7 @@ pcsc_release_context (reader_table[slot].pcsc.context); reader_table[slot].used = 0; xfree (list); - return -1 /*pcsc_error_to_sw (err)*/; + return -1; } listlen = nreader; @@ -1577,77 +1537,254 @@ reader_table[slot].rdrname = xtrymalloc (strlen (portstr? portstr : list)+1); if (!reader_table[slot].rdrname) { - log_error ("error allocating memory for reader name\n"); - pcsc_release_context (reader_table[slot].pcsc.context); - reader_table[slot].used = 0; - return -1 /*SW_HOST_OUT_OF_CORE*/; + log_error ("error allocating memory for reader name\n"); + pcsc_release_context (reader_table[slot].pcsc.context); + reader_table[slot].used = 0; + return -1; + } + strcpy (reader_table[slot].rdrname, portstr? portstr : list); + xfree (list); + list = NULL; + + reader_table[slot].pcsc.card = 0; + reader_table[slot].atrlen = 0; + reader_table[slot].last_status = 0; + + reader_table[slot].connect_card = connect_pcsc_card; + reader_table[slot].disconnect_card = disconnect_pcsc_card; + reader_table[slot].close_reader = close_pcsc_reader; + reader_table[slot].reset_reader = reset_pcsc_reader; + reader_table[slot].get_status_reader = pcsc_get_status; + reader_table[slot].send_apdu_reader = pcsc_send_apdu; + reader_table[slot].dump_status_reader = dump_pcsc_reader_status; + + dump_reader_status (slot); + return slot; +} +#endif /*!NEED_PCSC_WRAPPER */ + + +/* Open the PC/SC reader using the pcsc_wrapper program. This is + needed to cope with different thread models and other peculiarities + of libpcsclite. */ +#ifdef NEED_PCSC_WRAPPER +static int +open_pcsc_reader_wrapped (const char *portstr) +{ + int slot; + reader_table_t slotp; + int fd, rp[2], wp[2]; + int n, i; + pid_t pid; + size_t len; + unsigned char msgbuf[9]; + int err; + unsigned int dummy_status; + int sw = SW_HOST_CARD_IO_ERROR; + /* Note that we use the constant and not the fucntion because this + code won't be be used under Windows. */ + const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper"; + + if (access (wrapperpgm, X_OK)) + { + log_error ("can't run PC/SC access module `%s': %s\n", + wrapperpgm, strerror (errno)); + return -1; + } + + slot = new_reader_slot (); + if (slot == -1) + return -1; + slotp = reader_table + slot; + + /* Fire up the PC/SCc wrapper. We don't use any fork/exec code from + the common directy but implement it directly so that this file + may still be source copied. */ + + if (pipe (rp) == -1) + { + log_error ("error creating a pipe: %s\n", strerror (errno)); + slotp->used = 0; + return -1; + } + if (pipe (wp) == -1) + { + log_error ("error creating a pipe: %s\n", strerror (errno)); + close (rp[0]); + close (rp[1]); + slotp->used = 0; + return -1; + } + + pid = fork (); + if (pid == -1) + { + log_error ("error forking process: %s\n", strerror (errno)); + close (rp[0]); + close (rp[1]); + close (wp[0]); + close (wp[1]); + slotp->used = 0; + return -1; + } + slotp->pcsc.pid = pid; + + if (!pid) + { /* + === Child === + */ + + /* Double fork. */ + pid = fork (); + if (pid == -1) + _exit (31); + if (pid) + _exit (0); /* Immediate exit this parent, so that the child + gets cleaned up by the init process. */ + + /* Connect our pipes. */ + if (wp[0] != 0 && dup2 (wp[0], 0) == -1) + log_fatal ("dup2 stdin failed: %s\n", strerror (errno)); + if (rp[1] != 1 && dup2 (rp[1], 1) == -1) + log_fatal ("dup2 stdout failed: %s\n", strerror (errno)); + + /* Send stderr to the bit bucket. */ + fd = open ("/dev/null", O_WRONLY); + if (fd == -1) + log_fatal ("can't open `/dev/null': %s", strerror (errno)); + if (fd != 2 && dup2 (fd, 2) == -1) + log_fatal ("dup2 stderr failed: %s\n", strerror (errno)); + + /* Close all other files. */ + close_all_fds (3, NULL); + + execl (wrapperpgm, + "pcsc-wrapper", + "--", + "1", /* API version */ + opt.pcsc_driver, /* Name of the PC/SC library. */ + NULL); + _exit (31); + } + + /* + === Parent === + */ + close (wp[0]); + close (rp[1]); + slotp->pcsc.req_fd = wp[1]; + slotp->pcsc.rsp_fd = rp[0]; + + /* Wait for the intermediate child to terminate. */ +#ifdef USE_GNU_PTH +#define WAIT pth_waitpid +#else +#define WAIT waitpid +#endif + while ( (i=WAIT (pid, NULL, 0)) == -1 && errno == EINTR) + ; +#undef WAIT + + /* Now send the open request. */ + msgbuf[0] = 0x01; /* OPEN command. */ + len = portstr? strlen (portstr):0; + msgbuf[1] = (len >> 24); + msgbuf[2] = (len >> 16); + msgbuf[3] = (len >> 8); + msgbuf[4] = (len ); + if ( writen (slotp->pcsc.req_fd, msgbuf, 5) + || (portstr && writen (slotp->pcsc.req_fd, portstr, len))) + { + log_error ("error sending PC/SC OPEN request: %s\n", + strerror (errno)); + goto command_failed; + } + /* Read the response. */ + if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9) + { + log_error ("error receiving PC/SC OPEN response: %s\n", + i? strerror (errno) : "premature EOF"); + goto command_failed; + } + len = (msgbuf[1] << 24) | (msgbuf[2] << 16) | (msgbuf[3] << 8 ) | msgbuf[4]; + if (msgbuf[0] != 0x81 || len < 4) + { + log_error ("invalid response header from PC/SC received\n"); + goto command_failed; + } + len -= 4; /* Already read the error code. */ + if (len > DIM (slotp->atr)) + { + log_error ("PC/SC returned a too large ATR (len=%lx)\n", + (unsigned long)len); + goto command_failed; } - strcpy (reader_table[slot].rdrname, portstr? portstr : list); - xfree (list); - list = NULL; - - err = pcsc_connect (reader_table[slot].pcsc.context, - reader_table[slot].rdrname, - PCSC_SHARE_EXCLUSIVE, - PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1, - &reader_table[slot].pcsc.card, - &reader_table[slot].pcsc.protocol); - if (err == PCSC_E_NO_SMARTCARD) - reader_table[slot].pcsc.card = 0; - else if (err) + err = PCSC_ERR_MASK ((msgbuf[5] << 24) | (msgbuf[6] << 16) + | (msgbuf[7] << 8 ) | msgbuf[8]); + if (err) { - log_error ("pcsc_connect failed: %s (0x%lx)\n", - pcsc_error_string (err), err); - pcsc_release_context (reader_table[slot].pcsc.context); - xfree (reader_table[slot].rdrname); - reader_table[slot].rdrname = NULL; - reader_table[slot].used = 0; - return -1 /*pcsc_error_to_sw (err)*/; + log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err)); + sw = pcsc_error_to_sw (err); + goto command_failed; } - reader_table[slot].atrlen = 0; - reader_table[slot].last_status = 0; - if (!err) - { - char reader[250]; - unsigned long readerlen; + slotp->last_status = 0; - atrlen = 32; - readerlen = sizeof reader -1 ; - err = pcsc_status (reader_table[slot].pcsc.card, - reader, &readerlen, - &card_state, &card_protocol, - reader_table[slot].atr, &atrlen); - if (err) - log_error ("pcsc_status failed: %s (0x%lx) %lu\n", - pcsc_error_string (err), err, readerlen); - else + /* The open request may return a zero for the ATR length to + indicate that no card is present. */ + n = len; + if (n) + { + if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n) { - if (atrlen >= DIM (reader_table[0].atr)) - log_bug ("ATR returned by pcsc_status is too large\n"); - reader_table[slot].atrlen = atrlen; - /* If we got to here we know that a card is present - and usable. Thus remember this. */ - reader_table[slot].last_status = (1|2|4| 0x8000); - reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0); + log_error ("error receiving PC/SC OPEN response: %s\n", + i? strerror (errno) : "premature EOF"); + goto command_failed; } + /* If we got to here we know that a card is present + and usable. Thus remember this. */ + slotp->last_status = ( APDU_CARD_USABLE + | APDU_CARD_PRESENT + | APDU_CARD_ACTIVE); } + slotp->atrlen = len; reader_table[slot].close_reader = close_pcsc_reader; reader_table[slot].reset_reader = reset_pcsc_reader; reader_table[slot].get_status_reader = pcsc_get_status; reader_table[slot].send_apdu_reader = pcsc_send_apdu; - reader_table[slot].check_keypad = NULL; reader_table[slot].dump_status_reader = dump_pcsc_reader_status; -/* log_debug ("state from pcsc_status: 0x%lx\n", card_state); */ -/* log_debug ("protocol from pcsc_status: 0x%lx\n", card_protocol); */ + /* Read the status so that IS_T0 will be set. */ + pcsc_get_status (slot, &dummy_status); dump_reader_status (slot); return slot; -#endif /*!NEED_PCSC_WRAPPER */ + + command_failed: + close (slotp->pcsc.req_fd); + close (slotp->pcsc.rsp_fd); + slotp->pcsc.req_fd = -1; + slotp->pcsc.rsp_fd = -1; + kill (slotp->pcsc.pid, SIGTERM); + slotp->pcsc.pid = (pid_t)(-1); + slotp->used = 0; + /* There is no way to return SW. */ + return -1; + } +#endif /*NEED_PCSC_WRAPPER*/ + +static int +open_pcsc_reader (const char *portstr) +{ +#ifdef NEED_PCSC_WRAPPER + return open_pcsc_reader_wrapped (portstr); +#else + return open_pcsc_reader_direct (portstr); +#endif +} @@ -1701,6 +1838,15 @@ static int +set_progress_cb_ccid_reader (int slot, gcry_handler_progress_t cb, void *cb_arg) +{ + reader_table_t slotp = reader_table + slot; + + return ccid_set_progress_cb (slotp->ccid.handle, cb, cb_arg); +} + + +static int get_status_ccid (int slot, unsigned int *status) { int rc; @@ -1708,12 +1854,12 @@ rc = ccid_slot_status (reader_table[slot].ccid.handle, &bits); if (rc) - return -1; + return rc; if (bits == 0) - *status = 1|2|4; + *status = (APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE); else if (bits == 1) - *status = 2; + *status = APDU_CARD_PRESENT; else *status = 0; @@ -1738,7 +1884,7 @@ return err; if (DBG_CARD_IO) - log_printhex (" APDU_data:", apdu, apdulen); + log_printhex (" raw apdu:", apdu, apdulen); maxbuflen = *buflen; if (pininfo) @@ -1809,7 +1955,9 @@ { /* If we got to here we know that a card is present and usable. Thus remember this. */ - reader_table[slot].last_status = (1|2|4| 0x8000); + reader_table[slot].last_status = (APDU_CARD_USABLE + | APDU_CARD_PRESENT + | APDU_CARD_ACTIVE); } reader_table[slot].close_reader = close_ccid_reader; @@ -1819,6 +1967,10 @@ reader_table[slot].send_apdu_reader = send_apdu_ccid; reader_table[slot].check_keypad = check_ccid_keypad; reader_table[slot].dump_status_reader = dump_ccid_reader_status; + reader_table[slot].set_progress_cb = set_progress_cb_ccid_reader; + /* Our CCID reader code does not support T=0 at all, thus reset the + flag. */ + reader_table[slot].is_t0 = 0; dump_reader_status (slot); return slot; @@ -1913,7 +2065,7 @@ rapdu_msg_release (msg); return sw; } - if (msg->datalen >= DIM (slotp->atr)) + if (msg->datalen > DIM (slotp->atr)) { log_error ("ATR returned by the RAPDU layer is too large\n"); rapdu_msg_release (msg); @@ -2094,7 +2246,7 @@ rapdu_strerror (msg->cmd)); goto failure; } - if (msg->datalen >= DIM (slotp->atr)) + if (msg->datalen > DIM (slotp->atr)) { log_error ("ATR returned by the RAPDU layer is too large\n"); goto failure; @@ -2338,6 +2490,15 @@ writefnc, writefnc_value, closefnc, closefnc_value); #else + (void)portstr; + (void)cookie; + (void)length; + (void)readfnc; + (void)readfnc_value; + (void)writefnc; + (void)writefnc_value; + (void)closefnc; + (void)closefnc_value; #ifdef _WIN32 errno = ENOENT; #else @@ -2351,21 +2512,58 @@ int apdu_close_reader (int slot) { + int sw; + if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) return SW_HOST_NO_DRIVER; + sw = apdu_disconnect (slot); + if (sw) + return sw; if (reader_table[slot].close_reader) return reader_table[slot].close_reader (slot); return SW_HOST_NOT_SUPPORTED; } + +/* Function suitable for a cleanup function to close all reader. It + should not be used if the reader will be opened again. The reason + for implementing this to properly close USB devices so that they + will startup the next time without error. */ +void +apdu_prepare_exit (void) +{ + static int sentinel; + int slot; + + if (!sentinel) + { + sentinel = 1; + for (slot = 0; slot < MAX_READER; slot++) + if (reader_table[slot].used) + { + apdu_disconnect (slot); + if (reader_table[slot].close_reader) + reader_table[slot].close_reader (slot); + reader_table[slot].used = 0; + } + sentinel = 0; + } +} + + /* Shutdown a reader; that is basically the same as a close but keeps - the handle ready for later use. A apdu_reset_header should be used - to get it active again. */ + the handle ready for later use. A apdu_reset_reader or apdu_connect + should be used to get it active again. */ int apdu_shutdown_reader (int slot) { + int sw; + if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) return SW_HOST_NO_DRIVER; + sw = apdu_disconnect (slot); + if (sw) + return sw; if (reader_table[slot].shutdown_reader) return reader_table[slot].shutdown_reader (slot); return SW_HOST_NOT_SUPPORTED; @@ -2383,6 +2581,91 @@ return 0; } + +/* Connect a card. This is used to power up the card and make sure + that an ATR is available. */ +int +apdu_connect (int slot) +{ + int sw; + + if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) + return SW_HOST_NO_DRIVER; + + /* Only if the access method provides a connect function we use it. + If not, we expect that the card has been implicitly connected by + apdu_open_reader. */ + if (reader_table[slot].connect_card) + { + sw = lock_slot (slot); + if (!sw) + { + sw = reader_table[slot].connect_card (slot); + unlock_slot (slot); + } + } + else + sw = 0; + + /* We need to call apdu_get_status_internal, so that the last-status + machinery gets setup properly even if a card is inserted while + scdaemon is fired up and apdu_get_status has not yet been called. + Without that we would force a reset of the card with the next + call to apdu_get_status. */ + apdu_get_status_internal (slot, 1, 1, NULL, NULL); + + return sw; +} + + +int +apdu_disconnect (int slot) +{ + int sw; + + if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) + return SW_HOST_NO_DRIVER; + + if (reader_table[slot].disconnect_card) + { + sw = lock_slot (slot); + if (!sw) + { + sw = reader_table[slot].disconnect_card (slot); + unlock_slot (slot); + } + } + else + sw = 0; + return sw; +} + + +/* Set the progress callback of SLOT to CB and its args to CB_ARG. If + CB is NULL the progress callback is removed. */ +int +apdu_set_progress_cb (int slot, gcry_handler_progress_t cb, void *cb_arg) +{ + int sw; + + if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) + return SW_HOST_NO_DRIVER; + + if (reader_table[slot].set_progress_cb) + { + sw = lock_slot (slot); + if (!sw) + { + sw = reader_table[slot].set_progress_cb (slot, cb, cb_arg); + unlock_slot (slot); + } + } + else + sw = 0; + return sw; +} + + /* Do a reset for the card in reader at SLOT. */ int apdu_reset (int slot) @@ -2403,7 +2686,9 @@ { /* If we got to here we know that a card is present and usable. Thus remember this. */ - reader_table[slot].last_status = (1|2|4| 0x8000); + reader_table[slot].last_status = (APDU_CARD_USABLE + | APDU_CARD_PRESENT + | APDU_CARD_ACTIVE); } unlock_slot (slot); @@ -2447,7 +2732,9 @@ { /* If we got to here we know that a card is present and usable. Thus remember this. */ - reader_table[slot].last_status = (1|2|4| 0x8000); + reader_table[slot].last_status = (APDU_CARD_USABLE + | APDU_CARD_PRESENT + | APDU_CARD_ACTIVE); } } } @@ -2458,7 +2745,6 @@ } - unsigned char * apdu_get_atr (int slot, size_t *atrlen) { @@ -2466,7 +2752,8 @@ if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) return NULL; - + if (!reader_table[slot].atrlen) + return NULL; buf = xtrymalloc (reader_table[slot].atrlen); if (!buf) return NULL; @@ -2481,20 +2768,20 @@ card to become available if HANG is set to true. On success the bits in STATUS will be set to - bit 0 = card present and usable - bit 1 = card present - bit 2 = card active - bit 3 = card access locked [not yet implemented] + APDU_CARD_USABLE (bit 0) = card present and usable + APDU_CARD_PRESENT (bit 1) = card present + APDU_CARD_ACTIVE (bit 2) = card active + (bit 3) = card access locked [not yet implemented] - For must application, testing bit 0 is sufficient. + For must applications, testing bit 0 is sufficient. CHANGED will receive the value of the counter tracking the number of card insertions. This value may be used to detect a card change. */ -int -apdu_get_status (int slot, int hang, - unsigned int *status, unsigned int *changed) +static int +apdu_get_status_internal (int slot, int hang, int no_atr_reset, + unsigned int *status, unsigned int *changed) { int sw; unsigned int s; @@ -2516,17 +2803,18 @@ return sw; } - /* Keep track of changes. We use one extra bit to test whether we - have checked the status at least once. */ - if ( s != (reader_table[slot].last_status & 0x07ff) - || !reader_table[slot].last_status ) + /* Keep track of changes. */ + if (s != reader_table[slot].last_status + || !reader_table[slot].any_status ) { reader_table[slot].change_counter++; - /* Make sure that the ATR is invalid so that a reset will be by - activate. */ - reader_table[slot].atrlen = 0; + /* Make sure that the ATR is invalid so that a reset will be + triggered by apdu_activate. */ + if (!no_atr_reset) + reader_table[slot].atrlen = 0; } - reader_table[slot].last_status = (s | 0x8000); + reader_table[slot].any_status = 1; + reader_table[slot].last_status = s; if (status) *status = s; @@ -2536,6 +2824,15 @@ } +/* See above for a description. */ +int +apdu_get_status (int slot, int hang, + unsigned int *status, unsigned int *changed) +{ + return apdu_get_status_internal (slot, hang, 0, status, changed); +} + + /* Check whether the reader supports the ISO command code COMMAND on the keypad. Return 0 on success. For a description of the pin parameters, see ccid-driver.c */ @@ -2567,85 +2864,245 @@ if (reader_table[slot].send_apdu_reader) return reader_table[slot].send_apdu_reader (slot, apdu, apdulen, - buffer, buflen, pininfo); + buffer, buflen, + pininfo); else return SW_HOST_NOT_SUPPORTED; } -/* Core APDU trabceiver function. Parameters are described at +/* Core APDU tranceiver function. Parameters are described at apdu_send_le with the exception of PININFO which indicates keypad - related operations if not NULL. */ + related operations if not NULL. If EXTENDED_MODE is not 0 + command chaining or extended length will be used according to these + values: + n < 0 := Use command chaining with the data part limited to -n + in each chunk. If -1 is used a default value is used. + n == 0 := No extended mode or command chaining. + n == 1 := Use extended length for input and output without a + length limit. + n > 1 := Use extended length with up to N bytes. + +*/ static int send_le (int slot, int class, int ins, int p0, int p1, int lc, const char *data, int le, unsigned char **retbuf, size_t *retbuflen, - struct pininfo_s *pininfo) + struct pininfo_s *pininfo, int extended_mode) { -#define RESULTLEN 256 - unsigned char result[RESULTLEN+10]; /* 10 extra in case of bugs in - the driver. */ +#define SHORT_RESULT_BUFFER_SIZE 258 + /* We allocate 8 extra bytes as a safety margin towards a driver bug. */ + unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; + unsigned char *result_buffer = NULL; + size_t result_buffer_size; + unsigned char *result; size_t resultlen; - unsigned char apdu[5+256+1]; + unsigned char short_apdu_buffer[5+256+1]; + unsigned char *apdu_buffer = NULL; + size_t apdu_buffer_size; + unsigned char *apdu; size_t apdulen; int sw; - long rc; /* we need a long here due to PC/SC. */ + long rc; /* We need a long here due to PC/SC. */ + int did_exact_length_hack = 0; + int use_chaining = 0; + int use_extended_length = 0; + int lc_chunk; if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) return SW_HOST_NO_DRIVER; if (DBG_CARD_IO) - log_debug ("send apdu: c=%02X i=%02X p0=%02X p1=%02X lc=%d le=%d\n", - class, ins, p0, p1, lc, le); + log_debug ("send apdu: c=%02X i=%02X p1=%02X p2=%02X lc=%d le=%d em=%d\n", + class, ins, p0, p1, lc, le, extended_mode); if (lc != -1 && (lc > 255 || lc < 0)) - return SW_WRONG_LENGTH; - if (le != -1 && (le > 256 || le < 0)) - return SW_WRONG_LENGTH; + { + /* Data does not fit into an APDU. What we do now depends on + the EXTENDED_MODE parameter. */ + if (!extended_mode) + return SW_WRONG_LENGTH; /* No way to send such an APDU. */ + else if (extended_mode > 0) + use_extended_length = 1; + else if (extended_mode < 0) + { + /* Send APDU using chaining mode. */ + if (lc > 16384) + return SW_WRONG_LENGTH; /* Sanity check. */ + if ((class&0xf0) != 0) + return SW_HOST_INV_VALUE; /* Upper 4 bits need to be 0. */ + use_chaining = extended_mode == -1? 255 : -extended_mode; + use_chaining &= 0xff; + } + else + return SW_HOST_INV_VALUE; + } + else if (lc == -1 && extended_mode > 0) + use_extended_length = 1; + + if (le != -1 && (le > (extended_mode > 0? 255:256) || le < 0)) + { + /* Expected Data does not fit into an APDU. What we do now + depends on the EXTENDED_MODE parameter. Note that a check + for command chaining does not make sense because we are + looking at Le. */ + if (!extended_mode) + return SW_WRONG_LENGTH; /* No way to send such an APDU. */ + else if (use_extended_length) + ; /* We are already using extended length. */ + else if (extended_mode > 0) + use_extended_length = 1; + else + return SW_HOST_INV_VALUE; + } + if ((!data && lc != -1) || (data && lc == -1)) return SW_HOST_INV_VALUE; + if (use_extended_length) + { + if (reader_table[slot].is_t0) + return SW_HOST_NOT_SUPPORTED; + + /* Space for: cls/ins/p1/p2+Z+2_byte_Lc+Lc+2_byte_Le. */ + apdu_buffer_size = 4 + 1 + (lc >= 0? (2+lc):0) + 2; + apdu_buffer = xtrymalloc (apdu_buffer_size + 10); + if (!apdu_buffer) + return SW_HOST_OUT_OF_CORE; + apdu = apdu_buffer; + } + else + { + apdu_buffer_size = sizeof short_apdu_buffer; + apdu = short_apdu_buffer; + } + + if (use_extended_length && (le > 256 || le < 0)) + { + result_buffer_size = le < 0? 4096 : le; + result_buffer = xtrymalloc (result_buffer_size + 10); + if (!result_buffer) + { + xfree (apdu_buffer); + return SW_HOST_OUT_OF_CORE; + } + result = result_buffer; + } + else + { + result_buffer_size = SHORT_RESULT_BUFFER_SIZE; + result = short_result_buffer; + } +#undef SHORT_RESULT_BUFFER_SIZE + if ((sw = lock_slot (slot))) - return sw; + { + xfree (apdu_buffer); + xfree (result_buffer); + return sw; + } - apdulen = 0; - apdu[apdulen++] = class; - apdu[apdulen++] = ins; - apdu[apdulen++] = p0; - apdu[apdulen++] = p1; - if (lc != -1) - { - apdu[apdulen++] = lc; - memcpy (apdu+apdulen, data, lc); - apdulen += lc; - /* T=0 does not allow the use of Lc together with Le; thus - disable Le in this case. */ - if (reader_table[slot].is_t0) - le = -1; + do + { + if (use_extended_length) + { + use_chaining = 0; + apdulen = 0; + apdu[apdulen++] = class; + apdu[apdulen++] = ins; + apdu[apdulen++] = p0; + apdu[apdulen++] = p1; + apdu[apdulen++] = 0; /* Z byte: Extended length marker. */ + if (lc >= 0) + { + apdu[apdulen++] = ((lc >> 8) & 0xff); + apdu[apdulen++] = (lc & 0xff); + memcpy (apdu+apdulen, data, lc); + data += lc; + apdulen += lc; + } + if (le != -1) + { + apdu[apdulen++] = ((le >> 8) & 0xff); + apdu[apdulen++] = (le & 0xff); + } + } + else + { + apdulen = 0; + apdu[apdulen] = class; + if (use_chaining && lc > 255) + { + apdu[apdulen] |= 0x10; + assert (use_chaining < 256); + lc_chunk = use_chaining; + lc -= use_chaining; + } + else + { + use_chaining = 0; + lc_chunk = lc; + } + apdulen++; + apdu[apdulen++] = ins; + apdu[apdulen++] = p0; + apdu[apdulen++] = p1; + if (lc_chunk != -1) + { + apdu[apdulen++] = lc_chunk; + memcpy (apdu+apdulen, data, lc_chunk); + data += lc_chunk; + apdulen += lc_chunk; + /* T=0 does not allow the use of Lc together with Le; + thus disable Le in this case. */ + if (reader_table[slot].is_t0) + le = -1; + } + if (le != -1 && !use_chaining) + apdu[apdulen++] = le; /* Truncation is okay (0 means 256). */ + } + + exact_length_hack: + /* As a safeguard don't pass any garbage to the driver. */ + assert (apdulen <= apdu_buffer_size); + memset (apdu+apdulen, 0, apdu_buffer_size - apdulen); + resultlen = result_buffer_size; + rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo); + if (rc || resultlen < 2) + { + log_info ("apdu_send_simple(%d) failed: %s\n", + slot, apdu_strerror (rc)); + unlock_slot (slot); + xfree (apdu_buffer); + xfree (result_buffer); + return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; + } + sw = (result[resultlen-2] << 8) | result[resultlen-1]; + if (!use_extended_length + && !did_exact_length_hack && SW_EXACT_LENGTH_P (sw)) + { + apdu[apdulen-1] = (sw & 0x00ff); + did_exact_length_hack = 1; + goto exact_length_hack; + } } - if (le != -1) - apdu[apdulen++] = le; /* Truncation is okay because 0 means 256. */ - assert (sizeof (apdu) >= apdulen); - /* As safeguard don't pass any garbage from the stack to the driver. */ - memset (apdu+apdulen, 0, sizeof (apdu) - apdulen); - resultlen = RESULTLEN; - rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo); - if (rc || resultlen < 2) + while (use_chaining && sw == SW_SUCCESS); + + if (apdu_buffer) { - log_error ("apdu_send_simple(%d) failed: %s\n", - slot, apdu_strerror (rc)); - unlock_slot (slot); - return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; + xfree (apdu_buffer); + apdu_buffer = NULL; + apdu_buffer_size = 0; } - sw = (result[resultlen-2] << 8) | result[resultlen-1]; - /* store away the returned data but strip the statusword. */ + + /* Store away the returned data but strip the statusword. */ resultlen -= 2; if (DBG_CARD_IO) { log_debug (" response: sw=%04X datalen=%d\n", sw, (unsigned int)resultlen); if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) - log_printhex (" dump: ", result, resultlen); + log_printhex (" dump: ", result, resultlen); } if (sw == SW_SUCCESS || sw == SW_EOF_REACHED) @@ -2656,6 +3113,7 @@ if (!*retbuf) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } *retbuflen = resultlen; @@ -2675,6 +3133,7 @@ if (!*retbuf) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } assert (resultlen < bufsize); @@ -2689,20 +3148,24 @@ if (DBG_CARD_IO) log_debug ("apdu_send_simple(%d): %d more bytes available\n", slot, len); + apdu_buffer_size = sizeof short_apdu_buffer; + apdu = short_apdu_buffer; apdulen = 0; apdu[apdulen++] = class; apdu[apdulen++] = 0xC0; apdu[apdulen++] = 0; apdu[apdulen++] = 0; apdu[apdulen++] = len; - memset (apdu+apdulen, 0, sizeof (apdu) - apdulen); - resultlen = RESULTLEN; + assert (apdulen <= apdu_buffer_size); + memset (apdu+apdulen, 0, apdu_buffer_size - apdulen); + resultlen = result_buffer_size; rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL); if (rc || resultlen < 2) { log_error ("apdu_send_simple(%d) for get response failed: %s\n", slot, apdu_strerror (rc)); unlock_slot (slot); + xfree (result_buffer); return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; } sw = (result[resultlen-2] << 8) | result[resultlen-1]; @@ -2728,6 +3191,7 @@ if (!tmp) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } p = tmp + (p - *retbuf); @@ -2754,63 +3218,70 @@ } unlock_slot (slot); + xfree (result_buffer); if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS) log_printhex (" dump: ", *retbuf, *retbuflen); return sw; -#undef RESULTLEN } /* Send an APDU to the card in SLOT. The APDU is created from all given parameters: CLASS, INS, P0, P1, LC, DATA, LE. A value of -1 for LC won't sent this field and the data field; in this case DATA - must also be passed as NULL. The return value is the status word - or -1 for an invalid SLOT or other non card related error. If - RETBUF is not NULL, it will receive an allocated buffer with the - returned data. The length of that data will be put into - *RETBUFLEN. The caller is reponsible for releasing the buffer even - in case of errors. */ + must also be passed as NULL. If EXTENDED_MODE is not 0 command + chaining or extended length will be used; see send_le for details. + The return value is the status word or -1 for an invalid SLOT or + other non card related error. If RETBUF is not NULL, it will + receive an allocated buffer with the returned data. The length of + that data will be put into *RETBUFLEN. The caller is reponsible + for releasing the buffer even in case of errors. */ int -apdu_send_le(int slot, int class, int ins, int p0, int p1, +apdu_send_le(int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data, int le, unsigned char **retbuf, size_t *retbuflen) { return send_le (slot, class, ins, p0, p1, lc, data, le, retbuf, retbuflen, - NULL); + NULL, extended_mode); } /* Send an APDU to the card in SLOT. The APDU is created from all given parameters: CLASS, INS, P0, P1, LC, DATA. A value of -1 for LC won't sent this field and the data field; in this case DATA must - also be passed as NULL. The return value is the status word or -1 - for an invalid SLOT or other non card related error. If RETBUF is - not NULL, it will receive an allocated buffer with the returned - data. The length of that data will be put into *RETBUFLEN. The - caller is reponsible for releasing the buffer even in case of - errors. */ + also be passed as NULL. If EXTENDED_MODE is not 0 command chaining + or extended length will be used; see send_le for details. The + return value is the status word or -1 for an invalid SLOT or other + non card related error. If RETBUF is not NULL, it will receive an + allocated buffer with the returned data. The length of that data + will be put into *RETBUFLEN. The caller is reponsible for + releasing the buffer even in case of errors. */ int -apdu_send (int slot, int class, int ins, int p0, int p1, +apdu_send (int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data, unsigned char **retbuf, size_t *retbuflen) { return send_le (slot, class, ins, p0, p1, lc, data, 256, - retbuf, retbuflen, NULL); + retbuf, retbuflen, NULL, extended_mode); } /* Send an APDU to the card in SLOT. The APDU is created from all given parameters: CLASS, INS, P0, P1, LC, DATA. A value of -1 for LC won't sent this field and the data field; in this case DATA must - also be passed as NULL. The return value is the status word or -1 - for an invalid SLOT or other non card related error. No data will be - returned. */ + also be passed as NULL. If EXTENDED_MODE is not 0 command chaining + or extended length will be used; see send_le for details. The + return value is the status word or -1 for an invalid SLOT or other + non card related error. No data will be returned. */ int -apdu_send_simple (int slot, int class, int ins, int p0, int p1, +apdu_send_simple (int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data) { - return send_le (slot, class, ins, p0, p1, lc, data, -1, NULL, NULL, NULL); + return send_le (slot, class, ins, p0, p1, lc, data, -1, NULL, NULL, NULL, + extended_mode); } @@ -2828,29 +3299,36 @@ pininfo.maxlen = pinlen_max; pininfo.padlen = pin_padlen; return send_le (slot, class, ins, p0, p1, lc, data, -1, - NULL, NULL, &pininfo); + NULL, NULL, &pininfo, 0); } /* This is a more generic version of the apdu sending routine. It takes an already formatted APDU in APDUDATA or length APDUDATALEN - and returns the with the APDU including the status word. With + and returns with an APDU including the status word. With HANDLE_MORE set to true this function will handle the MORE DATA status and return all APDUs concatenated with one status word at - the end. The function does not return a regular status word but 0 - on success. If the slot is locked, the fucntion returns - immediately.*/ + the end. If EXTENDED_LENGTH is != 0 extended lengths are allowed + with a max. result data length of EXTENDED_LENGTH bytes. The + function does not return a regular status word but 0 on success. + If the slot is locked, the function returns immediately with an + error. */ int -apdu_send_direct (int slot, const unsigned char *apdudata, size_t apdudatalen, +apdu_send_direct (int slot, size_t extended_length, + const unsigned char *apdudata, size_t apdudatalen, int handle_more, unsigned char **retbuf, size_t *retbuflen) { -#define RESULTLEN 256 - unsigned char apdu[5+256+1]; - size_t apdulen; - unsigned char result[RESULTLEN+10]; /* 10 extra in case of bugs in - the driver. */ +#define SHORT_RESULT_BUFFER_SIZE 258 + unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; + unsigned char *result_buffer = NULL; + size_t result_buffer_size; + unsigned char *result; size_t resultlen; + unsigned char short_apdu_buffer[5+256+10]; + unsigned char *apdu_buffer = NULL; + unsigned char *apdu; + size_t apdulen; int sw; long rc; /* we need a long here due to PC/SC. */ int class; @@ -2858,23 +3336,59 @@ if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used ) return SW_HOST_NO_DRIVER; - if ((sw = trylock_slot (slot))) - return sw; + if (apdudatalen > 65535) + return SW_HOST_INV_VALUE; - /* We simply trunctate a too long APDU. */ - if (apdudatalen > sizeof apdu) - apdudatalen = sizeof apdu; + if (apdudatalen > sizeof short_apdu_buffer - 5) + { + apdu_buffer = xtrymalloc (apdudatalen + 5); + if (!apdu_buffer) + return SW_HOST_OUT_OF_CORE; + apdu = apdu_buffer; + } + else + { + apdu = short_apdu_buffer; + } apdulen = apdudatalen; memcpy (apdu, apdudata, apdudatalen); class = apdulen? *apdu : 0; - resultlen = RESULTLEN; + if (extended_length >= 256 && extended_length <= 65536) + { + result_buffer_size = extended_length; + result_buffer = xtrymalloc (result_buffer_size + 10); + if (!result_buffer) + { + xfree (apdu_buffer); + return SW_HOST_OUT_OF_CORE; + } + result = result_buffer; + } + else + { + result_buffer_size = SHORT_RESULT_BUFFER_SIZE; + result = short_result_buffer; + } +#undef SHORT_RESULT_BUFFER_SIZE + + if ((sw = trylock_slot (slot))) + { + xfree (apdu_buffer); + xfree (result_buffer); + return sw; + } + + resultlen = result_buffer_size; rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL); + xfree (apdu_buffer); + apdu_buffer = NULL; if (rc || resultlen < 2) { log_error ("apdu_send_direct(%d) failed: %s\n", slot, apdu_strerror (rc)); unlock_slot (slot); + xfree (result_buffer); return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; } sw = (result[resultlen-2] << 8) | result[resultlen-1]; @@ -2901,6 +3415,7 @@ if (!*retbuf) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } assert (resultlen < bufsize); @@ -2915,20 +3430,22 @@ if (DBG_CARD_IO) log_debug ("apdu_send_direct(%d): %d more bytes available\n", slot, len); + apdu = short_apdu_buffer; apdulen = 0; apdu[apdulen++] = class; apdu[apdulen++] = 0xC0; apdu[apdulen++] = 0; apdu[apdulen++] = 0; apdu[apdulen++] = len; - memset (apdu+apdulen, 0, sizeof (apdu) - apdulen); - resultlen = RESULTLEN; + memset (apdu+apdulen, 0, sizeof (short_apdu_buffer) - apdulen); + resultlen = result_buffer_size; rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL); if (rc || resultlen < 2) { log_error ("apdu_send_direct(%d) for get response failed: %s\n", slot, apdu_strerror (rc)); unlock_slot (slot); + xfree (result_buffer); return rc ? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; } sw = (result[resultlen-2] << 8) | result[resultlen-1]; @@ -2954,6 +3471,7 @@ if (!tmp) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } p = tmp + (p - *retbuf); @@ -2964,7 +3482,7 @@ } } else - log_info ("apdu_send_sdirect(%d) " + log_info ("apdu_send_direct(%d) " "got unexpected status %04X from get response\n", slot, sw); } @@ -2986,6 +3504,7 @@ if (!*retbuf) { unlock_slot (slot); + xfree (result_buffer); return SW_HOST_OUT_OF_CORE; } *retbuflen = resultlen; @@ -2994,9 +3513,10 @@ } unlock_slot (slot); + xfree (result_buffer); - /* Append the status word - we reseved the two extra bytes while - allocating the buffer. */ + /* Append the status word. Note that we reserved the two extra + bytes while allocating the buffer. */ if (retbuf) { (*retbuf)[(*retbuflen)++] = (sw >> 8); @@ -3007,5 +3527,4 @@ log_printhex (" dump: ", *retbuf, *retbuflen); return 0; -#undef RESULTLEN } diff -Nru gnupg-1.4.9/g10/apdu.h gnupg-1.4.10/g10/apdu.h --- gnupg-1.4.9/g10/apdu.h 2007-10-23 11:40:11.000000000 +0100 +++ gnupg-1.4.10/g10/apdu.h 2009-07-21 14:21:44.000000000 +0100 @@ -1,5 +1,5 @@ /* apdu.h - ISO 7816 APDU functions and low level I/O - * Copyright (C) 2003 Free Software Foundation, Inc. + * Copyright (C) 2003, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: apdu.h 4603 2007-10-23 10:48:09Z wk $ + * $Id: apdu.h 5085 2009-07-21 14:30:13Z wk $ */ #ifndef APDU_H @@ -29,8 +29,11 @@ SW_MORE_DATA = 0x6100, /* Note: that the low byte must be masked of.*/ SW_EOF_REACHED = 0x6282, + SW_TERM_STATE = 0x6285, /* Selected file is in termination state. */ SW_EEPROM_FAILURE = 0x6581, SW_WRONG_LENGTH = 0x6700, + SW_SM_NOT_SUP = 0x6882, /* Secure Messaging is not supported. */ + SW_CC_NOT_SUP = 0x6884, /* Command Chaining is not supported. */ SW_CHV_WRONG = 0x6982, SW_CHV_BLOCKED = 0x6983, SW_USE_CONDITIONS = 0x6985, @@ -38,6 +41,7 @@ SW_NOT_SUPPORTED = 0x6a81, SW_FILE_NOT_FOUND = 0x6a82, SW_RECORD_NOT_FOUND = 0x6a83, + SW_BAD_LC = 0x6a87, /* Lc does not match command or p1/p2. */ SW_REF_NOT_FOUND = 0x6a88, SW_BAD_P0_P1 = 0x6b00, SW_EXACT_LENGTH = 0x6c00, @@ -62,13 +66,20 @@ SW_HOST_GENERAL_ERROR = 0x1000b, SW_HOST_NO_READER = 0x1000c, SW_HOST_ABORTED = 0x1000d, - SW_HOST_NO_KEYPAD = 0x1000e + SW_HOST_NO_KEYPAD = 0x1000e, + SW_HOST_ALREADY_CONNECTED = 0x1000f }; #define SW_EXACT_LENGTH_P(a) (((a)&~0xff) == SW_EXACT_LENGTH) +/* Bit flags for the card status. */ +#define APDU_CARD_USABLE (1) /* Card is present and ready for use. */ +#define APDU_CARD_PRESENT (2) /* Card is just present. */ +#define APDU_CARD_ACTIVE (4) /* Card is active. */ + + /* Note , that apdu_open_reader returns no status word but -1 on error. */ int apdu_open_reader (const char *portstr); int apdu_open_remote_reader (const char *portstr, @@ -83,13 +94,19 @@ void *closefnc_value); int apdu_shutdown_reader (int slot); int apdu_close_reader (int slot); +void apdu_prepare_exit (void); int apdu_enum_reader (int slot, int *used); unsigned char *apdu_get_atr (int slot, size_t *atrlen); const char *apdu_strerror (int rc); -/* These apdu functions do return status words. */ +/* These APDU functions return status words. */ + +int apdu_connect (int slot); +int apdu_disconnect (int slot); + +int apdu_set_progress_cb (int slot, gcry_handler_progress_t cb, void *cb_arg); int apdu_activate (int slot); int apdu_reset (int slot); @@ -97,19 +114,21 @@ unsigned int *status, unsigned int *changed); int apdu_check_keypad (int slot, int command, int pin_mode, int pinlen_min, int pinlen_max, int pin_padlen); -int apdu_send_simple (int slot, int class, int ins, int p0, int p1, +int apdu_send_simple (int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data); int apdu_send_simple_kp (int slot, int class, int ins, int p0, int p1, int lc, const char *data, int pin_mode, int pinlen_min, int pinlen_max, int pin_padlen); -int apdu_send (int slot, int class, int ins, int p0, int p1, - int lc, const char *data, +int apdu_send (int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data, unsigned char **retbuf, size_t *retbuflen); -int apdu_send_le (int slot, int class, int ins, int p0, int p1, +int apdu_send_le (int slot, int extended_mode, + int class, int ins, int p0, int p1, int lc, const char *data, int le, unsigned char **retbuf, size_t *retbuflen); -int apdu_send_direct (int slot, +int apdu_send_direct (int slot, size_t extended_length, const unsigned char *apdudata, size_t apdudatalen, int handle_more, unsigned char **retbuf, size_t *retbuflen); diff -Nru gnupg-1.4.9/g10/app-common.h gnupg-1.4.10/g10/app-common.h --- gnupg-1.4.9/g10/app-common.h 2007-10-23 11:40:11.000000000 +0100 +++ gnupg-1.4.10/g10/app-common.h 2009-07-21 14:21:44.000000000 +0100 @@ -1,5 +1,5 @@ /* app-common.h - Common declarations for all card applications - * Copyright (C) 2003, 2005 Free Software Foundation, Inc. + * Copyright (C) 2003, 2005, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: app-common.h 4603 2007-10-23 10:48:09Z wk $ + * $Id: app-common.h 5085 2009-07-21 14:30:13Z wk $ */ #ifndef GNUPG_SCD_APP_COMMON_H @@ -31,14 +31,26 @@ #endif +#define APP_CHANGE_FLAG_RESET 1 +#define APP_CHANGE_FLAG_NULLPIN 2 + + struct app_local_s; /* Defined by all app-*.c. */ struct app_ctx_s { - int initialized; /* The application has been initialied and the - function pointers may be used. Note that for - unsupported operations the particular - function pointer is set to NULL */ - int slot; /* Used reader. */ + /* Number of connections currently using this application context. + If this is not 0 the application has been initialized and the + function pointers may be used. Note that for unsupported + operations the particular function pointer is set to NULL */ + unsigned int ref_count; + + /* Flag indicating that a reset has been done for that application + and that this context is merely lingering and just should not be + reused. */ + int no_reuse; + + /* Used reader slot. */ + int slot; /* If this is used by GnuPG 1.4 we need to know the assuan context in case we need to divert the operation to an already running @@ -59,7 +71,7 @@ struct app_local_s *app_local; /* Local to the application. */ struct { void (*deinit) (app_t app); - gpg_error_t (*learn_status) (app_t app, ctrl_t ctrl); + gpg_error_t (*learn_status) (app_t app, ctrl_t ctrl, unsigned int flags); gpg_error_t (*readcert) (app_t app, const char *certid, unsigned char **cert, size_t *certlen); gpg_error_t (*readkey) (app_t app, const char *certid, @@ -85,17 +97,23 @@ void *pincb_arg, const void *indata, size_t indatalen, unsigned char **outdata, size_t *outdatalen); + gpg_error_t (*writecert) (app_t app, ctrl_t ctrl, + const char *certid, + gpg_error_t (*pincb)(void*,const char *,char **), + void *pincb_arg, + const unsigned char *data, size_t datalen); gpg_error_t (*writekey) (app_t app, ctrl_t ctrl, - const char *certid, unsigned int flags, + const char *keyid, unsigned int flags, gpg_error_t (*pincb)(void*,const char *,char **), void *pincb_arg, const unsigned char *pk, size_t pklen); gpg_error_t (*genkey) (app_t app, ctrl_t ctrl, - const char *keynostr, unsigned int flags, - gpg_error_t (*pincb)(void*, const char *, char **), - void *pincb_arg); + const char *keynostr, unsigned int flags, + time_t createtime, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg); gpg_error_t (*change_pin) (app_t app, ctrl_t ctrl, - const char *chvnostr, int reset_mode, + const char *chvnostr, unsigned int flags, gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg); gpg_error_t (*check_pin) (app_t app, const char *keyidstr, @@ -117,17 +135,23 @@ void *pincb_arg); #else /*-- app-help.c --*/ +unsigned int app_help_count_bits (const unsigned char *a, size_t len); gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip); size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff); /*-- app.c --*/ +void app_dump_state (void); +void application_notify_card_reset (int slot); +gpg_error_t check_application_conflict (ctrl_t ctrl, const char *name); gpg_error_t select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app); +char *get_supported_applications (void); void release_application (app_t app); gpg_error_t app_munge_serialno (app_t app); gpg_error_t app_get_serial_and_stamp (app_t app, char **serial, time_t *stamp); -gpg_error_t app_write_learn_status (app_t app, ctrl_t ctrl); +gpg_error_t app_write_learn_status (app_t app, ctrl_t ctrl, + unsigned int flags); gpg_error_t app_readcert (app_t app, const char *certid, unsigned char **cert, size_t *certlen); gpg_error_t app_readkey (app_t app, const char *keyid, @@ -152,15 +176,21 @@ void *pincb_arg, const void *indata, size_t indatalen, unsigned char **outdata, size_t *outdatalen ); +gpg_error_t app_writecert (app_t app, ctrl_t ctrl, + const char *certidstr, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + const unsigned char *keydata, size_t keydatalen); gpg_error_t app_writekey (app_t app, ctrl_t ctrl, const char *keyidstr, unsigned int flags, gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg, const unsigned char *keydata, size_t keydatalen); gpg_error_t app_genkey (app_t app, ctrl_t ctrl, - const char *keynostr, unsigned int flags, - gpg_error_t (*pincb)(void*, const char *, char **), - void *pincb_arg); + const char *keynostr, unsigned int flags, + time_t createtime, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg); gpg_error_t app_get_challenge (app_t app, size_t nbytes, unsigned char *buffer); gpg_error_t app_change_pin (app_t app, ctrl_t ctrl, @@ -184,6 +214,9 @@ /*-- app-p15.c --*/ gpg_error_t app_select_p15 (app_t app); +/*-- app-geldkarte.c --*/ +gpg_error_t app_select_geldkarte (app_t app); + #endif diff -Nru gnupg-1.4.9/g10/app-openpgp.c gnupg-1.4.10/g10/app-openpgp.c --- gnupg-1.4.9/g10/app-openpgp.c 2007-12-10 15:21:22.000000000 +0000 +++ gnupg-1.4.10/g10/app-openpgp.c 2009-09-02 17:18:18.000000000 +0100 @@ -1,5 +1,6 @@ /* app-openpgp.c - The OpenPGP card application. - * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005, 2007, 2008, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -16,7 +17,30 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: app-openpgp.c 4645 2007-12-10 15:34:20Z wk $ + * $Id: app-openpgp.c 5136 2009-09-02 17:30:53Z wk $ + */ + +/* Some notes: + + CHV means Card Holder Verification and is nothing else than a PIN + or password. That term seems to have been used originally with GSM + cards. Version v2 of the specs changes the term to the clearer + term PW for password. We use the terms here interchangeable + because we do not want to change existing strings i18n wise. + + Version 2 of the specs also drops the separate PW2 which was + required in v1 due to ISO requirements. It is now possible to have + one physical PW but two reference to it so that they can be + individually be verified (e.g. to implement a forced verification + for one key). Thus you will noticed the use of PW2 with the verify + command but not with change_reference_data because the latter + operates directly on the physical PW. + + The Reset Code (RC) as implemented by v2 cards uses the same error + counter as the PW2 of v1 cards. By default no RC is set and thus + that error counter is set to 0. After setting the RC the error + counter will be initialized to 3. + */ #include @@ -46,49 +70,66 @@ #include "tlv.h" +/* A table describing the DOs of the card. */ static struct { int tag; int constructed; int get_from; /* Constructed DO with this DO or 0 for direct access. */ - int binary; - int dont_cache; - int flush_on_error; - int get_immediate_in_v11; /* Enable a hack to bypass the cache of - this data object if it is used in 1.1 - and later versions of the card. This - does not work with composite DO and is - currently only useful for the CHV - status bytes. */ + int binary:1; + int dont_cache:1; + int flush_on_error:1; + int get_immediate_in_v11:1; /* Enable a hack to bypass the cache of + this data object if it is used in 1.1 + and later versions of the card. This + does not work with composite DO and + is currently only useful for the CHV + status bytes. */ + int try_extlen:1; /* Large object; try to use an extended + length APDU. */ char *desc; } data_objects[] = { - { 0x005E, 0, 0, 1, 0, 0, 0, "Login Data" }, - { 0x5F50, 0, 0, 0, 0, 0, 0, "URL" }, - { 0x0065, 1, 0, 1, 0, 0, 0, "Cardholder Related Data"}, - { 0x005B, 0, 0x65, 0, 0, 0, 0, "Name" }, - { 0x5F2D, 0, 0x65, 0, 0, 0, 0, "Language preferences" }, - { 0x5F35, 0, 0x65, 0, 0, 0, 0, "Sex" }, - { 0x006E, 1, 0, 1, 0, 0, 0, "Application Related Data" }, - { 0x004F, 0, 0x6E, 1, 0, 0, 0, "AID" }, - { 0x0073, 1, 0, 1, 0, 0, 0, "Discretionary Data Objects" }, - { 0x0047, 0, 0x6E, 1, 1, 0, 0, "Card Capabilities" }, - { 0x00C0, 0, 0x6E, 1, 1, 0, 0, "Extended Card Capabilities" }, - { 0x00C1, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Signature" }, - { 0x00C2, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Decryption" }, - { 0x00C3, 0, 0x6E, 1, 1, 0, 0, "Algorithm Attributes Authentication" }, - { 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"}, - { 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"}, + { 0x005E, 0, 0, 1, 0, 0, 0, 0, "Login Data" }, + { 0x5F50, 0, 0, 0, 0, 0, 0, 0, "URL" }, + { 0x5F52, 0, 0, 1, 0, 0, 0, 0, "Historical Bytes" }, + { 0x0065, 1, 0, 1, 0, 0, 0, 0, "Cardholder Related Data"}, + { 0x005B, 0, 0x65, 0, 0, 0, 0, 0, "Name" }, + { 0x5F2D, 0, 0x65, 0, 0, 0, 0, 0, "Language preferences" }, + { 0x5F35, 0, 0x65, 0, 0, 0, 0, 0, "Sex" }, + { 0x006E, 1, 0, 1, 0, 0, 0, 0, "Application Related Data" }, + { 0x004F, 0, 0x6E, 1, 0, 0, 0, 0, "AID" }, + { 0x0073, 1, 0, 1, 0, 0, 0, 0, "Discretionary Data Objects" }, + { 0x0047, 0, 0x6E, 1, 1, 0, 0, 0, "Card Capabilities" }, + { 0x00C0, 0, 0x6E, 1, 1, 0, 0, 0, "Extended Card Capabilities" }, + { 0x00C1, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Signature" }, + { 0x00C2, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Decryption" }, + { 0x00C3, 0, 0x6E, 1, 1, 0, 0, 0, "Algorithm Attributes Authentication" }, + { 0x00C4, 0, 0x6E, 1, 0, 1, 1, 0, "CHV Status Bytes" }, + { 0x00C5, 0, 0x6E, 1, 0, 0, 0, 0, "Fingerprints" }, + { 0x00C6, 0, 0x6E, 1, 0, 0, 0, 0, "CA Fingerprints" }, + { 0x00CD, 0, 0x6E, 1, 0, 0, 0, 0, "Generation time" }, + { 0x007A, 1, 0, 1, 0, 0, 0, 0, "Security Support Template" }, + { 0x0093, 0, 0x7A, 1, 1, 0, 0, 0, "Digital Signature Counter" }, + { 0x0101, 0, 0, 0, 0, 0, 0, 0, "Private DO 1"}, + { 0x0102, 0, 0, 0, 0, 0, 0, 0, "Private DO 2"}, + { 0x0103, 0, 0, 0, 0, 0, 0, 0, "Private DO 3"}, + { 0x0104, 0, 0, 0, 0, 0, 0, 0, "Private DO 4"}, + { 0x7F21, 1, 0, 1, 0, 0, 0, 1, "Cardholder certificate"}, { 0 } }; +/* The format of RSA private keys. */ +typedef enum + { + RSA_UNKNOWN_FMT, + RSA_STD, + RSA_STD_N, + RSA_CRT, + RSA_CRT_N + } +rsa_key_format_t; + + /* One cache item for DOs. */ struct cache_s { struct cache_s *next; @@ -111,19 +152,36 @@ encoded S-expression encoding a public key. Might be NULL if key is not available. */ - size_t keylen; /* The length of the above S-expression. Thsi - is usullay only required for corss checks + size_t keylen; /* The length of the above S-expression. This + is usually only required for cross checks because the length of an S-expression is implicitly available. */ } pk[3]; - /* Keep track of card capabilities. */ + unsigned char status_indicator; /* The card status indicator. */ + + /* Keep track of the ISO card capabilities. */ + struct + { + unsigned int cmd_chaining:1; /* Command chaining is supported. */ + unsigned int ext_lc_le:1; /* Extended Lc and Le are supported. */ + } cardcap; + + /* Keep track of extended card capabilities. */ struct { + unsigned int is_v2:1; /* This is a v2.0 compatible card. */ unsigned int get_challenge:1; unsigned int key_import:1; unsigned int change_force_chv:1; unsigned int private_dos:1; + unsigned int algo_attr_change:1; /* Algorithm attributes changeable. */ + unsigned int sm_supported:1; /* Secure Messaging is supported. */ + unsigned int sm_aes128:1; /* Use AES-128 for SM. */ + unsigned int max_certlen_3:16; + unsigned int max_get_challenge:16; /* Maximum size for get_challenge. */ + unsigned int max_cmd_data:16; /* Maximum data size for a command. */ + unsigned int max_rsp_data:16; /* Maximum size of a response. */ } extcap; /* Flags used to control the application. */ @@ -132,6 +190,16 @@ unsigned int no_sync:1; /* Do not sync CHV1 and CHV2 */ unsigned int def_chv2:1; /* Use 123456 for CHV2. */ } flags; + + struct + { + unsigned int n_bits; /* Size of the modulus in bits. The rest + of this strucuire is only valid if + this is not 0. */ + unsigned int e_bits; /* Size of the public exponent in bits. */ + rsa_key_format_t format; + } keyattr[3]; + }; @@ -140,6 +208,17 @@ static unsigned long convert_sig_counter_value (const unsigned char *value, size_t valuelen); static unsigned long get_sig_counter (app_t app); +static gpg_error_t do_auth (app_t app, const char *keyidstr, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + const void *indata, size_t indatalen, + unsigned char **outdata, size_t *outdatalen); +static void parse_algorithm_attribute (app_t app, int keyno); +static gpg_error_t change_keyattr_from_string + (app_t app, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + const void *value, size_t valuelen); @@ -173,17 +252,19 @@ /* Wrapper around iso7816_get_data which first tries to get the data from the cache. With GET_IMMEDIATE passed as true, the cache is - bypassed. */ + bypassed. With TRY_EXTLEN extended lengths APDUs are use if + supported by the card. */ static gpg_error_t get_cached_data (app_t app, int tag, unsigned char **result, size_t *resultlen, - int get_immediate) + int get_immediate, int try_extlen) { gpg_error_t err; int i; unsigned char *p; size_t len; struct cache_s *c; + int exmode; *result = NULL; *resultlen = 0; @@ -208,7 +289,12 @@ } } - err = iso7816_get_data (app->slot, tag, &p, &len); + if (try_extlen && app->app_local->cardcap.ext_lc_le) + exmode = app->app_local->extcap.max_rsp_data; + else + exmode = 0; + + err = iso7816_get_data (app->slot, exmode, tag, &p, &len); if (err) return err; *result = p; @@ -321,6 +407,7 @@ unsigned char *value; size_t valuelen; int dummyrc; + int exmode; if (!r_rc) r_rc = &dummyrc; @@ -333,7 +420,11 @@ if (app->card_version > 0x0100 && data_objects[i].get_immediate_in_v11) { - rc = iso7816_get_data (app->slot, tag, &buffer, &buflen); + if (data_objects[i].try_extlen && app->app_local->cardcap.ext_lc_le) + exmode = app->app_local->extcap.max_rsp_data; + else + exmode = 0; + rc = iso7816_get_data (app->slot, exmode, tag, &buffer, &buflen); if (rc) { *r_rc = rc; @@ -351,7 +442,8 @@ rc = get_cached_data (app, data_objects[i].get_from, &buffer, &buflen, (data_objects[i].dont_cache - || data_objects[i].get_immediate_in_v11)); + || data_objects[i].get_immediate_in_v11), + data_objects[i].try_extlen); if (!rc) { const unsigned char *s; @@ -374,7 +466,8 @@ { rc = get_cached_data (app, tag, &buffer, &buflen, (data_objects[i].dont_cache - || data_objects[i].get_immediate_in_v11)); + || data_objects[i].get_immediate_in_v11), + data_objects[i].try_extlen); if (!rc) { value = buffer; @@ -405,7 +498,9 @@ if (data_objects[i].get_from) continue; - rc = iso7816_get_data (slot, data_objects[i].tag, &buffer, &buflen); + /* We don't try extended length APDU because such large DO would + be pretty useless in a log file. */ + rc = iso7816_get_data (slot, 0, data_objects[i].tag, &buffer, &buflen); if (gpg_err_code (rc) == GPG_ERR_NO_OBJ) ; else if (rc) @@ -443,7 +538,10 @@ if (data_objects[j].binary) { log_info ("DO `%s': ", data_objects[j].desc); - log_printhex ("", value, valuelen); + if (valuelen > 200) + log_info ("[%u]\n", (unsigned int)valuelen); + else + log_printhex ("", value, valuelen); } else log_info ("DO `%s': `%.*s'\n", @@ -476,14 +574,14 @@ return n; } -/* GnuPG makes special use of the login-data DO, this fucntion parses +/* GnuPG makes special use of the login-data DO, this function parses the login data to store the flags for later use. It may be called at any time and should be called after changing the login-data DO. Everything up to a LF is considered a mailbox or account name. If the first LF is followed by DC4 (0x14) control sequence are expected up to the next LF. Control sequences are separated by FS - (0x28) and consist of key=value pairs. There is one key defined: + (0x18) and consist of key=value pairs. There is one key defined: F= @@ -547,13 +645,14 @@ /* Note, that FPR must be at least 20 bytes. */ static gpg_error_t -store_fpr (int slot, int keynumber, u32 timestamp, +store_fpr (app_t app, int keynumber, u32 timestamp, const unsigned char *m, size_t mlen, const unsigned char *e, size_t elen, unsigned char *fpr, unsigned int card_version) { unsigned int n, nbits; unsigned char *buffer, *p; + int tag, tag2; int rc; for (; mlen && !*m; mlen--, m++) /* strip leading zeroes */ @@ -564,7 +663,7 @@ n = 6 + 2 + mlen + 2 + elen; p = buffer = xtrymalloc (3 + n); if (!buffer) - return gpg_error_from_errno (errno); + return gpg_error_from_syserror (); *p++ = 0x99; /* ctb */ *p++ = n >> 8; /* 2 byte length header */ @@ -588,8 +687,12 @@ xfree (buffer); - rc = iso7816_put_data (slot, (card_version > 0x0007? 0xC7 : 0xC6) - + keynumber, fpr, 20); + tag = (card_version > 0x0007? 0xC7 : 0xC6) + keynumber; + flush_cache_item (app, tag); + tag2 = 0xCE + keynumber; + flush_cache_item (app, tag2); + + rc = iso7816_put_data (app->slot, 0, tag, fpr, 20); if (rc) log_error (_("failed to store the fingerprint: %s\n"),gpg_strerror (rc)); @@ -602,7 +705,7 @@ buf[2] = timestamp >> 8; buf[3] = timestamp; - rc = iso7816_put_data (slot, 0xCE + keynumber, buf, 4); + rc = iso7816_put_data (app->slot, 0, tag2, buf, 4); if (rc) log_error (_("failed to store the creation date: %s\n"), gpg_strerror (rc)); @@ -624,8 +727,7 @@ ; if (i==20) return; /* All zero. */ - for (i=0; i< 20; i++) - sprintf (buf+2*i, "%02X", fpr[i]); + bin2hex (fpr, 20, buf); if (number == -1) *numbuf = 0; /* Don't print the key number */ else @@ -656,10 +758,14 @@ send_key_data (ctrl_t ctrl, const char *name, const unsigned char *a, size_t alen) { - char *p, *buf = xmalloc (alen*2+1); + char *buf; - for (p=buf; alen; a++, alen--, p += 2) - sprintf (p, "%02X", *a); + buf = bin2hex (a, alen, NULL); + if (!buf) + { + log_error ("memory allocation error in send_key_data\n"); + return; + } send_status_info (ctrl, "KEY-DATA", name, (size_t)strlen(name), @@ -668,6 +774,24 @@ xfree (buf); } + +static void +send_key_attr (ctrl_t ctrl, app_t app, const char *keyword, int number) +{ + char buffer[200]; + + assert (number >=0 && number < DIM(app->app_local->keyattr)); + + /* We only support RSA thus the algo identifier is fixed to 1. */ + snprintf (buffer, sizeof buffer, "%d 1 %u %u %d", + number+1, + app->app_local->keyattr[number].n_bits, + app->app_local->keyattr[number].e_bits, + app->app_local->keyattr[number].format); + send_status_direct (ctrl, keyword, buffer); +} + + /* Implement the GETATTR command. This is similar to the LEARN command but returns just one value via the status interface. */ static gpg_error_t @@ -685,6 +809,7 @@ { "PUBKEY-URL", 0x5F50 }, { "KEY-FPR", 0x00C5, 3 }, { "KEY-TIME", 0x00CD, 4 }, + { "KEY-ATTR", 0x0000, -5 }, { "CA-FPR", 0x00C6, 3 }, { "CHV-STATUS", 0x00C4, 1 }, { "SIG-COUNTER", 0x0093, 2 }, @@ -695,6 +820,8 @@ { "PRIVATE-DO-2", 0x0102 }, { "PRIVATE-DO-3", 0x0103 }, { "PRIVATE-DO-4", 0x0104 }, + { "$AUTHKEYID", 0x0000, -3 }, + { "$DISPSERIALNO",0x0000, -4 }, { NULL, 0 } }; int idx, i, rc; @@ -731,16 +858,51 @@ } if (table[idx].special == -2) { - char tmp[50]; + char tmp[100]; - sprintf (tmp, "gc=%d ki=%d fc=%d pd=%d", - app->app_local->extcap.get_challenge, - app->app_local->extcap.key_import, - app->app_local->extcap.change_force_chv, - app->app_local->extcap.private_dos); + snprintf (tmp, sizeof tmp, + "gc=%d ki=%d fc=%d pd=%d mcl3=%u aac=%d sm=%d", + app->app_local->extcap.get_challenge, + app->app_local->extcap.key_import, + app->app_local->extcap.change_force_chv, + app->app_local->extcap.private_dos, + app->app_local->extcap.max_certlen_3, + app->app_local->extcap.algo_attr_change, + (app->app_local->extcap.sm_supported + ? (app->app_local->extcap.sm_aes128? 7 : 2) + : 0)); + send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0); + return 0; + } + if (table[idx].special == -3) + { + char const tmp[] = "OPENPGP.3"; send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0); return 0; } + if (table[idx].special == -4) + { + char *serial; + time_t stamp; + + if (!app_get_serial_and_stamp (app, &serial, &stamp)) + { + if (strlen (serial) > 16+12) + { + send_status_info (ctrl, table[idx].name, serial+16, 12, NULL, 0); + xfree (serial); + return 0; + } + xfree (serial); + } + return gpg_error (GPG_ERR_INV_NAME); + } + if (table[idx].special == -5) + { + for (i=0; i < 3; i++) + send_key_attr (ctrl, app, table[idx].name, i); + return 0; + } relptr = get_one_do (app, table[idx].tag, &value, &valuelen, &rc); if (relptr) @@ -794,16 +956,12 @@ void *relptr; unsigned char *value; size_t valuelen; - int i; assert (keyno >=0 && keyno <= 2); relptr = get_one_do (app, 0x00C5, &value, &valuelen, NULL); if (relptr && valuelen >= 60) - { - for (i = 0; i < 20; i++) - sprintf (fpr + (i * 2), "%02X", value[(keyno*20)+i]); - } + bin2hex (value+keyno*20, 20, fpr); else err = gpg_error (GPG_ERR_NOT_FOUND); xfree (relptr); @@ -834,7 +992,7 @@ size_t e_new_n = 0; /* Loop over all records until we have found the subkey - corresponsing to the fingerprint. Inm general the first record + corresponding to the fingerprint. Inm general the first record should be the pub record, but we don't rely on that. Given that we only need to look at one key, it is sufficient to compare the keyid so that we don't need to look at "fpr" records. */ @@ -853,7 +1011,7 @@ break; /* EOF. */ if (i < 0) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); goto leave; /* Error. */ } if (!max_length) @@ -947,8 +1105,8 @@ size_t buflen, keydatalen, mlen, elen; unsigned char *mbuf = NULL; unsigned char *ebuf = NULL; - unsigned char *keybuf = NULL; - unsigned char *keybuf_p; + char *keybuf = NULL; + char *keybuf_p; if (keyno < 1 || keyno > 3) return gpg_error (GPG_ERR_INV_ID); @@ -962,14 +1120,30 @@ app->app_local->pk[keyno].key = NULL; app->app_local->pk[keyno].keylen = 0; + m = e = NULL; /* (avoid cc warning) */ + if (app->card_version > 0x0100) { + int exmode, le_value; + /* We may simply read the public key out of these cards. */ - err = iso7816_read_public_key (app->slot, - keyno == 0? "\xB6" : - keyno == 1? "\xB8" : "\xA4", - 2, - &buffer, &buflen); + if (app->app_local->cardcap.ext_lc_le) + { + exmode = 1; /* Use extended length. */ + le_value = app->app_local->extcap.max_rsp_data; + } + else + { + exmode = 0; + le_value = 256; /* Use legacy value. */ + } + + err = iso7816_read_public_key + (app->slot, exmode, + (const unsigned char*)(keyno == 0? "\xB6" : + keyno == 1? "\xB8" : "\xA4"), 2, + le_value, + &buffer, &buflen); if (err) { log_error (_("reading public key failed: %s\n"), gpg_strerror (err)); @@ -1007,7 +1181,7 @@ mbuf = xtrymalloc ( mlen + 1); if (!mbuf) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); goto leave; } *mbuf = 0; @@ -1020,7 +1194,7 @@ ebuf = xtrymalloc ( elen + 1); if (!ebuf) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); goto leave; } *ebuf = 0; @@ -1057,20 +1231,20 @@ } hexkeyid = fpr + 24; - ret = asprintf (&command, - "gpg --list-keys --with-colons --with-key-data '%s'", - fpr); + ret = estream_asprintf (&command, + "gpg --list-keys --with-colons --with-key-data '%s'", + fpr); if (ret < 0) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); goto leave; } fp = popen (command, "r"); - free (command); + xfree (command); if (!fp) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); log_error ("running gpg failed: %s\n", gpg_strerror (err)); goto leave; } @@ -1091,7 +1265,7 @@ keybuf = xtrymalloc (50 + 2*35 + mlen + elen + 1); if (!keybuf) { - err = gpg_error_from_errno (errno); + err = gpg_error_from_syserror (); goto leave; } @@ -1106,7 +1280,7 @@ strcpy (keybuf_p, ")))"); keybuf_p += strlen (keybuf_p); - app->app_local->pk[keyno].key = keybuf; + app->app_local->pk[keyno].key = (unsigned char*)keybuf; app->app_local->pk[keyno].keylen = (keybuf_p - keybuf); leave: @@ -1134,7 +1308,6 @@ unsigned char grip[20]; char gripstr[41]; char idbuf[50]; - int i; err = get_public_key (app, keyno); if (err) @@ -1150,8 +1323,7 @@ if (err) goto leave; - for (i=0; i < 20; i++) - sprintf (gripstr+i*2, "%02X", grip[i]); + bin2hex (grip, 20, gripstr); sprintf (idbuf, "OPENPGP.%d", keyno); send_status_info (ctrl, "KEYPAIRINFO", @@ -1168,8 +1340,10 @@ /* Handle the LEARN command for OpenPGP. */ static gpg_error_t -do_learn_status (app_t app, ctrl_t ctrl) +do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags) { + (void)flags; + do_getattr (app, ctrl, "EXTCAP"); do_getattr (app, ctrl, "DISP-NAME"); do_getattr (app, ctrl, "DISP-LANG"); @@ -1194,6 +1368,8 @@ send_keypair_info (app, ctrl, 1); send_keypair_info (app, ctrl, 2); send_keypair_info (app, ctrl, 3); + /* Note: We do not send the Cardholder Certificate, because that is + relativly long and for OpenPGP applications not really needed. */ return 0; } @@ -1227,73 +1403,283 @@ buf = app->app_local->pk[keyno-1].key; if (!buf) return gpg_error (GPG_ERR_NO_PUBKEY); - *pk = buf; *pklen = app->app_local->pk[keyno-1].keylen;; + *pk = xtrymalloc (*pklen); + if (!*pk) + { + err = gpg_error_from_syserror (); + *pklen = 0; + return err; + } + memcpy (*pk, buf, *pklen); return 0; #else return gpg_error (GPG_ERR_NOT_IMPLEMENTED); #endif } +/* Read the standard certificate of an OpenPGP v2 card. It is + returned in a freshly allocated buffer with that address stored at + CERT and the length of the certificate stored at CERTLEN. CERTID + needs to be set to "OPENPGP.3". */ +static gpg_error_t +do_readcert (app_t app, const char *certid, + unsigned char **cert, size_t *certlen) +{ +#if GNUPG_MAJOR_VERSION > 1 + gpg_error_t err; + unsigned char *buffer; + size_t buflen; + void *relptr; + + *cert = NULL; + *certlen = 0; + if (strcmp (certid, "OPENPGP.3")) + return gpg_error (GPG_ERR_INV_ID); + if (!app->app_local->extcap.is_v2) + return gpg_error (GPG_ERR_NOT_FOUND); + relptr = get_one_do (app, 0x7F21, &buffer, &buflen, NULL); + if (!relptr) + return gpg_error (GPG_ERR_NOT_FOUND); -/* Verify CHV2 if required. Depending on the configuration of the - card CHV1 will also be verified. */ + if (!buflen) + err = gpg_error (GPG_ERR_NOT_FOUND); + else if (!(*cert = xtrymalloc (buflen))) + err = gpg_error_from_syserror (); + else + { + memcpy (*cert, buffer, buflen); + *certlen = buflen; + err = 0; + } + xfree (relptr); + return err; +#else + return gpg_error (GPG_ERR_NOT_IMPLEMENTED); +#endif +} + + +/* Verify a CHV either using using the pinentry or if possibile by + using a keypad. PINCB and PINCB_ARG describe the usual callback + for the pinentry. CHVNO must be either 1 or 2. SIGCOUNT is only + used with CHV1. PINVALUE is the address of a pointer which will + receive a newly allocated block with the actual PIN (this is useful + in case that PIN shall be used for another verify operation). The + caller needs to free this value. If the function returns with + success and NULL is stored at PINVALUE, the caller should take this + as an indication that the keypad has been used. + */ static gpg_error_t -verify_chv2 (app_t app, - gpg_error_t (*pincb)(void*, const char *, char **), - void *pincb_arg) +verify_a_chv (app_t app, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + int chvno, unsigned long sigcount, char **pinvalue) { int rc = 0; + char *prompt_buffer = NULL; + const char *prompt; + iso7816_pininfo_t pininfo; + int minlen = 6; + + assert (chvno == 1 || chvno == 2); - if (!app->did_chv2) + *pinvalue = NULL; + + if (chvno == 2 && app->app_local->flags.def_chv2) { - char *pinvalue; + /* Special case for def_chv2 mechanism. */ + if (opt.verbose) + log_info (_("using default PIN as %s\n"), "CHV2"); + rc = iso7816_verify (app->slot, 0x82, "123456", 6); + if (rc) + { + /* Verification of CHV2 with the default PIN failed, + although the card pretends to have the default PIN set as + CHV2. We better disable the def_chv2 flag now. */ + log_info (_("failed to use default PIN as %s: %s" + " - disabling further default use\n"), + "CHV2", gpg_strerror (rc)); + app->app_local->flags.def_chv2 = 0; + } + return rc; + } + + memset (&pininfo, 0, sizeof pininfo); + pininfo.mode = 1; + pininfo.minlen = minlen; + + + if (chvno == 1) + { +#define PROMPTSTRING _("||Please enter the PIN%%0A[sigs done: %lu]") + size_t promptsize = strlen (PROMPTSTRING) + 50; + + prompt_buffer = xtrymalloc (promptsize); + if (!prompt_buffer) + return gpg_error_from_syserror (); + snprintf (prompt_buffer, promptsize-1, PROMPTSTRING, sigcount); + prompt = prompt_buffer; +#undef PROMPTSTRING + } + else + prompt = _("||Please enter the PIN"); - rc = pincb (pincb_arg, "PIN", &pinvalue); + + if (!opt.disable_keypad + && !iso7816_check_keypad (app->slot, ISO7816_VERIFY, &pininfo) ) + { + /* The reader supports the verify command through the keypad. + Note that the pincb appends a text to the prompt telling the + user to use the keypad. */ + rc = pincb (pincb_arg, prompt, NULL); + prompt = NULL; + xfree (prompt_buffer); + prompt_buffer = NULL; if (rc) { - log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc)); + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); return rc; } + rc = iso7816_verify_kp (app->slot, 0x80+chvno, "", 0, &pininfo); + /* Dismiss the prompt. */ + pincb (pincb_arg, NULL, NULL); - if (strlen (pinvalue) < 6) + assert (!*pinvalue); + } + else + { + /* The reader has no keypad or we don't want to use it. */ + rc = pincb (pincb_arg, prompt, pinvalue); + prompt = NULL; + xfree (prompt_buffer); + prompt_buffer = NULL; + if (rc) + { + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); + return rc; + } + + if (strlen (*pinvalue) < minlen) { log_error (_("PIN for CHV%d is too short;" - " minimum length is %d\n"), 2, 6); - xfree (pinvalue); + " minimum length is %d\n"), chvno, minlen); + xfree (*pinvalue); + *pinvalue = NULL; return gpg_error (GPG_ERR_BAD_PIN); } - rc = iso7816_verify (app->slot, 0x82, pinvalue, strlen (pinvalue)); + rc = iso7816_verify (app->slot, 0x80+chvno, + *pinvalue, strlen (*pinvalue)); + } + + if (rc) + { + log_error (_("verify CHV%d failed: %s\n"), chvno, gpg_strerror (rc)); + xfree (*pinvalue); + *pinvalue = NULL; + flush_cache_after_error (app); + } + + return rc; +} + + +/* Verify CHV2 if required. Depending on the configuration of the + card CHV1 will also be verified. */ +static gpg_error_t +verify_chv2 (app_t app, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg) +{ + int rc; + char *pinvalue; + + if (app->did_chv2) + return 0; /* We already verified CHV2. */ + + rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue); + if (rc) + return rc; + app->did_chv2 = 1; + + if (!app->did_chv1 && !app->force_chv1 && pinvalue) + { + /* For convenience we verify CHV1 here too. We do this only if + the card is not configured to require a verification before + each CHV1 controlled operation (force_chv1) and if we are not + using the keypad (PINVALUE == NULL). */ + rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue)); + if (gpg_err_code (rc) == GPG_ERR_BAD_PIN) + rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED); if (rc) { - log_error (_("verify CHV%d failed: %s\n"), 2, gpg_strerror (rc)); - xfree (pinvalue); + log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc)); flush_cache_after_error (app); - return rc; - } - app->did_chv2 = 1; - - if (!app->did_chv1 && !app->force_chv1) - { - rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue)); - if (gpg_err_code (rc) == GPG_ERR_BAD_PIN) - rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED); - if (rc) - { - log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc)); - xfree (pinvalue); - flush_cache_after_error (app); - return rc; - } - app->did_chv1 = 1; } - xfree (pinvalue); + else + app->did_chv1 = 1; } + + xfree (pinvalue); + return rc; } + +/* Build the prompt to enter the Admin PIN. The prompt depends on the + current sdtate of the card. */ +static gpg_error_t +build_enter_admin_pin_prompt (app_t app, char **r_prompt) +{ + void *relptr; + unsigned char *value; + size_t valuelen; + int remaining; + char *prompt; + + *r_prompt = NULL; + + relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL); + if (!relptr || valuelen < 7) + { + log_error (_("error retrieving CHV status from card\n")); + xfree (relptr); + return gpg_error (GPG_ERR_CARD); + } + if (value[6] == 0) + { + log_info (_("card is permanently locked!\n")); + xfree (relptr); + return gpg_error (GPG_ERR_BAD_PIN); + } + remaining = value[6]; + xfree (relptr); + + log_info(_("%d Admin PIN attempts remaining before card" + " is permanently locked\n"), remaining); + + if (remaining < 3) + { + /* TRANSLATORS: Do not translate the "|A|" prefix but keep it at + the start of the string. Use %%0A to force a linefeed. */ + prompt = xtryasprintf (_("|A|Please enter the Admin PIN%%0A" + "[remaining attempts: %d]"), remaining); + } + else + prompt = xtrystrdup (_("|A|Please enter the Admin PIN")); + + if (!prompt) + return gpg_error_from_syserror (); + + *r_prompt = prompt; + return 0; +} + + /* Verify CHV3 if required. */ static gpg_error_t verify_chv3 (app_t app, @@ -1312,49 +1698,61 @@ if (!app->did_chv3) { - char *pinvalue; - void *relptr; - unsigned char *value; - size_t valuelen; - - relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL); - if (!relptr || valuelen < 7) - { - log_error (_("error retrieving CHV status from card\n")); - xfree (relptr); - return gpg_error (GPG_ERR_CARD); - } - if (value[6] == 0) - { - log_info (_("card is permanently locked!\n")); - xfree (relptr); - return gpg_error (GPG_ERR_BAD_PIN); - } - - log_info(_("%d Admin PIN attempts remaining before card" - " is permanently locked\n"), value[6]); - xfree (relptr); + iso7816_pininfo_t pininfo; + int minlen = 8; + char *prompt; + + memset (&pininfo, 0, sizeof pininfo); + pininfo.mode = 1; + pininfo.minlen = minlen; - /* TRANSLATORS: Do not translate the "|A|" prefix but - keep it at the start of the string. We need this elsewhere - to get some infos on the string. */ - rc = pincb (pincb_arg, _("|A|Admin PIN"), &pinvalue); + rc = build_enter_admin_pin_prompt (app, &prompt); if (rc) + return rc; + + if (!opt.disable_keypad + && !iso7816_check_keypad (app->slot, ISO7816_VERIFY, &pininfo) ) { - log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc)); - return rc; + /* The reader supports the verify command through the keypad. */ + rc = pincb (pincb_arg, prompt, NULL); + xfree (prompt); + prompt = NULL; + if (rc) + { + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); + return rc; + } + rc = iso7816_verify_kp (app->slot, 0x83, "", 0, &pininfo); + /* Dismiss the prompt. */ + pincb (pincb_arg, NULL, NULL); } - - if (strlen (pinvalue) < 8) + else { - log_error (_("PIN for CHV%d is too short;" - " minimum length is %d\n"), 3, 8); + char *pinvalue; + + rc = pincb (pincb_arg, prompt, &pinvalue); + xfree (prompt); + prompt = NULL; + if (rc) + { + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); + return rc; + } + + if (strlen (pinvalue) < minlen) + { + log_error (_("PIN for CHV%d is too short;" + " minimum length is %d\n"), 3, minlen); + xfree (pinvalue); + return gpg_error (GPG_ERR_BAD_PIN); + } + + rc = iso7816_verify (app->slot, 0x83, pinvalue, strlen (pinvalue)); xfree (pinvalue); - return gpg_error (GPG_ERR_BAD_PIN); } - - rc = iso7816_verify (app->slot, 0x83, pinvalue, strlen (pinvalue)); - xfree (pinvalue); + if (rc) { log_error (_("verify CHV%d failed: %s\n"), 3, gpg_strerror (rc)); @@ -1382,6 +1780,7 @@ int tag; int need_chv; int special; + unsigned int need_v2:1; } table[] = { { "DISP-NAME", 0x005B, 3 }, { "LOGIN-DATA", 0x005E, 3, 2 }, @@ -1396,14 +1795,23 @@ { "PRIVATE-DO-2", 0x0102, 3 }, { "PRIVATE-DO-3", 0x0103, 2 }, { "PRIVATE-DO-4", 0x0104, 3 }, + { "CERT-3", 0x7F21, 3, 0, 1 }, + { "SM-KEY-ENC", 0x00D1, 3, 0, 1 }, + { "SM-KEY-MAC", 0x00D2, 3, 0, 1 }, + { "KEY-ATTR", 0, 0, 3, 1 }, { NULL, 0 } }; - + int exmode; for (idx=0; table[idx].name && strcmp (table[idx].name, name); idx++) ; if (!table[idx].name) return gpg_error (GPG_ERR_INV_NAME); + if (table[idx].need_v2 && !app->app_local->extcap.is_v2) + return gpg_error (GPG_ERR_NOT_SUPPORTED); /* Not yet supported. */ + + if (table[idx].special == 3) + return change_keyattr_from_string (app, pincb, pincb_arg, value, valuelen); switch (table[idx].need_chv) { @@ -1423,7 +1831,14 @@ will reread the data from the card and thus get synced in case of errors (e.g. data truncated by the card). */ flush_cache_item (app, table[idx].tag); - rc = iso7816_put_data (app->slot, table[idx].tag, value, valuelen); + + if (app->app_local->cardcap.ext_lc_le && valuelen > 254) + exmode = 1; /* Use extended length w/o a limit. */ + else if (app->app_local->cardcap.cmd_chaining && valuelen > 254) + exmode = -254; /* Command chaining with max. 254 bytes. */ + else + exmode = 0; + rc = iso7816_put_data (app->slot, exmode, table[idx].tag, value, valuelen); if (rc) log_error ("failed to set `%s': %s\n", table[idx].name, gpg_strerror (rc)); @@ -1436,47 +1851,201 @@ } -/* Handle the PASSWD command. */ +/* Handle the WRITECERT command for OpenPGP. This rites the standard + certifciate to the card; CERTID needs to be set to "OPENPGP.3". + PINCB and PINCB_ARG are the usual arguments for the pinentry + callback. */ +static gpg_error_t +do_writecert (app_t app, ctrl_t ctrl, + const char *certidstr, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + const unsigned char *certdata, size_t certdatalen) +{ + (void)ctrl; +#if GNUPG_MAJOR_VERSION > 1 + if (strcmp (certidstr, "OPENPGP.3")) + return gpg_error (GPG_ERR_INV_ID); + if (!certdata || !certdatalen) + return gpg_error (GPG_ERR_INV_ARG); + if (!app->app_local->extcap.is_v2) + return gpg_error (GPG_ERR_NOT_SUPPORTED); + if (certdatalen > app->app_local->extcap.max_certlen_3) + return gpg_error (GPG_ERR_TOO_LARGE); + return do_setattr (app, "CERT-3", pincb, pincb_arg, certdata, certdatalen); +#else + return gpg_error (GPG_ERR_NOT_IMPLEMENTED); +#endif +} + + + +/* Handle the PASSWD command. The following combinations are + possible: + + Flags CHVNO Vers. Description + RESET 1 1 Verify CHV3 and set a new CHV1 and CHV2 + RESET 1 2 Verify PW3 and set a new PW1. + RESET 2 1 Verify CHV3 and set a new CHV1 and CHV2. + RESET 2 2 Verify PW3 and set a new Reset Code. + RESET 3 any Returns GPG_ERR_INV_ID. + - 1 1 Verify CHV2 and set a new CHV1 and CHV2. + - 1 2 Verify PW1 and set a new PW1. + - 2 1 Verify CHV2 and set a new CHV1 and CHV2. + - 2 2 Verify Reset Code and set a new PW1. + - 3 any Verify CHV3/PW3 and set a new CHV3/PW3. + */ static gpg_error_t -do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, int reset_mode, +do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, + unsigned int flags, gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg) { int rc = 0; int chvno = atoi (chvnostr); + char *resetcode = NULL; + char *oldpinvalue = NULL; char *pinvalue; + int reset_mode = !!(flags & APP_CHANGE_FLAG_RESET); + int set_resetcode = 0; + + (void)ctrl; if (reset_mode && chvno == 3) { rc = gpg_error (GPG_ERR_INV_ID); goto leave; } - else if (reset_mode || chvno == 3) + + if (!app->app_local->extcap.is_v2) { - /* we always require that the PIN is entered. */ - app->did_chv3 = 0; - rc = verify_chv3 (app, pincb, pincb_arg); - if (rc) - goto leave; - } - else if (chvno == 1 || chvno == 2) - { - /* CHV1 and CVH2 should always have the same value, thus we - enforce it here. */ - int save_force = app->force_chv1; + /* Version 1 cards. */ - app->force_chv1 = 0; - app->did_chv1 = 0; - app->did_chv2 = 0; - rc = verify_chv2 (app, pincb, pincb_arg); - app->force_chv1 = save_force; - if (rc) - goto leave; + if (reset_mode || chvno == 3) + { + /* We always require that the PIN is entered. */ + app->did_chv3 = 0; + rc = verify_chv3 (app, pincb, pincb_arg); + if (rc) + goto leave; + } + else if (chvno == 1 || chvno == 2) + { + /* On a v1.x card CHV1 and CVH2 should always have the same + value, thus we enforce it here. */ + int save_force = app->force_chv1; + + app->force_chv1 = 0; + app->did_chv1 = 0; + app->did_chv2 = 0; + rc = verify_chv2 (app, pincb, pincb_arg); + app->force_chv1 = save_force; + if (rc) + goto leave; + } + else + { + rc = gpg_error (GPG_ERR_INV_ID); + goto leave; + } } else { - rc = gpg_error (GPG_ERR_INV_ID); - goto leave; + /* Version 2 cards. */ + + if (reset_mode) + { + /* To reset a PIN the Admin PIN is required. */ + app->did_chv3 = 0; + rc = verify_chv3 (app, pincb, pincb_arg); + if (rc) + goto leave; + + if (chvno == 2) + set_resetcode = 1; + } + else if (chvno == 1 || chvno == 3) + { + int minlen = (chvno ==3)? 8 : 6; + char *promptbuf = NULL; + const char *prompt; + + if (chvno == 3) + { + rc = build_enter_admin_pin_prompt (app, &promptbuf); + if (rc) + goto leave; + prompt = promptbuf; + } + else + prompt = _("||Please enter the PIN"); + rc = pincb (pincb_arg, prompt, &oldpinvalue); + xfree (promptbuf); + promptbuf = NULL; + if (rc) + { + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); + goto leave; + } + + if (strlen (oldpinvalue) < minlen) + { + log_info (_("PIN for CHV%d is too short;" + " minimum length is %d\n"), chvno, minlen); + rc = gpg_error (GPG_ERR_BAD_PIN); + goto leave; + } + } + else if (chvno == 2) + { + /* There is no PW2 for v2 cards. We use this condition to + allow a PW reset using the Reset Code. */ + void *relptr; + unsigned char *value; + size_t valuelen; + int remaining; + int minlen = 8; + + relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL); + if (!relptr || valuelen < 7) + { + log_error (_("error retrieving CHV status from card\n")); + xfree (relptr); + rc = gpg_error (GPG_ERR_CARD); + goto leave; + } + remaining = value[5]; + xfree (relptr); + if (!remaining) + { + log_error (_("Reset Code not or not anymore available\n")); + rc = gpg_error (GPG_ERR_BAD_PIN); + goto leave; + } + + rc = pincb (pincb_arg, + _("||Please enter the Reset Code for the card"), + &resetcode); + if (rc) + { + log_info (_("PIN callback returned error: %s\n"), + gpg_strerror (rc)); + goto leave; + } + if (strlen (resetcode) < minlen) + { + log_info (_("Reset Code is too short; minimum length is %d\n"), + minlen); + rc = gpg_error (GPG_ERR_BAD_PIN); + goto leave; + } + } + else + { + rc = gpg_error (GPG_ERR_INV_ID); + goto leave; + } } if (chvno == 3) @@ -1487,7 +2056,9 @@ /* 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? _("|AN|New Admin PIN") : _("|N|New PIN"), + rc = pincb (pincb_arg, + set_resetcode? _("|RN|New Reset Code") : + chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"), &pinvalue); if (rc) { @@ -1495,16 +2066,45 @@ goto leave; } - if (reset_mode) + + if (resetcode) + { + char *buffer; + + buffer = xtrymalloc (strlen (resetcode) + strlen (pinvalue) + 1); + if (!buffer) + rc = gpg_error_from_syserror (); + else + { + strcpy (stpcpy (buffer, resetcode), pinvalue); + rc = iso7816_reset_retry_counter_with_rc (app->slot, 0x81, + buffer, strlen (buffer)); + wipememory (buffer, strlen (buffer)); + xfree (buffer); + } + } + else if (set_resetcode) + { + if (strlen (pinvalue) < 8) + { + log_error (_("Reset Code is too short; minimum length is %d\n"), 8); + rc = gpg_error (GPG_ERR_BAD_PIN); + } + else + rc = iso7816_put_data (app->slot, 0, 0xD3, + pinvalue, strlen (pinvalue)); + } + else if (reset_mode) { rc = iso7816_reset_retry_counter (app->slot, 0x81, pinvalue, strlen (pinvalue)); - if (!rc) + if (!rc && !app->app_local->extcap.is_v2) rc = iso7816_reset_retry_counter (app->slot, 0x82, pinvalue, strlen (pinvalue)); } - else + else if (!app->app_local->extcap.is_v2) { + /* Version 1 cards. */ if (chvno == 1 || chvno == 2) { rc = iso7816_change_reference_data (app->slot, 0x81, NULL, 0, @@ -1513,24 +2113,51 @@ rc = iso7816_change_reference_data (app->slot, 0x82, NULL, 0, pinvalue, strlen (pinvalue)); } - else - rc = iso7816_change_reference_data (app->slot, 0x80 + chvno, NULL, 0, - pinvalue, strlen (pinvalue)); + else /* CHVNO == 3 */ + { + rc = iso7816_change_reference_data (app->slot, 0x80 + chvno, NULL, 0, + pinvalue, strlen (pinvalue)); + } + } + else + { + /* Version 2 cards. */ + assert (chvno == 1 || chvno == 3); + + rc = iso7816_change_reference_data (app->slot, 0x80 + chvno, + oldpinvalue, strlen (oldpinvalue), + pinvalue, strlen (pinvalue)); + } + + if (pinvalue) + { + wipememory (pinvalue, strlen (pinvalue)); + xfree (pinvalue); } - xfree (pinvalue); if (rc) flush_cache_after_error (app); leave: + if (resetcode) + { + wipememory (resetcode, strlen (resetcode)); + xfree (resetcode); + } + if (oldpinvalue) + { + wipememory (oldpinvalue, strlen (oldpinvalue)); + xfree (oldpinvalue); + } return rc; } /* Check whether a key already exists. KEYIDX is the index of the key (0..2). If FORCE is TRUE a diagnositic will be printed but no - error returned if the key already exists. */ + error returned if the key already exists. The flag GENERATING is + only used to print correct messages. */ static gpg_error_t -does_key_exist (app_t app, int keyidx, int force) +does_key_exist (app_t app, int keyidx, int generating, int force) { const unsigned char *fpr; unsigned char *buffer; @@ -1539,7 +2166,7 @@ assert (keyidx >=0 && keyidx <= 2); - if (iso7816_get_data (app->slot, 0x006E, &buffer, &buflen)) + if (iso7816_get_data (app->slot, 0, 0x006E, &buffer, &buflen)) { log_error (_("error reading application data\n")); return gpg_error (GPG_ERR_GENERAL); @@ -1562,12 +2189,269 @@ } else if (i!=20) log_info (_("existing key will be replaced\n")); - else + else if (generating) log_info (_("generating new key\n")); + else + log_info (_("writing new key\n")); + return 0; +} + + +/* Create a TLV tag and value and store it at BUFFER. Return the length + of tag and length. A LENGTH greater than 65535 is truncated. */ +static size_t +add_tlv (unsigned char *buffer, unsigned int tag, size_t length) +{ + unsigned char *p = buffer; + + assert (tag <= 0xffff); + if ( tag > 0xff ) + *p++ = tag >> 8; + *p++ = tag; + if (length < 128) + *p++ = length; + else if (length < 256) + { + *p++ = 0x81; + *p++ = length; + } + else + { + if (length > 0xffff) + length = 0xffff; + *p++ = 0x82; + *p++ = length >> 8; + *p++ = length; + } + + return p - buffer; +} + + +/* Build the private key template as specified in the OpenPGP specs + v2.0 section 4.3.3.7. */ +static gpg_error_t +build_privkey_template (app_t app, int keyno, + const unsigned char *rsa_n, size_t rsa_n_len, + const unsigned char *rsa_e, size_t rsa_e_len, + const unsigned char *rsa_p, size_t rsa_p_len, + const unsigned char *rsa_q, size_t rsa_q_len, + unsigned char **result, size_t *resultlen) +{ + size_t rsa_e_reqlen; + unsigned char privkey[7*(1+3)]; + size_t privkey_len; + unsigned char exthdr[2+2+3]; + size_t exthdr_len; + unsigned char suffix[2+3]; + size_t suffix_len; + unsigned char *tp; + size_t datalen; + unsigned char *template; + size_t template_size; + + *result = NULL; + *resultlen = 0; + + switch (app->app_local->keyattr[keyno].format) + { + case RSA_STD: + case RSA_STD_N: + break; + case RSA_CRT: + case RSA_CRT_N: + return gpg_error (GPG_ERR_NOT_SUPPORTED); + + default: + return gpg_error (GPG_ERR_INV_VALUE); + } + + /* Get the required length for E. */ + rsa_e_reqlen = app->app_local->keyattr[keyno].e_bits/8; + assert (rsa_e_len <= rsa_e_reqlen); + + /* Build the 7f48 cardholder private key template. */ + datalen = 0; + tp = privkey; + + tp += add_tlv (tp, 0x91, rsa_e_reqlen); + datalen += rsa_e_reqlen; + + tp += add_tlv (tp, 0x92, rsa_p_len); + datalen += rsa_p_len; + + tp += add_tlv (tp, 0x93, rsa_q_len); + datalen += rsa_q_len; + + if (app->app_local->keyattr[keyno].format == RSA_STD_N + || app->app_local->keyattr[keyno].format == RSA_CRT_N) + { + tp += add_tlv (tp, 0x97, rsa_n_len); + datalen += rsa_n_len; + } + privkey_len = tp - privkey; + + /* Build the extended header list without the private key template. */ + tp = exthdr; + *tp++ = keyno ==0 ? 0xb6 : keyno == 1? 0xb8 : 0xa4; + *tp++ = 0; + tp += add_tlv (tp, 0x7f48, privkey_len); + exthdr_len = tp - exthdr; + + /* Build the 5f48 suffix of the data. */ + tp = suffix; + tp += add_tlv (tp, 0x5f48, datalen); + suffix_len = tp - suffix; + + /* Now concatenate everything. */ + template_size = (1 + 3 /* 0x4d and len. */ + + exthdr_len + + privkey_len + + suffix_len + + datalen); + tp = template = xtrymalloc_secure (template_size); + if (!template) + return gpg_error_from_syserror (); + + tp += add_tlv (tp, 0x4d, exthdr_len + privkey_len + suffix_len + datalen); + memcpy (tp, exthdr, exthdr_len); + tp += exthdr_len; + memcpy (tp, privkey, privkey_len); + tp += privkey_len; + memcpy (tp, suffix, suffix_len); + tp += suffix_len; + + memcpy (tp, rsa_e, rsa_e_len); + if (rsa_e_len < rsa_e_reqlen) + { + /* Right justify E. */ + memmove (tp + rsa_e_reqlen - rsa_e_len, tp, rsa_e_len); + memset (tp, 0, rsa_e_reqlen - rsa_e_len); + } + tp += rsa_e_reqlen; + + memcpy (tp, rsa_p, rsa_p_len); + tp += rsa_p_len; + + memcpy (tp, rsa_q, rsa_q_len); + tp += rsa_q_len; + + if (app->app_local->keyattr[keyno].format == RSA_STD_N + || app->app_local->keyattr[keyno].format == RSA_CRT_N) + { + memcpy (tp, rsa_n, rsa_n_len); + tp += rsa_n_len; + } + + /* Sanity check. We don't know the exact length because we + allocated 3 bytes for the first length header. */ + assert (tp - template <= template_size); + + *result = template; + *resultlen = tp - template; return 0; } +/* Helper for do_writekley to change the size of a key. Not ethat + this deletes the entire key without asking. */ +static gpg_error_t +change_keyattr (app_t app, int keyno, unsigned int nbits, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg) +{ + gpg_error_t err; + unsigned char *buffer; + size_t buflen; + void *relptr; + + assert (keyno >=0 && keyno <= 2); + + if (nbits > 3072) + return gpg_error (GPG_ERR_TOO_LARGE); + + /* Read the current attributes into a buffer. */ + relptr = get_one_do (app, 0xC1+keyno, &buffer, &buflen, NULL); + if (!relptr) + return gpg_error (GPG_ERR_CARD); + if (buflen < 6 || buffer[0] != 1) + { + /* Attriutes too short or not an RSA key. */ + xfree (relptr); + return gpg_error (GPG_ERR_CARD); + } + + /* We only change n_bits and don't touch anything else. Before we + do so, we round up NBITS to a sensible way in the same way as + gpg's key generation does it. This may help to sort out problems + with a few bits too short keys. */ + nbits = ((nbits + 31) / 32) * 32; + buffer[1] = (nbits >> 8); + buffer[2] = nbits; + + /* Prepare for storing the key. */ + err = verify_chv3 (app, pincb, pincb_arg); + if (err) + { + xfree (relptr); + return err; + } + + /* Change the attribute. */ + err = iso7816_put_data (app->slot, 0, 0xC1+keyno, buffer, buflen); + xfree (relptr); + if (err) + log_error ("error changing size of key %d to %u bits\n", keyno+1, nbits); + else + log_info ("size of key %d changed to %u bits\n", keyno+1, nbits); + flush_cache (app); + parse_algorithm_attribute (app, keyno); + app->did_chv1 = 0; + app->did_chv2 = 0; + app->did_chv3 = 0; + return err; +} + + +/* Helper to process an setattr command for name KEY-ATTR. It expects + a string "--force " in (VALUE,VALUELEN). */ +static gpg_error_t +change_keyattr_from_string (app_t app, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg, + const void *value, size_t valuelen) +{ + gpg_error_t err; + char *string; + int keyno, algo; + unsigned int nbits; + + /* VALUE is expected to be a string but not guaranteed to be + terminated. Thus copy it to an allocated buffer first. */ + string = xtrymalloc (valuelen+1); + if (!string) + return gpg_error_from_syserror (); + memcpy (string, value, valuelen); + string[valuelen] = 0; + + /* Because this function deletes the key we require the string + "--force" in the data to make clear that something serious might + happen. */ + if (sscanf (string, " --force %d %d %u", &keyno, &algo, &nbits) != 3) + err = gpg_error (GPG_ERR_INV_DATA); + else if (keyno < 1 || keyno > 3) + err = gpg_error (GPG_ERR_INV_ID); + else if (algo != 1) + err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Not RSA. */ + else if (nbits < 1024) + err = gpg_error (GPG_ERR_TOO_SHORT); + else + err = change_keyattr (app, keyno-1, nbits, pincb, pincb_arg); + + xfree (string); + return err; +} + /* Handle the WRITEKEY command for OpenPGP. This function expects a canonical encoded S-expression with the secret key in KEYDATA and @@ -1595,12 +2479,15 @@ const unsigned char *rsa_q = NULL; size_t rsa_n_len, rsa_e_len, rsa_p_len, rsa_q_len; unsigned int nbits; + unsigned int maxbits; unsigned char *template = NULL; unsigned char *tp; size_t template_len; unsigned char fprbuf[20]; u32 created_at = 0; + (void)ctrl; + if (!strcmp (keyid, "OPENPGP.1")) keyno = 0; else if (!strcmp (keyid, "OPENPGP.2")) @@ -1610,7 +2497,7 @@ else return gpg_error (GPG_ERR_INV_ID); - err = does_key_exist (app, keyno, force); + err = does_key_exist (app, keyno, 0, force); if (err) return err; @@ -1734,99 +2621,153 @@ err = gpg_error (GPG_ERR_INV_VALUE); goto leave; } + + maxbits = app->app_local->keyattr[keyno].n_bits; nbits = rsa_n? count_bits (rsa_n, rsa_n_len) : 0; - if (nbits != 1024) + if (opt.verbose) + log_info ("RSA modulus size is %u bits (%u bytes)\n", + nbits, (unsigned int)rsa_n_len); + if (nbits && nbits != maxbits + && app->app_local->extcap.algo_attr_change) + { + /* Try to switch the key to a new length. */ + err = change_keyattr (app, keyno, nbits, pincb, pincb_arg); + if (!err) + maxbits = app->app_local->keyattr[keyno].n_bits; + } + if (nbits != maxbits) { - log_error (_("RSA modulus missing or not of size %d bits\n"), 1024); + log_error (_("RSA modulus missing or not of size %d bits\n"), + (int)maxbits); err = gpg_error (GPG_ERR_BAD_SECKEY); goto leave; } + + maxbits = app->app_local->keyattr[keyno].e_bits; + if (maxbits > 32 && !app->app_local->extcap.is_v2) + maxbits = 32; /* Our code for v1 does only support 32 bits. */ nbits = rsa_e? count_bits (rsa_e, rsa_e_len) : 0; - if (nbits < 2 || nbits > 32) + if (nbits < 2 || nbits > maxbits) { log_error (_("RSA public exponent missing or larger than %d bits\n"), - 32); + (int)maxbits); err = gpg_error (GPG_ERR_BAD_SECKEY); goto leave; } + + maxbits = app->app_local->keyattr[keyno].n_bits/2; nbits = rsa_p? count_bits (rsa_p, rsa_p_len) : 0; - if (nbits != 512) + if (nbits != maxbits) { - log_error (_("RSA prime %s missing or not of size %d bits\n"), "P", 512); + log_error (_("RSA prime %s missing or not of size %d bits\n"), + "P", (int)maxbits); err = gpg_error (GPG_ERR_BAD_SECKEY); goto leave; } nbits = rsa_q? count_bits (rsa_q, rsa_q_len) : 0; - if (nbits != 512) + if (nbits != maxbits) { - log_error (_("RSA prime %s missing or not of size %d bits\n"), "Q", 512); + log_error (_("RSA prime %s missing or not of size %d bits\n"), + "Q", (int)maxbits); err = gpg_error (GPG_ERR_BAD_SECKEY); goto leave; } - - /* Build the private key template as described in section 4.3.3.6 of - the OpenPGP card specs: - 0xC0 public exponent - 0xC1 prime p - 0xC2 prime q - */ - assert (rsa_e_len <= 4); - template_len = (1 + 1 + 4 - + 1 + 1 + rsa_p_len - + 1 + 1 + rsa_q_len); - template = tp = xtrymalloc_secure (template_len); - if (!template) - { - err = gpg_error_from_errno (errno); - goto leave; - } - *tp++ = 0xC0; - *tp++ = 4; - memcpy (tp, rsa_e, rsa_e_len); - if (rsa_e_len < 4) - { - /* Right justify E. */ - memmove (tp+4-rsa_e_len, tp, rsa_e_len); - memset (tp, 0, 4-rsa_e_len); - } - tp += 4; - - *tp++ = 0xC1; - *tp++ = rsa_p_len; - memcpy (tp, rsa_p, rsa_p_len); - tp += rsa_p_len; - - *tp++ = 0xC2; - *tp++ = rsa_q_len; - memcpy (tp, rsa_q, rsa_q_len); - tp += rsa_q_len; - - assert (tp - template == template_len); - - - /* Obviously we need to remove the cached public key. */ + /* We need to remove the cached public key. */ xfree (app->app_local->pk[keyno].key); app->app_local->pk[keyno].key = NULL; app->app_local->pk[keyno].keylen = 0; app->app_local->pk[keyno].read_done = 0; - /* Prepare for storing the key. */ - err = verify_chv3 (app, pincb, pincb_arg); - if (err) - goto leave; - /* Store the key. */ - err = iso7816_put_data (app->slot, - (app->card_version > 0x0007? 0xE0 : 0xE9) + keyno, - template, template_len); + if (app->app_local->extcap.is_v2) + { + /* Build the private key template as described in section 4.3.3.7 of + the OpenPGP card specs version 2.0. */ + int exmode; + + err = build_privkey_template (app, keyno, + rsa_n, rsa_n_len, + rsa_e, rsa_e_len, + rsa_p, rsa_p_len, + rsa_q, rsa_q_len, + &template, &template_len); + if (err) + goto leave; + + /* Prepare for storing the key. */ + err = verify_chv3 (app, pincb, pincb_arg); + if (err) + goto leave; + + /* Store the key. */ + if (app->app_local->cardcap.ext_lc_le && template_len > 254) + exmode = 1; /* Use extended length w/o a limit. */ + else if (app->app_local->cardcap.cmd_chaining && template_len > 254) + exmode = -254; + else + exmode = 0; + err = iso7816_put_data_odd (app->slot, exmode, 0x3fff, + template, template_len); + } + else + { + /* Build the private key template as described in section 4.3.3.6 of + the OpenPGP card specs version 1.1: + 0xC0 public exponent + 0xC1 prime p + 0xC2 prime q + */ + assert (rsa_e_len <= 4); + template_len = (1 + 1 + 4 + + 1 + 1 + rsa_p_len + + 1 + 1 + rsa_q_len); + template = tp = xtrymalloc_secure (template_len); + if (!template) + { + err = gpg_error_from_syserror (); + goto leave; + } + *tp++ = 0xC0; + *tp++ = 4; + memcpy (tp, rsa_e, rsa_e_len); + if (rsa_e_len < 4) + { + /* Right justify E. */ + memmove (tp+4-rsa_e_len, tp, rsa_e_len); + memset (tp, 0, 4-rsa_e_len); + } + tp += 4; + + *tp++ = 0xC1; + *tp++ = rsa_p_len; + memcpy (tp, rsa_p, rsa_p_len); + tp += rsa_p_len; + + *tp++ = 0xC2; + *tp++ = rsa_q_len; + memcpy (tp, rsa_q, rsa_q_len); + tp += rsa_q_len; + + assert (tp - template == template_len); + + /* Prepare for storing the key. */ + err = verify_chv3 (app, pincb, pincb_arg); + if (err) + goto leave; + + /* Store the key. */ + err = iso7816_put_data (app->slot, 0, + (app->card_version > 0x0007? 0xE0:0xE9)+keyno, + template, template_len); + } if (err) { log_error (_("failed to store the key: %s\n"), gpg_strerror (err)); goto leave; } - err = store_fpr (app->slot, keyno, created_at, + err = store_fpr (app, keyno, created_at, rsa_n, rsa_n_len, rsa_e, rsa_e_len, fprbuf, app->card_version); if (err) @@ -1842,8 +2783,9 @@ /* Handle the GENKEY command. */ static gpg_error_t do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags, - gpg_error_t (*pincb)(void*, const char *, char **), - void *pincb_arg) + time_t createtime, + gpg_error_t (*pincb)(void*, const char *, char **), + void *pincb_arg) { int rc; char numbuf[30]; @@ -1855,6 +2797,9 @@ int keyno = atoi (keynostr); int force = (flags & 1); time_t start_at; + int exmode; + int le_value; + unsigned int keybits; if (keyno < 1 || keyno > 3) return gpg_error (GPG_ERR_INV_ID); @@ -1871,28 +2816,49 @@ app->app_local->pk[keyno].read_done = 0; /* Check whether a key already exists. */ - rc = does_key_exist (app, keyno, force); + rc = does_key_exist (app, keyno, 1, force); if (rc) return rc; - /* Prepare for key generation by verifying the ADmin PIN. */ + /* Because we send the key parameter back via status lines we need + to put a limit on the max. allowed keysize. 2048 bit will + already lead to a 527 byte long status line and thus a 4096 bit + key would exceed the Assuan line length limit. */ + keybits = app->app_local->keyattr[keyno].n_bits; + if (keybits > 3072) + return gpg_error (GPG_ERR_TOO_LARGE); + + /* Prepare for key generation by verifying the Admin PIN. */ rc = verify_chv3 (app, pincb, pincb_arg); if (rc) goto leave; - -#if 1 + + /* Test whether we will need extended length mode. (1900 is an + arbitrary length which for sure fits into a short apdu.) */ + if (app->app_local->cardcap.ext_lc_le && keybits > 1900) + { + exmode = 1; /* Use extended length w/o a limit. */ + le_value = app->app_local->extcap.max_rsp_data; + /* No need to check le_value because it comes from a 16 bit + value and thus can't create an overflow on a 32 bit + system. */ + } + else + { + exmode = 0; + le_value = 256; /* Use legacy value. */ + } + log_info (_("please wait while key is being generated ...\n")); start_at = time (NULL); rc = iso7816_generate_keypair -#else -#warning key generation temporary replaced by reading an existing key. - rc = iso7816_read_public_key -#endif - (app->slot, - keyno == 0? "\xB6" : - keyno == 1? "\xB8" : "\xA4", - 2, - &buffer, &buflen); +/* # warning key generation temporary replaced by reading an existing key. */ +/* rc = iso7816_read_public_key */ + (app->slot, exmode, + (const unsigned char*)(keyno == 0? "\xB6" : + keyno == 1? "\xB8" : "\xA4"), 2, + le_value, + &buffer, &buflen); if (rc) { rc = gpg_error (GPG_ERR_CARD); @@ -1901,6 +2867,7 @@ } log_info (_("key generation completed (%d seconds)\n"), (int)(time (NULL) - start_at)); + keydata = find_tlv (buffer, buflen, 0x7F49, &keydatalen); if (!keydata) { @@ -1916,7 +2883,7 @@ log_error (_("response does not contain the RSA modulus\n")); goto leave; } -/* log_printhex ("RSA n:", m, mlen); */ + /* log_printhex ("RSA n:", m, mlen); */ send_key_data (ctrl, "n", m, mlen); e = find_tlv (keydata, keydatalen, 0x0082, &elen); @@ -1926,15 +2893,15 @@ log_error (_("response does not contain the RSA public exponent\n")); goto leave; } -/* log_printhex ("RSA e:", e, elen); */ + /* log_printhex ("RSA e:", e, elen); */ send_key_data (ctrl, "e", e, elen); - created_at = gnupg_get_time (); + created_at = createtime? createtime : gnupg_get_time (); sprintf (numbuf, "%lu", (unsigned long)created_at); send_status_info (ctrl, "KEY-CREATED-AT", numbuf, (size_t)strlen(numbuf), NULL, 0); - rc = store_fpr (app->slot, keyno, (u32)created_at, + rc = store_fpr (app, keyno, (u32)created_at, m, mlen, e, elen, fprbuf, app->card_version); if (rc) goto leave; @@ -1988,7 +2955,7 @@ assert (keyno >= 1 && keyno <= 3); - rc = get_cached_data (app, 0x006E, &buffer, &buflen, 0); + rc = get_cached_data (app, 0x006E, &buffer, &buflen, 0, 0); if (rc) { log_error (_("error reading application data\n")); @@ -2006,6 +2973,7 @@ if (sha1fpr[i] != fpr[i]) { xfree (buffer); + log_info (_("fingerprint on card does not match requested one\n")); return gpg_error (GPG_ERR_WRONG_SECKEY); } xfree (buffer); @@ -2013,11 +2981,11 @@ } - /* If a fingerprint has been specified check it against the one on - the card. This is allows for a meaningful error message in case - the key on the card has been replaced but the shadow information - known to gpg was not updated. If there is no fingerprint we - assume that this is okay. */ +/* If a fingerprint has been specified check it against the one on the + card. This allows for a meaningful error message in case the key + on the card has been replaced but the shadow information known to + gpg has not been updated. If there is no fingerprint we assume + that this is okay. */ static gpg_error_t check_against_given_fingerprint (app_t app, const char *fpr, int keyno) { @@ -2045,10 +3013,14 @@ raw message digest. For this application the KEYIDSTR consists of the serialnumber and the fingerprint delimited by a slash. - Note that this fucntion may return the error code + Note that this function may return the error code GPG_ERR_WRONG_CARD to indicate that the card currently present does not match the one required for the requested action (e.g. the - serial number does not match). */ + serial number does not match). + + As a special feature a KEYIDSTR of "OPENPGP.3" redirects the + operation to the auth command. +*/ static gpg_error_t do_sign (app_t app, const char *keyidstr, int hashalgo, gpg_error_t (*pincb)(void*, const char *, char **), @@ -2056,59 +3028,102 @@ const void *indata, size_t indatalen, unsigned char **outdata, size_t *outdatalen ) { - static unsigned char sha1_prefix[15] = /* Object ID is 1.3.14.3.2.26 */ - { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, - 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 }; static unsigned char rmd160_prefix[15] = /* Object ID is 1.3.36.3.2.1 */ - { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, - 0x02, 0x01, 0x05, 0x00, 0x04, 0x14 }; + { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03, + 0x02, 0x01, 0x05, 0x00, 0x04, 0x14 }; + static unsigned char sha1_prefix[15] = /* (1.3.14.3.2.26) */ + { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, + 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 }; + static unsigned char sha224_prefix[19] = /* (2.16.840.1.101.3.4.2.4) */ + { 0x30, 0x2D, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, + 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, + 0x1C }; + static unsigned char sha256_prefix[19] = /* (2.16.840.1.101.3.4.2.1) */ + { 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, + 0x00, 0x04, 0x20 }; + static unsigned char sha384_prefix[19] = /* (2.16.840.1.101.3.4.2.2) */ + { 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, + 0x00, 0x04, 0x30 }; + static unsigned char sha512_prefix[19] = /* (2.16.840.1.101.3.4.2.3) */ + { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, + 0x00, 0x04, 0x40 }; int rc; - unsigned char data[35]; - unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */ + unsigned char data[19+64]; + size_t datalen; + unsigned char tmp_sn[20]; /* Actually 16 bytes but also for the fpr. */ const char *s; int n; const char *fpr = NULL; unsigned long sigcount; + int use_auth = 0; + int exmode, le_value; if (!keyidstr || !*keyidstr) return gpg_error (GPG_ERR_INV_VALUE); + + /* Strip off known prefixes. */ +#define X(a,b,c,d) \ + if (hashalgo == GCRY_MD_ ## a \ + && (d) \ + && indatalen == sizeof b ## _prefix + (c) \ + && !memcmp (indata, b ## _prefix, sizeof b ## _prefix)) \ + { \ + indata = (const char*)indata + sizeof b ## _prefix; \ + indatalen -= sizeof b ## _prefix; \ + } + if (indatalen == 20) - ; - else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_SHA1 - && !memcmp (indata, sha1_prefix, 15)) - ; - else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_RMD160 - && !memcmp (indata, rmd160_prefix, 15)) - ; + ; /* Assume a plain SHA-1 or RMD160 digest has been given. */ + else X(SHA1, sha1, 20, 1) + else X(RMD160, rmd160, 20, 1) + else X(SHA224, sha224, 28, app->app_local->extcap.is_v2) + else X(SHA256, sha256, 32, app->app_local->extcap.is_v2) + else X(SHA384, sha384, 48, app->app_local->extcap.is_v2) + else X(SHA512, sha512, 64, app->app_local->extcap.is_v2) + else if ((indatalen == 28 || indatalen == 32 + || indatalen == 48 || indatalen ==64) + && app->app_local->extcap.is_v2) + ; /* Assume a plain SHA-3 digest has been given. */ else { - log_error(_("card does not support digest algorithm %s\n"), - digest_algo_to_string(hashalgo)); + log_error (_("card does not support digest algorithm %s\n"), + gcry_md_algo_name (hashalgo)); + /* Or the supplied digest length does not match an algorithm. */ return gpg_error (GPG_ERR_INV_VALUE); } +#undef X /* Check whether an OpenPGP card of any version has been requested. */ - if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12)) - return gpg_error (GPG_ERR_INV_ID); - - for (s=keyidstr, n=0; hexdigitp (s); s++, n++) + if (!strcmp (keyidstr, "OPENPGP.1")) ; - if (n != 32) + else if (!strcmp (keyidstr, "OPENPGP.3")) + use_auth = 1; + else if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12)) return gpg_error (GPG_ERR_INV_ID); - else if (!*s) - ; /* no fingerprint given: we allow this for now. */ - else if (*s == '/') - fpr = s + 1; else - return gpg_error (GPG_ERR_INV_ID); + { + for (s=keyidstr, n=0; hexdigitp (s); s++, n++) + ; + if (n != 32) + return gpg_error (GPG_ERR_INV_ID); + else if (!*s) + ; /* no fingerprint given: we allow this for now. */ + else if (*s == '/') + fpr = s + 1; + else + return gpg_error (GPG_ERR_INV_ID); - for (s=keyidstr, n=0; n < 16; s += 2, n++) - tmp_sn[n] = xtoi_2 (s); + for (s=keyidstr, n=0; n < 16; s += 2, n++) + tmp_sn[n] = xtoi_2 (s); - if (app->serialnolen != 16) - return gpg_error (GPG_ERR_INV_CARD); - if (memcmp (app->serialno, tmp_sn, 16)) - return gpg_error (GPG_ERR_WRONG_CARD); + if (app->serialnolen != 16) + return gpg_error (GPG_ERR_INV_CARD); + if (memcmp (app->serialno, tmp_sn, 16)) + return gpg_error (GPG_ERR_WRONG_CARD); + } /* If a fingerprint has been specified check it against the one on the card. This is allows for a meaningful error message in case @@ -2120,59 +3135,56 @@ if (rc) return rc; - if (hashalgo == GCRY_MD_SHA1) - memcpy (data, sha1_prefix, 15); - else if (hashalgo == GCRY_MD_RMD160) - memcpy (data, rmd160_prefix, 15); + /* Concatenate prefix and digest. */ +#define X(a,b,d) \ + if (hashalgo == GCRY_MD_ ## a && (d) ) \ + { \ + datalen = sizeof b ## _prefix + indatalen; \ + assert (datalen <= sizeof data); \ + memcpy (data, b ## _prefix, sizeof b ## _prefix); \ + memcpy (data + sizeof b ## _prefix, indata, indatalen); \ + } + + X(SHA1, sha1, 1) + else X(RMD160, rmd160, 1) + else X(SHA224, sha224, app->app_local->extcap.is_v2) + else X(SHA256, sha256, app->app_local->extcap.is_v2) + else X(SHA384, sha384, app->app_local->extcap.is_v2) + else X(SHA512, sha512, app->app_local->extcap.is_v2) else return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); - memcpy (data+15, indata, indatalen); +#undef X + /* Redirect to the AUTH command if asked to. */ + if (use_auth) + { + return do_auth (app, "OPENPGP.3", pincb, pincb_arg, + data, datalen, + outdata, outdatalen); + } + + /* Show the number of signature done using this key. */ sigcount = get_sig_counter (app); log_info (_("signatures created so far: %lu\n"), sigcount); + /* Check CHV if needed. */ if (!app->did_chv1 || app->force_chv1 ) { char *pinvalue; - { - char *prompt; -#define PROMPTSTRING _("||Please enter the PIN%%0A[sigs done: %lu]") - - prompt = malloc (strlen (PROMPTSTRING) + 50); - if (!prompt) - return gpg_error_from_errno (errno); - sprintf (prompt, PROMPTSTRING, sigcount); - rc = pincb (pincb_arg, prompt, &pinvalue); - free (prompt); -#undef PROMPTSTRING - } + rc = verify_a_chv (app, pincb, pincb_arg, 1, sigcount, &pinvalue); if (rc) - { - log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc)); - return rc; - } + return rc; - if (strlen (pinvalue) < 6) - { - log_error (_("PIN for CHV%d is too short;" - " minimum length is %d\n"), 1, 6); - xfree (pinvalue); - return gpg_error (GPG_ERR_BAD_PIN); - } - - rc = iso7816_verify (app->slot, 0x81, pinvalue, strlen (pinvalue)); - if (rc) - { - log_error (_("verify CHV%d failed: %s\n"), 1, gpg_strerror (rc)); - xfree (pinvalue); - flush_cache_after_error (app); - return rc; - } app->did_chv1 = 1; - if (!app->did_chv2) + + /* For cards with versions < 2 we want to keep CHV1 and CHV2 in + sync, thus we verify CHV2 here using the given PIN. Cards + with version2 to not have the need for a separate CHV2 and + internally use just one. Obviously we can't do that if the + keypad has been used. */ + if (!app->did_chv2 && pinvalue && !app->app_local->extcap.is_v2) { - /* We should also verify CHV2. */ rc = iso7816_verify (app->slot, 0x82, pinvalue, strlen (pinvalue)); if (gpg_err_code (rc) == GPG_ERR_BAD_PIN) rc = gpg_error (GPG_ERR_PIN_NOT_SYNCED); @@ -2188,7 +3200,19 @@ xfree (pinvalue); } - rc = iso7816_compute_ds (app->slot, data, 35, outdata, outdatalen); + + if (app->app_local->cardcap.ext_lc_le) + { + exmode = 1; /* Use extended length. */ + le_value = app->app_local->extcap.max_rsp_data; + } + else + { + exmode = 0; + le_value = 0; + } + rc = iso7816_compute_ds (app->slot, exmode, data, datalen, le_value, + outdata, outdatalen); return rc; } @@ -2198,7 +3222,7 @@ fingerprint delimited by a slash. Optionally the id OPENPGP.3 may be given. - Note that this fucntion may return the error code + Note that this function may return the error code GPG_ERR_WRONG_CARD to indicate that the card currently present does not match the one required for the requested action (e.g. the serial number does not match). */ @@ -2210,14 +3234,14 @@ unsigned char **outdata, size_t *outdatalen ) { int rc; - unsigned char tmp_sn[20]; /* actually 16 but we use it also for the fpr. */ + unsigned char tmp_sn[20]; /* Actually 16 but we use it also for the fpr. */ const char *s; int n; const char *fpr = NULL; if (!keyidstr || !*keyidstr) return gpg_error (GPG_ERR_INV_VALUE); - if (indatalen > 50) /* For a 1024 bit key. */ + if (indatalen > 101) /* For a 2048 bit key. */ return gpg_error (GPG_ERR_INV_VALUE); /* Check whether an OpenPGP card of any version has been requested. */ @@ -2259,8 +3283,23 @@ rc = verify_chv2 (app, pincb, pincb_arg); if (!rc) - rc = iso7816_internal_authenticate (app->slot, indata, indatalen, - outdata, outdatalen); + { + int exmode, le_value; + + if (app->app_local->cardcap.ext_lc_le) + { + exmode = 1; /* Use extended length. */ + le_value = app->app_local->extcap.max_rsp_data; + } + else + { + exmode = 0; + le_value = 0; + } + rc = iso7816_internal_authenticate (app->slot, exmode, + indata, indatalen, le_value, + outdata, outdatalen); + } return rc; } @@ -2277,38 +3316,43 @@ const char *s; int n; const char *fpr = NULL; + int exmode, le_value; if (!keyidstr || !*keyidstr || !indatalen) return gpg_error (GPG_ERR_INV_VALUE); /* Check whether an OpenPGP card of any version has been requested. */ - if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12)) - return gpg_error (GPG_ERR_INV_ID); - - for (s=keyidstr, n=0; hexdigitp (s); s++, n++) + if (!strcmp (keyidstr, "OPENPGP.2")) ; - if (n != 32) + else if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12)) return gpg_error (GPG_ERR_INV_ID); - else if (!*s) - ; /* no fingerprint given: we allow this for now. */ - else if (*s == '/') - fpr = s + 1; else - return gpg_error (GPG_ERR_INV_ID); - - for (s=keyidstr, n=0; n < 16; s += 2, n++) - tmp_sn[n] = xtoi_2 (s); - - if (app->serialnolen != 16) - return gpg_error (GPG_ERR_INV_CARD); - if (memcmp (app->serialno, tmp_sn, 16)) - return gpg_error (GPG_ERR_WRONG_CARD); + { + for (s=keyidstr, n=0; hexdigitp (s); s++, n++) + ; + if (n != 32) + return gpg_error (GPG_ERR_INV_ID); + else if (!*s) + ; /* no fingerprint given: we allow this for now. */ + else if (*s == '/') + fpr = s + 1; + else + return gpg_error (GPG_ERR_INV_ID); + + for (s=keyidstr, n=0; n < 16; s += 2, n++) + tmp_sn[n] = xtoi_2 (s); + + if (app->serialnolen != 16) + return gpg_error (GPG_ERR_INV_CARD); + if (memcmp (app->serialno, tmp_sn, 16)) + return gpg_error (GPG_ERR_WRONG_CARD); + } /* If a fingerprint has been specified check it against the one on the card. This is allows for a meaningful error message in case the key on the card has been replaced but the shadow information known to gpg was not updated. If there is no fingerprint, the - decryption will won't produce the right plaintext anyway. */ + decryption won't produce the right plaintext anyway. */ rc = fpr? check_against_given_fingerprint (app, fpr, 2) : 0; if (rc) return rc; @@ -2317,6 +3361,8 @@ if (!rc) { size_t fixuplen; + unsigned char *fixbuf = NULL; + int padind = 0; /* We might encounter a couple of leading zeroes in the cryptogram. Due to internal use of MPIs thease leading @@ -2327,35 +3373,50 @@ probability anyway broken. */ if (indatalen >= (128-16) && indatalen < 128) /* 1024 bit key. */ fixuplen = 128 - indatalen; - else if (indatalen >= (256-16) && indatalen < 256) /* 2048 bit key. */ - fixuplen = 256 - indatalen; else if (indatalen >= (192-16) && indatalen < 192) /* 1536 bit key. */ fixuplen = 192 - indatalen; + else if (indatalen >= (256-16) && indatalen < 256) /* 2048 bit key. */ + fixuplen = 256 - indatalen; + else if (indatalen >= (384-16) && indatalen < 384) /* 3072 bit key. */ + fixuplen = 384 - indatalen; else fixuplen = 0; + if (fixuplen) { - unsigned char *fixbuf; - /* While we have to prepend stuff anyway, we can also include the padding byte here so that iso1816_decipher - does not need to do yet another data mangling. */ + does not need to do another data mangling. */ fixuplen++; + fixbuf = xtrymalloc (fixuplen + indatalen); if (!fixbuf) - rc = gpg_error_from_syserror (); - else - { - memset (fixbuf, 0, fixuplen); - memcpy (fixbuf+fixuplen, indata, indatalen); - rc = iso7816_decipher (app->slot, fixbuf, fixuplen+indatalen, -1, - outdata, outdatalen); - xfree (fixbuf); - } + return gpg_error_from_syserror (); + + memset (fixbuf, 0, fixuplen); + memcpy (fixbuf+fixuplen, indata, indatalen); + indata = fixbuf; + indatalen = fixuplen + indatalen; + padind = -1; /* Already padded. */ + } + + if (app->app_local->cardcap.ext_lc_le && indatalen > 254 ) + { + exmode = 1; /* Extended length w/o a limit. */ + le_value = app->app_local->extcap.max_rsp_data; + } + else if (app->app_local->cardcap.cmd_chaining && indatalen > 254) + { + exmode = -254; /* Command chaining with max. 254 bytes. */ + le_value = 0; } else - rc = iso7816_decipher (app->slot, indata, indatalen, 0, - outdata, outdatalen); + exmode = le_value = 0; + + rc = iso7816_decipher (app->slot, exmode, + indata, indatalen, le_value, padind, + outdata, outdatalen); + xfree (fixbuf); } return rc; @@ -2452,7 +3513,141 @@ } +/* Show information about card capabilities. */ +static void +show_caps (struct app_local_s *s) +{ + log_info ("Version-2 ......: %s\n", s->extcap.is_v2? "yes":"no"); + log_info ("Get-Challenge ..: %s", s->extcap.get_challenge? "yes":"no"); + if (s->extcap.get_challenge) + log_printf (" (%u bytes max)", s->extcap.max_get_challenge); + log_info ("Key-Import .....: %s\n", s->extcap.key_import? "yes":"no"); + log_info ("Change-Force-PW1: %s\n", s->extcap.change_force_chv? "yes":"no"); + log_info ("Private-DOs ....: %s\n", s->extcap.private_dos? "yes":"no"); + log_info ("Algo-Attr-Change: %s\n", s->extcap.algo_attr_change? "yes":"no"); + log_info ("SM-Support .....: %s", s->extcap.sm_supported? "yes":"no"); + if (s->extcap.sm_supported) + log_printf (" (%s)", s->extcap.sm_aes128? "AES-128":"3DES"); + log_info ("Max-Cert3-Len ..: %u\n", s->extcap.max_certlen_3); + log_info ("Max-Cmd-Data ...: %u\n", s->extcap.max_cmd_data); + log_info ("Max-Rsp-Data ...: %u\n", s->extcap.max_rsp_data); + log_info ("Cmd-Chaining ...: %s\n", s->cardcap.cmd_chaining?"yes":"no"); + log_info ("Ext-Lc-Le ......: %s\n", s->cardcap.ext_lc_le?"yes":"no"); + log_info ("Status Indicator: %02X\n", s->status_indicator); + + log_info ("GnuPG-No-Sync ..: %s\n", s->flags.no_sync? "yes":"no"); + log_info ("GnuPG-Def-PW2 ..: %s\n", s->flags.def_chv2? "yes":"no"); +} + + +/* Parse the historical bytes in BUFFER of BUFLEN and store them in + APPLOC. */ +static void +parse_historical (struct app_local_s *apploc, + const unsigned char * buffer, size_t buflen) +{ + /* Example buffer: 00 31 C5 73 C0 01 80 00 90 00 */ + if (buflen < 4) + { + log_error ("warning: historical bytes are too short\n"); + return; /* Too short. */ + } + if (*buffer) + { + log_error ("warning: bad category indicator in historical bytes\n"); + return; + } + + /* Skip category indicator. */ + buffer++; + buflen--; + + /* Get the status indicator. */ + apploc->status_indicator = buffer[buflen-3]; + buflen -= 3; + + /* Parse the compact TLV. */ + while (buflen) + { + unsigned int tag = (*buffer & 0xf0) >> 4; + unsigned int len = (*buffer & 0x0f); + if (len+1 > buflen) + { + log_error ("warning: bad Compact-TLV in historical bytes\n"); + return; /* Error. */ + } + buffer++; + buflen--; + if (tag == 7 && len == 3) + { + /* Card capabilities. */ + apploc->cardcap.cmd_chaining = !!(buffer[2] & 0x80); + apploc->cardcap.ext_lc_le = !!(buffer[2] & 0x40); + } + buffer += len; + buflen -= len; + } +} + + +/* Parse and optionally show the algorithm attributes for KEYNO. + KEYNO must be in the range 0..2. */ +static void +parse_algorithm_attribute (app_t app, int keyno) +{ + unsigned char *buffer; + size_t buflen; + void *relptr; + const char const desc[3][5] = {"sign", "encr", "auth"}; + assert (keyno >=0 && keyno <= 2); + + app->app_local->keyattr[keyno].n_bits = 0; + + relptr = get_one_do (app, 0xC1+keyno, &buffer, &buflen, NULL); + if (!relptr) + { + log_error ("error reading DO 0x%02X\n", 0xc1+keyno); + return; + } + if (buflen < 1) + { + log_error ("error reading DO 0x%02X\n", 0xc1+keyno); + xfree (relptr); + return; + } + + if (opt.verbose) + log_info ("Key-Attr-%s ..: ", desc[keyno]); + if (*buffer == 1 && (buflen == 5 || buflen == 6)) + { + app->app_local->keyattr[keyno].n_bits = (buffer[1]<<8 | buffer[2]); + app->app_local->keyattr[keyno].e_bits = (buffer[3]<<8 | buffer[4]); + app->app_local->keyattr[keyno].format = 0; + if (buflen < 6) + app->app_local->keyattr[keyno].format = RSA_STD; + else + app->app_local->keyattr[keyno].format = (buffer[5] == 0? RSA_STD : + buffer[5] == 1? RSA_STD_N : + buffer[5] == 2? RSA_CRT : + buffer[5] == 3? RSA_CRT_N : + RSA_UNKNOWN_FMT); + + if (opt.verbose) + log_printf + ("RSA, n=%u, e=%u, fmt=%s\n", + app->app_local->keyattr[keyno].n_bits, + app->app_local->keyattr[keyno].e_bits, + app->app_local->keyattr[keyno].format == RSA_STD? "std" : + app->app_local->keyattr[keyno].format == RSA_STD_N?"std+n": + app->app_local->keyattr[keyno].format == RSA_CRT? "crt" : + app->app_local->keyattr[keyno].format == RSA_CRT_N?"crt+n":"?"); + } + else if (opt.verbose) + log_printhex ("", buffer, buflen); + + xfree (relptr); +} /* Select the OpenPGP application on the card in SLOT. This function must be used before any other OpenPGP application functions. */ @@ -2466,7 +3661,9 @@ size_t buflen; void *relptr; - rc = iso7816_select_application (slot, aid, sizeof aid); + /* Note that the card can't cope with P2=0xCO, thus we need to pass a + special flag value. */ + rc = iso7816_select_application (slot, aid, sizeof aid, 0x0001); if (!rc) { unsigned int manufacturer; @@ -2483,7 +3680,7 @@ replace a possibly already set one from a EF.GDO with this one. Note, that for current OpenPGP cards, no EF.GDO exists and thus it won't matter at all. */ - rc = iso7816_get_data (slot, 0x004F, &buffer, &buflen); + rc = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen); if (rc) goto leave; if (opt.verbose) @@ -2507,6 +3704,24 @@ goto leave; } + if (app->card_version >= 0x0200) + app->app_local->extcap.is_v2 = 1; + + + /* Read the historical bytes. */ + relptr = get_one_do (app, 0x5f52, &buffer, &buflen, NULL); + if (relptr) + { + if (opt.verbose) + { + log_info ("Historical Bytes: "); + log_printhex ("", buffer, buflen); + } + parse_historical (app->app_local, buffer, buflen); + xfree (relptr); + } + + /* Read the force-chv1 flag. */ relptr = get_one_do (app, 0x00C4, &buffer, &buflen, NULL); if (!relptr) { @@ -2517,6 +3732,7 @@ app->force_chv1 = (buflen && *buffer == 0); xfree (relptr); + /* Read the extended capabilities. */ relptr = get_one_do (app, 0x00C0, &buffer, &buflen, NULL); if (!relptr) { @@ -2526,13 +3742,25 @@ } if (buflen) { + app->app_local->extcap.sm_supported = !!(*buffer & 0x80); app->app_local->extcap.get_challenge = !!(*buffer & 0x40); app->app_local->extcap.key_import = !!(*buffer & 0x20); app->app_local->extcap.change_force_chv = !!(*buffer & 0x10); app->app_local->extcap.private_dos = !!(*buffer & 0x08); + app->app_local->extcap.algo_attr_change = !!(*buffer & 0x04); + } + if (buflen >= 10) + { + /* Available with v2 cards. */ + app->app_local->extcap.sm_aes128 = (buffer[1] == 1); + app->app_local->extcap.max_get_challenge + = (buffer[2] << 8 | buffer[3]); + app->app_local->extcap.max_certlen_3 = (buffer[4] << 8 | buffer[5]); + app->app_local->extcap.max_cmd_data = (buffer[6] << 8 | buffer[7]); + app->app_local->extcap.max_rsp_data = (buffer[8] << 8 | buffer[9]); } xfree (relptr); - + /* Some of the first cards accidently don't set the CHANGE_FORCE_CHV bit but allow it anyway. */ if (app->card_version <= 0x0100 && manufacturer == 1) @@ -2540,14 +3768,23 @@ parse_login_data (app); + if (opt.verbose) + show_caps (app->app_local); + + parse_algorithm_attribute (app, 0); + parse_algorithm_attribute (app, 1); + parse_algorithm_attribute (app, 2); + if (opt.verbose > 1) dump_all_do (slot); app->fnc.deinit = do_deinit; app->fnc.learn_status = do_learn_status; + app->fnc.readcert = do_readcert; app->fnc.readkey = do_readkey; app->fnc.getattr = do_getattr; app->fnc.setattr = do_setattr; + app->fnc.writecert = do_writecert; app->fnc.writekey = do_writekey; app->fnc.genkey = do_genkey; app->fnc.sign = do_sign; diff -Nru gnupg-1.4.9/g10/cardglue.c gnupg-1.4.10/g10/cardglue.c --- gnupg-1.4.9/g10/cardglue.c 2007-10-23 08:50:33.000000000 +0100 +++ gnupg-1.4.10/g10/cardglue.c 2009-08-13 09:14:39.000000000 +0100 @@ -1,5 +1,5 @@ /* cardglue.c - mainly dispatcher for card related functions. - * Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -190,6 +190,37 @@ va_end (arg_ptr); } +/* Send a ready formatted status line via assuan. */ +void +send_status_direct (ctrl_t ctrl, const char *keyword, const char *args) +{ + char buf[950]; + + if (strchr (args, '\n')) + log_error ("error: LF detected in status line - not sending\n"); + else + { + snprintf (buf, sizeof buf, "%s%s%s", + keyword, args? " ":"", args? args:""); + if (ctrl && ctrl->status_cb) + ctrl->status_cb (ctrl->status_cb_arg, buf); + } +} + + + +void +gcry_mpi_release (MPI a) +{ + mpi_free (a); +} + +MPI +gcry_mpi_set_opaque (MPI a, void *p, unsigned int len) +{ + return mpi_set_opaque (a, p, len); +} + /* Replacement function of the Libgcrypt onewhich is used in gnupg 1.9. Thus function computes the digest of ALGO from the data in @@ -208,6 +239,17 @@ } +/* This function simply returns the name of the algorithm or some + constant string when there is no algo. It will never return + NULL. */ +const char * +gcry_md_algo_name (int algorithm) +{ + const char *s = digest_algo_to_string (algorithm); + return s ? s : "?"; +} + + /* This is a limited version of the one in 1.9 but it should be sufficient here. */ void @@ -297,6 +339,7 @@ return; xfree (info->serialno); info->serialno = NULL; + xfree (info->apptype); info->apptype = NULL; xfree (info->disp_name); info->disp_name = NULL; xfree (info->disp_lang); info->disp_lang = NULL; xfree (info->pubkey_url); info->pubkey_url = NULL; @@ -339,7 +382,7 @@ if (!ctx) return NULL; - /* Request the serialbnumber of the card. If we get + /* Request the serialnumber of the card. If we get NOT_SUPPORTED or NO_SCDAEMON back, the gpg-agent either has disabled scdaemon or it can't be used. We close the connection in this case and use our own code. This may happen if just the @@ -395,7 +438,7 @@ if (app) goto ready; /* Yes, there is a agent with a usable card, go that way. */ if (scd_available) - return NULL; /* agent avilabale but card problem. */ + return NULL; /* Agent available but card problem. */ } @@ -448,7 +491,7 @@ } ready: - app->initialized = 1; + app->ref_count = 1; current_app = app; if (is_status_enabled () ) { @@ -629,6 +672,15 @@ return p; } +/* Return a new malloced string by unescaping the string S. Escaping + is percent escaping and '+'/space mapping. A binary nul will + silently be replaced by a 0xFF. Function returns NULL to indicate + an out of memory status. */ +static char * +unescape_status_string (const unsigned char *s) +{ + return unescape_percent_string (s); +} static assuan_error_t @@ -649,6 +701,13 @@ { xfree (parm->serialno); parm->serialno = store_serialno (line); + parm->is_v2 = (strlen (parm->serialno) >= 16 + && xtoi_2 (parm->serialno+12) >= 2 ); + } + else if (keywordlen == 7 && !memcmp (keyword, "APPTYPE", keywordlen)) + { + xfree (parm->apptype); + parm->apptype = unescape_status_string (line); } else if (keywordlen == 9 && !memcmp (keyword, "DISP-NAME", keywordlen)) { @@ -711,6 +770,30 @@ xfree (buf); } } + else if (keywordlen == 6 && !memcmp (keyword, "EXTCAP", keywordlen)) + { + char *p, *p2, *buf; + int abool; + + buf = p = unescape_status_string (line); + if (buf) + { + for (p = strtok (buf, " "); p; p = strtok (NULL, " ")) + { + p2 = strchr (p, '='); + if (p2) + { + *p2++ = 0; + abool = (*p2 == '1'); + if (!strcmp (p, "ki")) + parm->extcap.ki = abool; + else if (!strcmp (p, "aac")) + parm->extcap.aac = abool; + } + } + xfree (buf); + } + } else if (keywordlen == 7 && !memcmp (keyword, "KEY-FPR", keywordlen)) { int no = atoi (line); @@ -761,6 +844,18 @@ xfree (parm->private_do[no]); parm->private_do[no] = unescape_percent_string (line); } + else if (keywordlen == 8 && !memcmp (keyword, "KEY-ATTR", keywordlen)) + { + int keyno, algo, nbits; + + sscanf (line, "%d %d %d", &keyno, &algo, &nbits); + keyno--; + if (keyno >= 0 && keyno < DIM (parm->key_attr)) + { + parm->key_attr[keyno].algo = algo; + parm->key_attr[keyno].nbits = nbits; + } + } return 0; } @@ -801,10 +896,13 @@ send_status_info (&ctrl, "SERIALNO", serial, strlen(serial), NULL, 0); xfree (serial); - rc = app->fnc.learn_status (app, &ctrl); + rc = app->fnc.learn_status (app, &ctrl, 0); } } + if (!rc) + agent_scd_getattr ("KEY-ATTR", info); + return rc; } @@ -1132,7 +1230,7 @@ /* Send a GENKEY command to the SCdaemon. */ int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force, - const char *serialno) + const char *serialno, u32 *createtime) { app_t app; char line[ASSUAN_LINELENGTH]; @@ -1166,6 +1264,7 @@ ctrl.status_cb_arg = info; rc = app->fnc.genkey (app, &ctrl, line, force? 1:0, + *createtime, pin_cb, &parm); } @@ -1428,3 +1527,26 @@ xfree (cacheid); } } + + +int +agent_scd_writecert (const char *certidstr, + const unsigned char *certdata, size_t certdatalen) +{ + /* It does not make sense to implement this rarely used and mainly + interactive command in GPG-1. GPG-2 is better suited for this. */ + not_in_gpg1_notice (); + return gpg_error (GPG_ERR_NOT_SUPPORTED); +} + + +int +agent_scd_readcert (const char *certidstr, + void **r_buf, size_t *r_buflen) +{ + /* It does not make sense to implement this rarely used and mainly + interactive command in GPG-1. GPG-2 is better suited for this. */ + *r_buf = NULL; + not_in_gpg1_notice (); + return gpg_error (GPG_ERR_NOT_SUPPORTED); +} diff -Nru gnupg-1.4.9/g10/cardglue.h gnupg-1.4.10/g10/cardglue.h --- gnupg-1.4.9/g10/cardglue.h 2007-12-10 15:17:19.000000000 +0000 +++ gnupg-1.4.10/g10/cardglue.h 2009-08-13 08:19:10.000000000 +0100 @@ -21,15 +21,21 @@ #ifdef ENABLE_CARD_SUPPORT /* - Note, that most card related code has been taken from 1.9.x branch + Note, that most card related code has been taken from 2.x branch and is maintained over there if at all possible. Thus, if you make changes here, please check that a similar change has been commited - to the 1.9.x branch. + to the 2.x branch. */ +/* We don't use libgcrypt but the shared codes uses a function type + from libgcrypt. Thus we have to provide this type here. */ +typedef void (*gcry_handler_progress_t) (void *, const char *, int, int, int); + +/* Object to hold all info about the card. */ struct agent_card_info_s { int error; /* private. */ + char *apptype; /* Malloced application type string. */ char *serialno; /* malloced hex string. */ char *disp_name; /* malloced. */ char *disp_lang; /* malloced. */ @@ -56,8 +62,17 @@ int chv1_cached; /* True if a PIN is not required for each signing. Note that the gpg-agent might cache it anyway. */ + int is_v2; /* True if this is a v2 card. */ int chvmaxlen[3]; /* Maximum allowed length of a CHV. */ int chvretry[3]; /* Allowed retries for the CHV; 0 = blocked. */ + struct { /* Array with key attributes. */ + int algo; /* Algorithm identifier. */ + unsigned int nbits; /* Supported keysize. */ + } key_attr[3]; + struct { + unsigned int ki:1; /* Key import available. */ + unsigned int aac:1; /* Algorithm attributes are changeable. */ + } extcap; }; struct agent_card_genkey_s { @@ -119,6 +134,11 @@ #define GPG_ERR_ENODEV G10ERR_GENERAL #define GPG_ERR_CANCELED G10ERR_CANCELED +#define GPG_ERR_INV_DATA G10ERR_GENERAL +#define GPG_ERR_PUBKEY_ALGO G10ERR_PUBKEY_ALGO +#define GPG_ERR_TOO_SHORT G10ERR_INV_ARG + + typedef int gpg_error_t; typedef int gpg_err_code_t; @@ -147,14 +167,24 @@ char *serialno_and_fpr_from_sk (const unsigned char *sn, size_t snlen, PKT_secret_key *sk); void send_status_info (ctrl_t ctrl, const char *keyword, ...); +void send_status_direct (ctrl_t ctrl, const char *keyword, const char *args); void gcry_md_hash_buffer (int algo, void *digest, const void *buffer, size_t length); +const char *gcry_md_algo_name (int algorithm); void log_printf (const char *fmt, ...); void log_printhex (const char *text, const void *buffer, size_t length); #define GCRY_MD_SHA1 DIGEST_ALGO_SHA1 #define GCRY_MD_RMD160 DIGEST_ALGO_RMD160 +#define GCRY_MD_SHA256 DIGEST_ALGO_SHA256 +#define GCRY_MD_SHA384 DIGEST_ALGO_SHA384 +#define GCRY_MD_SHA512 DIGEST_ALGO_SHA512 +#define GCRY_MD_SHA224 DIGEST_ALGO_SHA224 + +void gcry_mpi_release (MPI a); +MPI gcry_mpi_set_opaque (MPI a, void *p, unsigned int len); + void card_close (void); @@ -183,7 +213,7 @@ /* Send a GENKEY command to the SCdaemon. */ int agent_scd_genkey (struct agent_card_genkey_s *info, int keyno, int force, - const char *serialno); + const char *serialno, u32 *createtime); /* Send a PKSIGN command to the SCdaemon. */ int agent_scd_pksign (const char *keyid, int hashalgo, @@ -205,6 +235,13 @@ void agent_clear_pin_cache (const char *sn); +/* Dummy functions. */ +int agent_scd_writecert (const char *certidstr, + const unsigned char *certdata, size_t certdatalen); +int agent_scd_readcert (const char *certidstr, + void **r_buf, size_t *r_buflen); + + #endif /*ENABLE_CARD_SUPPORT*/ #endif /*GNUPG_G10_CARDGLUE_H*/ diff -Nru gnupg-1.4.9/g10/card-util.c gnupg-1.4.10/g10/card-util.c --- gnupg-1.4.9/g10/card-util.c 2008-01-26 12:51:44.000000000 +0000 +++ gnupg-1.4.10/g10/card-util.c 2009-08-13 08:14:37.000000000 +0100 @@ -1,5 +1,5 @@ /* card-util.c - Utility functions for the OpenPGP card. - * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -23,9 +23,13 @@ #include #include #include +#ifdef HAVE_LIBREADLINE +# define GNUPG_LIBREADLINE_H_INCLUDED +# include +#endif /*HAVE_LIBREADLINE*/ #if GNUPG_MAJOR_VERSION != 1 -#include "gpg.h" +# include "gpg.h" #endif /*GNUPG_MAJOR_VERSION != 1*/ #include "util.h" #include "i18n.h" @@ -34,23 +38,43 @@ #include "options.h" #include "main.h" #include "keyserver-internal.h" + #if GNUPG_MAJOR_VERSION == 1 -#ifdef HAVE_LIBREADLINE -#include -#include -#endif /*HAVE_LIBREADLINE*/ -#include "cardglue.h" +# include "cardglue.h" #else /*GNUPG_MAJOR_VERSION!=1*/ -#include "call-agent.h" +# include "call-agent.h" #endif /*GNUPG_MAJOR_VERSION!=1*/ #define CONTROL_D ('D' - 'A' + 1) +static void +write_sc_op_status (gpg_error_t err) +{ + switch (gpg_err_code (err)) + { + case 0: + write_status (STATUS_SC_OP_SUCCESS); + break; +#if GNUPG_MAJOR_VERSION != 1 + case GPG_ERR_CANCELED: + write_status_text (STATUS_SC_OP_FAILURE, "1"); + break; + case GPG_ERR_BAD_PIN: + write_status_text (STATUS_SC_OP_FAILURE, "2"); + break; + default: + write_status (STATUS_SC_OP_FAILURE); + break; +#endif /* GNUPG_MAJOR_VERSION != 1 */ + } +} + + /* Change the PIN of a an OpenPGP card. This is an interactive function. */ void -change_pin (int chvno, int allow_admin) +change_pin (int unblock_v2, int allow_admin) { struct agent_card_info_s info; int rc; @@ -75,16 +99,31 @@ return; } - if(!allow_admin) + + if (unblock_v2) + { + if (!info.is_v2) + log_error (_("This command is only available for version 2 cards\n")); + else if (!info.chvretry[1]) + log_error (_("Reset Code not or not anymore available\n")); + else + { + rc = agent_scd_change_pin (2, info.serialno); + write_sc_op_status (rc); + if (rc) + tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc)); + else + tty_printf ("PIN changed.\n"); + } + } + else if (!allow_admin) { rc = agent_scd_change_pin (1, info.serialno); + write_sc_op_status (rc); if (rc) tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc)); else - { - write_status (STATUS_SC_OP_SUCCESS); - tty_printf ("PIN changed.\n"); - } + tty_printf ("PIN changed.\n"); } else for (;;) @@ -95,6 +134,7 @@ tty_printf ("1 - change PIN\n" "2 - unblock PIN\n" "3 - change Admin PIN\n" + "4 - set the Reset Code\n" "Q - quit\n"); tty_printf ("\n"); @@ -106,36 +146,44 @@ rc = 0; if (*answer == '1') { + /* Change PIN. */ rc = agent_scd_change_pin (1, info.serialno); + write_sc_op_status (rc); if (rc) tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc)); else - { - write_status (STATUS_SC_OP_SUCCESS); - tty_printf ("PIN changed.\n"); - } + tty_printf ("PIN changed.\n"); } else if (*answer == '2') { + /* Unblock PIN. */ rc = agent_scd_change_pin (101, info.serialno); + write_sc_op_status (rc); if (rc) tty_printf ("Error unblocking the PIN: %s\n", gpg_strerror (rc)); else - { - write_status (STATUS_SC_OP_SUCCESS); - tty_printf ("PIN unblocked and new PIN set.\n"); - } + tty_printf ("PIN unblocked and new PIN set.\n"); } else if (*answer == '3') { + /* Change Admin PIN. */ rc = agent_scd_change_pin (3, info.serialno); + write_sc_op_status (rc); if (rc) tty_printf ("Error changing the PIN: %s\n", gpg_strerror (rc)); else - { - write_status (STATUS_SC_OP_SUCCESS); - tty_printf ("PIN changed.\n"); - } + tty_printf ("PIN changed.\n"); + } + else if (*answer == '4') + { + /* Set a new Reset Code. */ + rc = agent_scd_change_pin (102, info.serialno); + write_sc_op_status (rc); + if (rc) + tty_printf ("Error setting the Reset Code: %s\n", + gpg_strerror (rc)); + else + tty_printf ("Reset Code set.\n"); } else if (*answer == 'q' || *answer == 'Q') { @@ -156,11 +204,13 @@ case 0x0002: return "Prism"; case 0x0003: return "OpenFortress"; case 0x0004: return "Wewid AB"; + case 0x0005: return "ZeitControl"; + case 0x002A: return "Magrathea"; /* 0x00000 and 0xFFFF are defined as test cards per spec, 0xFFF00 to 0xFFFE are assigned for use with randomly created serial numbers. */ - case 0: + case 0x0000: case 0xffff: return "test card"; default: return (no & 0xff00) == 0xff00? "unmanaged S/N range":"unknown"; } @@ -287,6 +337,18 @@ } +/* Return true if the SHA1 fingerprint FPR consists only of 0xFF. */ +static int +fpr_is_ff (const char *fpr) +{ + int i; + + for (i=0; i < 20 && fpr[i] == '\xff'; i++) + ; + return (i == 20); +} + + /* Print all available information about the current card. */ void card_status (FILE *fp, char *serialno, size_t serialnobuflen) @@ -320,8 +382,35 @@ if (!info.serialno || strncmp (info.serialno, "D27600012401", 12) || strlen (info.serialno) != 32 ) { - if (opt.with_colons) - fputs ("unknown:\n", fp); + if (info.apptype && !strcmp (info.apptype, "NKS")) + { + if (opt.with_colons) + fputs ("netkey-card:\n", fp); + log_info ("this is a NetKey card\n"); + } + else if (info.apptype && !strcmp (info.apptype, "DINSIG")) + { + if (opt.with_colons) + fputs ("dinsig-card:\n", fp); + log_info ("this is a DINSIG compliant card\n"); + } + else if (info.apptype && !strcmp (info.apptype, "P15")) + { + if (opt.with_colons) + fputs ("pkcs15-card:\n", fp); + log_info ("this is a PKCS#15 compliant card\n"); + } + else if (info.apptype && !strcmp (info.apptype, "GELDKARTE")) + { + if (opt.with_colons) + fputs ("geldkarte-card:\n", fp); + log_info ("this is a Geldkarte compliant card\n"); + } + else + { + if (opt.with_colons) + fputs ("unknown:\n", fp); + } log_info ("not an OpenPGP card\n"); agent_release_card_info (&info); xfree (pk); @@ -367,6 +456,10 @@ fputs (":\n", fp); fprintf (fp, "forcepin:%d:::\n", !info.chv1_cached); + for (i=0; i < DIM (info.key_attr); i++) + if (info.key_attr[0].algo) + fprintf (fp, "keyattr:%d:%d:%u:\n", i+1, + info.key_attr[i].algo, info.key_attr[i].nbits); fprintf (fp, "maxpinlen:%d:%d:%d:\n", info.chvmaxlen[0], info.chvmaxlen[1], info.chvmaxlen[2]); fprintf (fp, "pinretry:%d:%d:%d:\n", @@ -442,6 +535,16 @@ } tty_fprintf (fp, "Signature PIN ....: %s\n", info.chv1_cached? _("not forced"): _("forced")); + if (info.key_attr[0].algo) + { + tty_fprintf (fp, "Key attributes ...:"); + for (i=0; i < DIM (info.key_attr); i++) + tty_fprintf (fp, " %u%c", + info.key_attr[i].nbits, + info.key_attr[i].algo == 1? 'R': + info.key_attr[i].algo == 17? 'D': '?'); + tty_fprintf (fp, "\n"); + } tty_fprintf (fp, "Max. PIN lengths .: %d %d %d\n", info.chvmaxlen[0], info.chvmaxlen[1], info.chvmaxlen[2]); tty_fprintf (fp, "PIN retry counter : %d %d %d\n", @@ -466,7 +569,10 @@ thefpr = (info.fpr1valid? info.fpr1 : info.fpr2valid? info.fpr2 : info.fpr3valid? info.fpr3 : NULL); - if ( thefpr && !get_pubkey_byfprint (pk, thefpr, 20)) + /* If the fingerprint is all 0xff, the key has no asssociated + OpenPGP certificate. */ + if ( thefpr && !fpr_is_ff (thefpr) + && !get_pubkey_byfprint (pk, thefpr, 20)) { KBNODE keyblock = NULL; @@ -599,6 +705,7 @@ if (rc) log_error ("error setting URL: %s\n", gpg_strerror (rc)); xfree (url); + write_sc_op_status (rc); return rc; } @@ -608,7 +715,6 @@ static int fetch_url(void) { -#if GNUPG_MAJOR_VERSION == 1 int rc; struct agent_card_info_s info; @@ -648,9 +754,91 @@ } return rc; -#else - return 0; +} + + +/* Read data from file FNAME up to MAXLEN characters. On error return + -1 and store NULL at R_BUFFER; on success return the number of + bytes read and store the address of a newly allocated buffer at + R_BUFFER. */ +static int +get_data_from_file (const char *fname, size_t maxlen, char **r_buffer) +{ + FILE *fp; + char *data; + int n; + + *r_buffer = NULL; + + fp = fopen (fname, "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"), fname, strerror (errno)); + return -1; + } + + data = xtrymalloc (maxlen? maxlen:1); + if (!data) + { + tty_printf (_("error allocating enough memory: %s\n"), strerror (errno)); + fclose (fp); + return -1; + } + + if (maxlen) + n = fread (data, 1, maxlen, fp); + else + n = 0; + fclose (fp); + if (n < 0) + { + tty_printf (_("error reading `%s': %s\n"), fname, strerror (errno)); + xfree (data); + return -1; + } + *r_buffer = data; + return n; +} + + +/* Write LENGTH bytes from BUFFER to file FNAME. Return 0 on + success. */ +static int +put_data_to_file (const char *fname, const void *buffer, size_t length) +{ + FILE *fp; + + fp = fopen (fname, "wb"); +#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 create `%s': %s\n"), fname, strerror (errno)); + return -1; + } + + if (length && fwrite (buffer, length, 1, fp) != 1) + { + tty_printf (_("error writing `%s': %s\n"), fname, strerror (errno)); + fclose (fp); + return -1; + } + fclose (fp); + return 0; } @@ -663,34 +851,11 @@ if (args && *args == '<') /* Read it from a file */ { - FILE *fp; - 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); + n = get_data_from_file (args, 254, &data); if (n < 0) - { - tty_printf (_("error reading `%s': %s\n"), args, strerror (errno)); - xfree (data); - return -1; - } + return -1; } else { @@ -715,6 +880,7 @@ if (rc) log_error ("error setting login data: %s\n", gpg_strerror (rc)); xfree (data); + write_sc_op_status (rc); return rc; } @@ -731,35 +897,11 @@ 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); + n = get_data_from_file (args, 254, &data); if (n < 0) - { - tty_printf (_("error reading `%s': %s\n"), args, strerror (errno)); - xfree (data); - return -1; - } + return -1; } else { @@ -784,9 +926,72 @@ if (rc) log_error ("error setting private DO: %s\n", gpg_strerror (rc)); xfree (data); + write_sc_op_status (rc); + return rc; +} + + +static int +change_cert (const char *args) +{ + char *data; + int n; + int rc; + + if (args && *args == '<') /* Read it from a file */ + { + for (args++; spacep (args); args++) + ; + n = get_data_from_file (args, 16384, &data); + if (n < 0) + return -1; + } + else + { + tty_printf ("usage error: redirectrion to file required\n"); + return -1; + } + + rc = agent_scd_writecert ("OPENPGP.3", data, n); + if (rc) + log_error ("error writing certificate to card: %s\n", gpg_strerror (rc)); + xfree (data); + write_sc_op_status (rc); + return rc; +} + + +static int +read_cert (const char *args) +{ + const char *fname; + void *buffer; + size_t length; + int rc; + + if (args && *args == '>') /* Write it to a file */ + { + for (args++; spacep (args); args++) + ; + fname = args; + } + else + { + tty_printf ("usage error: redirectrion to file required\n"); + return -1; + } + + rc = agent_scd_readcert ("OPENPGP.3", &buffer, &length); + if (rc) + log_error ("error reading certificate from card: %s\n", gpg_strerror (rc)); + else + rc = put_data_to_file (fname, buffer, length); + xfree (buffer); + write_sc_op_status (rc); return rc; } + static int change_lang (void) { @@ -820,6 +1025,7 @@ if (rc) log_error ("error setting lang: %s\n", gpg_strerror (rc)); xfree (data); + write_sc_op_status (rc); return rc; } @@ -855,6 +1061,7 @@ if (rc) log_error ("error setting sex: %s\n", gpg_strerror (rc)); xfree (data); + write_sc_op_status (rc); return rc; } @@ -899,6 +1106,7 @@ fprno==3?"CA-FPR-3":"x", fpr, 20, NULL ); if (rc) log_error ("error setting cafpr: %s\n", gpg_strerror (rc)); + write_sc_op_status (rc); return rc; } @@ -924,6 +1132,7 @@ rc = agent_scd_setattr ("CHV-STATUS-1", newstate? "\x01":"", 1, NULL); if (rc) log_error ("error toggling signature PIN flag: %s\n", gpg_strerror (rc)); + write_sc_op_status (rc); } @@ -947,6 +1156,10 @@ rc = agent_scd_getattr ("CHV-STATUS", info); if (!rc) rc = agent_scd_getattr ("DISP-NAME", info); + if (!rc) + rc = agent_scd_getattr ("EXTCAP", info); + if (!rc) + rc = agent_scd_getattr ("KEY-ATTR", info); if (rc) log_error (_("error getting current key info: %s\n"), gpg_strerror (rc)); return rc; @@ -963,7 +1176,7 @@ *forced_chv1 = !info->chv1_cached; if (*forced_chv1) - { /* Switch of the forced mode so that during key generation we + { /* Switch off the forced mode so that during key generation we don't get bothered with PIN queries for each self-signature. */ rc = agent_scd_setattr ("CHV-STATUS-1", "\x01", 1, info->serialno); @@ -981,8 +1194,11 @@ binding signature. */ rc = agent_scd_checkpin (info->serialno); if (rc) - log_error ("error checking the PIN: %s\n", gpg_strerror (rc)); - } + { + log_error ("error checking the PIN: %s\n", gpg_strerror (rc)); + write_sc_op_status (rc); + } + } return rc; } @@ -1003,7 +1219,7 @@ } } -#if GNUPG_MAJOR_VERSION == 1 + /* Helper for the key generation/edit functions. */ static void show_card_key_info (struct agent_card_info_s *info) @@ -1016,9 +1232,8 @@ print_sha1_fpr (NULL, info->fpr3valid? info->fpr3:NULL); tty_printf ("\n"); } -#endif -#if GNUPG_MAJOR_VERSION == 1 + /* Helper for the key generation/edit functions. */ static int replace_existing_key_p (struct agent_card_info_s *info, int keyno) @@ -1038,50 +1253,138 @@ } return 0; } -#endif static void -generate_card_keys (const char *serialno) +show_keysize_warning (void) +{ + static int shown; + + if (shown) + return; + shown = 1; + tty_printf + (_("NOTE: There is no guarantee that the card " + "supports the requested size.\n" + " If the key generation does not succeed, " + "please check the\n" + " documentation of your card to see what " + "sizes are allowed.\n")); +} + + +/* Ask for the size of a card key. NBITS is the current size + configured for the card. KEYNO is the number of the key used to + select the prompt. Returns 0 to use the default size (i.e. NBITS) + or the selected size. */ +static unsigned int +ask_card_keysize (int keyno, unsigned int nbits) +{ + unsigned int min_nbits = 1024; + unsigned int max_nbits = 3072; /* GnuPG limit due to Assuan. */ + char *prompt, *answer; + unsigned int req_nbits; + + for (;;) + { + prompt = xasprintf + (keyno == 0? + _("What keysize do you want for the Signature key? (%u) "): + keyno == 1? + _("What keysize do you want for the Encryption key? (%u) "): + _("What keysize do you want for the Authentication key? (%u) "), + nbits); + answer = cpr_get ("cardedit.genkeys.size", prompt); + cpr_kill_prompt (); + req_nbits = *answer? atoi (answer): nbits; + xfree (prompt); + xfree (answer); + + if (req_nbits != nbits && (req_nbits % 32) ) + { + req_nbits = ((req_nbits + 31) / 32) * 32; + tty_printf (_("rounded up to %u bits\n"), req_nbits); + } + + if (req_nbits == nbits) + return 0; /* Use default. */ + + if (req_nbits < min_nbits || req_nbits > max_nbits) + { + tty_printf (_("%s keysizes must be in the range %u-%u\n"), + "RSA", min_nbits, max_nbits); + } + else + { + tty_printf (_("The card will now be re-configured " + "to generate a key of %u bits\n"), req_nbits); + show_keysize_warning (); + return req_nbits; + } + } +} + + +/* Change the size of key KEYNO (0..2) to NBITS and show an error + message if that fails. */ +static gpg_error_t +do_change_keysize (int keyno, unsigned int nbits) +{ + gpg_error_t err; + char args[100]; + + snprintf (args, sizeof args, "--force %d 1 %u", keyno+1, nbits); + err = agent_scd_setattr ("KEY-ATTR", args, strlen (args), NULL); + if (err) + log_error (_("error changing size of key %d to %u bits: %s\n"), + keyno+1, nbits, gpg_strerror (err)); + return err; +} + + +static void +generate_card_keys (void) { struct agent_card_info_s info; int forced_chv1; int want_backup; + int keyno; if (get_info_for_key_operation (&info)) return; -#if GNUPG_MAJOR_VERSION == 1 - { - char *answer=cpr_get("cardedit.genkeys.backup_enc", - _("Make off-card backup of encryption key? (Y/n) ")); + if (info.extcap.ki) + { + char *answer; - want_backup=answer_is_yes_no_default(answer,1); - cpr_kill_prompt(); - xfree(answer); - } -#else - want_backup = cpr_get_answer_is_yes - ( "cardedit.genkeys.backup_enc", - _("Make off-card backup of encryption key? (Y/n) ")); - /*FIXME: we need answer_is_yes_no_default()*/ -#endif + answer = cpr_get ("cardedit.genkeys.backup_enc", + _("Make off-card backup of encryption key? (Y/n) ")); + + want_backup = answer_is_yes_no_default (answer, 1/*(default to Yes)*/); + cpr_kill_prompt (); + xfree (answer); + } + else + want_backup = 0; if ( (info.fpr1valid && !fpr_is_zero (info.fpr1)) || (info.fpr2valid && !fpr_is_zero (info.fpr2)) || (info.fpr3valid && !fpr_is_zero (info.fpr3))) { tty_printf ("\n"); - log_info ("NOTE: keys are already stored on the card!\n"); + log_info (_("NOTE: keys are already stored on the card!\n")); tty_printf ("\n"); - if ( !cpr_get_answer_is_yes( "cardedit.genkeys.replace_keys", - _("Replace existing keys? (y/N) "))) + if ( !cpr_get_answer_is_yes ("cardedit.genkeys.replace_keys", + _("Replace existing keys? (y/N) "))) { agent_release_card_info (&info); return; } } - else if (!info.disp_name || !*info.disp_name) + + /* If no displayed name has been set, we assume that this is a fresh + card and print a hint about the default PINs. */ + if (!info.disp_name || !*info.disp_name) { tty_printf ("\n"); tty_printf (_("Please note that the factory settings of the PINs are\n" @@ -1093,13 +1396,31 @@ if (check_pin_for_key_operation (&info, &forced_chv1)) goto leave; - -#if GNUPG_MAJOR_VERSION == 1 - generate_keypair (NULL, info.serialno, - want_backup? opt.homedir:NULL); -#else - generate_keypair (NULL, info.serialno); -#endif + + /* If the cards features changeable key attributes, we ask for the + key size. */ + if (info.is_v2 && info.extcap.aac) + { + unsigned int nbits; + + for (keyno = 0; keyno < DIM (info.key_attr); keyno++) + { + nbits = ask_card_keysize (keyno, info.key_attr[keyno].nbits); + if (nbits && do_change_keysize (keyno, nbits)) + { + /* Error: Better read the default key size again. */ + agent_release_card_info (&info); + if (get_info_for_key_operation (&info)) + goto leave; + /* Ask again for this key size. */ + keyno--; + } + } + /* Note that INFO has not be synced. However we will only use + the serialnumber and thus it won't harm. */ + } + + generate_keypair (NULL, info.serialno, want_backup? opt.homedir:NULL); leave: agent_release_card_info (&info); @@ -1112,7 +1433,6 @@ int card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock) { -#if GNUPG_MAJOR_VERSION == 1 struct agent_card_info_s info; int okay = 0; int forced_chv1 = 0; @@ -1152,6 +1472,26 @@ if (check_pin_for_key_operation (&info, &forced_chv1)) goto leave; + /* If the cards features changeable key attributes, we ask for the + key size. */ + if (info.is_v2 && info.extcap.aac) + { + unsigned int nbits; + + ask_again: + nbits = ask_card_keysize (keyno-1, info.key_attr[keyno-1].nbits); + if (nbits && do_change_keysize (keyno-1, nbits)) + { + /* Error: Better read the default key size again. */ + agent_release_card_info (&info); + if (get_info_for_key_operation (&info)) + goto leave; + goto ask_again; + } + /* Note that INFO has not be synced. However we will only use + the serialnumber and thus it won't harm. */ + } + okay = generate_card_subkeypair (pub_keyblock, sec_keyblock, keyno, info.serialno); @@ -1159,9 +1499,6 @@ agent_release_card_info (&info); restore_forced_chv1 (&forced_chv1); return okay; -#else - return 0; -#endif } @@ -1172,7 +1509,6 @@ int card_store_subkey (KBNODE node, int use) { -#if GNUPG_MAJOR_VERSION == 1 struct agent_card_info_s info; int okay = 0; int rc; @@ -1182,6 +1518,8 @@ size_t n; const char *s; int allow_keyno[3]; + unsigned int nbits; + assert (node->pkt->pkttype == PKT_SECRET_KEY || node->pkt->pkttype == PKT_SECRET_SUBKEY); @@ -1190,9 +1528,18 @@ if (get_info_for_key_operation (&info)) return 0; + if (!info.extcap.ki) + { + tty_printf ("The card does not support the import of keys\n"); + tty_printf ("\n"); + goto leave; + } + show_card_key_info (&info); - if (!is_RSA (sk->pubkey_algo) || nbits_from_sk (sk) != 1024 ) + nbits = nbits_from_sk (sk); + + if (!is_RSA (sk->pubkey_algo) || (!info.is_v2 && nbits != 1024) ) { tty_printf ("You may only store a 1024 bit RSA key on the card\n"); tty_printf ("\n"); @@ -1225,8 +1572,17 @@ keyno = *answer? atoi(answer): 0; xfree(answer); if (keyno >= 1 && keyno <= 3 && allow_keyno[keyno-1]) - break; /* Okay. */ - tty_printf(_("Invalid selection.\n")); + { + if (info.is_v2 && !info.extcap.aac + && info.key_attr[keyno-1].nbits != nbits) + { + tty_printf ("Key does not match the card's capability.\n"); + } + else + break; /* Okay. */ + } + else + tty_printf(_("Invalid selection.\n")); } if (replace_existing_key_p (&info, keyno)) @@ -1260,7 +1616,10 @@ rc = save_unprotected_key_to_card (sk, keyno); if (rc) - goto leave; + { + log_error (_("error writing key to card: %s\n"), gpg_strerror (rc)); + goto leave; + } /* Get back to the maybe protected original secret key. */ if (copied_sk) @@ -1274,11 +1633,11 @@ n = pubkey_get_nskey (sk->pubkey_algo); for (i=pubkey_get_npkey (sk->pubkey_algo); i < n; i++) { - mpi_free (sk->skey[i]); + gcry_mpi_release (sk->skey[i]); sk->skey[i] = NULL; } i = pubkey_get_npkey (sk->pubkey_algo); - sk->skey[i] = mpi_set_opaque (NULL, xstrdup ("dummydata"), 10); + sk->skey[i] = gcry_mpi_set_opaque (NULL, xstrdup ("dummydata"), 10*8); sk->is_protected = 1; sk->protect.s2k.mode = 1002; s = info.serialno; @@ -1293,9 +1652,6 @@ free_secret_key (copied_sk); agent_release_card_info (&info); return okay; -#else - return 0; -#endif } @@ -1307,7 +1663,8 @@ cmdNOP = 0, cmdQUIT, cmdADMIN, cmdHELP, cmdLIST, cmdDEBUG, cmdVERIFY, cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR, - cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, + cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdWRITECERT, + cmdREADCERT, cmdUNBLOCK, cmdINVCMD }; @@ -1338,13 +1695,16 @@ { "generate", cmdGENERATE, 1, N_("generate new keys")}, { "passwd" , cmdPASSWD, 0, N_("menu to change or unblock the PIN")}, { "verify" , cmdVERIFY, 0, N_("verify the PIN and list all data")}, - /* Note, that we do not announce this command yet. */ + { "unblock" , cmdUNBLOCK,0, N_("unblock the PIN using a Reset Code") }, + /* Note, that we do not announce these command yet. */ { "privatedo", cmdPRIVATEDO, 0, NULL }, + { "readcert", cmdREADCERT, 0, NULL }, + { "writecert", cmdWRITECERT, 1, NULL }, { NULL, cmdINVCMD, 0, NULL } }; -#if GNUPG_MAJOR_VERSION == 1 && defined (HAVE_LIBREADLINE) +#ifdef HAVE_LIBREADLINE /* These two functions are used by readline for command completion. */ @@ -1377,6 +1737,7 @@ static char ** card_edit_completion(const char *text, int start, int end) { + (void)end; /* If we are at the start of a line, we try and command-complete. If not, just do nothing for now. */ @@ -1387,18 +1748,18 @@ return NULL; } -#endif /* GNUPG_MAJOR_VERSION == 1 && HAVE_LIBREADLINE */ +#endif /*HAVE_LIBREADLINE*/ /* Menu to edit all user changeable values on an OpenPGP card. Only Key creation is not handled here. */ void -card_edit (STRLIST commands) +card_edit (strlist_t commands) { enum cmdids cmd = cmdNOP; int have_commands = !!commands; int redisplay = 1; char *answer = NULL; - int did_checkpin = 0, allow_admin=0; + int allow_admin=0; char serialnobuf[50]; @@ -1414,6 +1775,7 @@ { int arg_number; const char *arg_string = ""; + const char *arg_rest = ""; char *p; int i; int cmd_admin_only; @@ -1454,15 +1816,11 @@ if (!have_commands) { -#if GNUPG_MAJOR_VERSION == 1 tty_enable_completion (card_edit_completion); -#endif answer = cpr_get_no_help("cardedit.prompt", _("Command> ")); cpr_kill_prompt(); -#if GNUPG_MAJOR_VERSION == 1 tty_disable_completion (); -#endif - } + } trim_spaces(answer); } while ( *answer == '#' ); @@ -1482,6 +1840,11 @@ trim_spaces (p); arg_number = atoi(p); arg_string = p; + arg_rest = p; + while (digitp (arg_rest)) + arg_rest++; + while (spacep (arg_rest)) + arg_rest++; } for (i=0; cmds[i].name; i++ ) @@ -1580,17 +1943,34 @@ change_private_do (arg_string, arg_number); break; + case cmdWRITECERT: + if ( arg_number != 3 ) + tty_printf ("usage: writecert 3 < FILE\n"); + else + change_cert (arg_rest); + break; + + case cmdREADCERT: + if ( arg_number != 3 ) + tty_printf ("usage: readcert 3 > FILE\n"); + else + read_cert (arg_rest); + break; + case cmdFORCESIG: toggle_forcesig (); break; case cmdGENERATE: - generate_card_keys (serialnobuf); + generate_card_keys (); break; case cmdPASSWD: change_pin (0, allow_admin); - did_checkpin = 0; /* Need to reset it of course. */ + break; + + case cmdUNBLOCK: + change_pin (1, allow_admin); break; case cmdQUIT: diff -Nru gnupg-1.4.9/g10/ccid-driver.c gnupg-1.4.10/g10/ccid-driver.c --- gnupg-1.4.9/g10/ccid-driver.c 2007-10-23 11:40:11.000000000 +0100 +++ gnupg-1.4.10/g10/ccid-driver.c 2009-08-13 08:34:50.000000000 +0100 @@ -1,6 +1,7 @@ /* ccid-driver.c - USB ChipCardInterfaceDevices driver - * Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - * Written by Werner Koch. + * Copyright (C) 2003, 2004, 2005, 2006, 2007 + * 2008, 2009 Free Software Foundation, Inc. + * Written by Werner Koch. * * This file is part of GnuPG. * @@ -51,7 +52,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Date: 2007-10-23 12:48:09 +0200 (Tue, 23 Oct 2007) $ + * $Date: 2009-08-13 10:45:23 +0200 (Thu, 13 Aug 2009) $ */ @@ -83,6 +84,10 @@ #include #include #include +#include +#ifdef HAVE_PTH +# include +#endif /*HAVE_PTH*/ #include @@ -158,6 +163,11 @@ #endif /* This source not used by scdaemon. */ +#ifndef EAGAIN +#define EAGAIN EWOULDBLOCK +#endif + + enum { RDR_to_PC_NotifySlotChange= 0x50, @@ -198,7 +208,8 @@ VENDOR_CHERRY = 0x046a, VENDOR_SCM = 0x04e6, VENDOR_OMNIKEY= 0x076b, - VENDOR_GEMPC = 0x08e6 + VENDOR_GEMPC = 0x08e6, + VENDOR_KAAN = 0x0d46 }; /* A list and a table with special transport descriptions. */ @@ -237,13 +248,24 @@ int seqno; unsigned char t1_ns; unsigned char t1_nr; - int nonnull_nad; - int auto_ifsd; + unsigned char nonnull_nad; int max_ifsd; int ifsd; - int powered_off; - int has_pinpad; - int apdu_level; /* Reader supports short APDU level exchange. */ + int ifsc; + unsigned char apdu_level:2; /* Reader supports short APDU level + exchange. With a value of 2 short + and extended level is supported.*/ + unsigned int auto_ifsd:1; + unsigned int powered_off:1; + unsigned int has_pinpad:2; + unsigned int enodev_seen:1; + + time_t last_progress; /* Last time we sent progress line. */ + + /* The progress callback and its first arg as supplied to + ccid_set_progress_cb. */ + void (*progress_cb)(void *, const char *, int, int, int); + void *progress_cb_arg; }; @@ -251,16 +273,19 @@ static int debug_level; /* Flag to control the debug output. 0 = No debugging 1 = USB I/O info - 2 = T=1 protocol tracing + 2 = Level 1 + T=1 protocol tracing + 3 = Level 2 + USB/I/O tracing of SlotStatus. */ static unsigned int compute_edc (const unsigned char *data, size_t datalen, int use_crc); -static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen); +static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen, + int no_debug); static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length, size_t *nread, int expected_type, int seqno, int timeout, int no_debug); +static int abort_cmd (ccid_driver_t handle, int seqno); /* Convert a little endian stored 4 byte value into an unsigned integer. */ @@ -270,6 +295,15 @@ return buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); } + +/* Convert a little endian stored 2 byte value into an unsigned + integer. */ +static unsigned int +convert_le_u16 (const unsigned char *buf) +{ + return buf[0] | (buf[1] << 8); +} + static void set_msg_len (unsigned char *msg, unsigned int length) { @@ -280,8 +314,49 @@ } +static void +my_sleep (int seconds) +{ +#ifdef HAVE_PTH + /* With Pth we also call the standard sleep(0) so that the process + may give up its timeslot. */ + if (!seconds) + { +# ifdef HAVE_W32_SYSTEM + Sleep (0); +# else + sleep (0); +# endif + } + pth_sleep (seconds); +#else +# ifdef HAVE_W32_SYSTEM + Sleep (seconds*1000); +# else + sleep (seconds); +# endif +#endif +} + +static void +print_progress (ccid_driver_t handle) +{ + time_t ct = time (NULL); + + /* We don't want to print progress lines too often. */ + if (ct == handle->last_progress) + return; + + if (handle->progress_cb) + handle->progress_cb (handle->progress_cb_arg, "card_busy", 'w', 0, 0); + + handle->last_progress = ct; +} + + + /* Pint an error message for a failed CCID command including a textual - error code. MSG is shall be the CCID message of at least 10 bytes. */ + error code. MSG shall be the CCID message at a minimum of 10 bytes. */ static void print_command_failed (const unsigned char *msg) { @@ -325,8 +400,318 @@ } DEBUGOUT_1 ("CCID command failed: %s\n", t); } + + +static void +print_pr_data (const unsigned char *data, size_t datalen, size_t off) +{ + int any = 0; + + for (; off < datalen; off++) + { + if (!any || !(off % 16)) + { + if (any) + DEBUGOUT_LF (); + DEBUGOUT_1 (" [%04lu] ", (unsigned long) off); + } + DEBUGOUT_CONT_1 (" %02X", data[off]); + any = 1; + } + if (any && (off % 16)) + DEBUGOUT_LF (); +} + + +static void +print_p2r_header (const char *name, const unsigned char *msg, size_t msglen) +{ + DEBUGOUT_1 ("%s:\n", name); + if (msglen < 7) + return; + DEBUGOUT_1 (" dwLength ..........: %u\n", convert_le_u32 (msg+1)); + DEBUGOUT_1 (" bSlot .............: %u\n", msg[5]); + DEBUGOUT_1 (" bSeq ..............: %u\n", msg[6]); +} + + +static void +print_p2r_iccpoweron (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_IccPowerOn", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_2 (" bPowerSelect ......: 0x%02x (%s)\n", msg[7], + msg[7] == 0? "auto": + msg[7] == 1? "5.0 V": + msg[7] == 2? "3.0 V": + msg[7] == 3? "1.8 V":""); + print_pr_data (msg, msglen, 8); +} + + +static void +print_p2r_iccpoweroff (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_IccPowerOff", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_getslotstatus (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_GetSlotStatus", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_xfrblock (const unsigned char *msg, size_t msglen) +{ + unsigned int val; + + print_p2r_header ("PC_to_RDR_XfrBlock", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bBWI ..............: 0x%02x\n", msg[7]); + val = convert_le_u16 (msg+8); + DEBUGOUT_2 (" wLevelParameter ...: 0x%04x%s\n", val, + val == 1? " (continued)": + val == 2? " (continues+ends)": + val == 3? " (continues+continued)": + val == 16? " (DataBlock-expected)":""); + print_pr_data (msg, msglen, 10); +} + + +static void +print_p2r_getparameters (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_GetParameters", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_resetparameters (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_ResetParameters", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_setparameters (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_SetParameters", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bProtocolNum ......: 0x%02x\n", msg[7]); + print_pr_data (msg, msglen, 8); +} + + +static void +print_p2r_escape (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_Escape", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_iccclock (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_IccClock", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bClockCommand .....: 0x%02x\n", msg[7]); + print_pr_data (msg, msglen, 8); +} + + +static void +print_p2r_to0apdu (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_T0APDU", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bmChanges .........: 0x%02x\n", msg[7]); + DEBUGOUT_1 (" bClassGetResponse .: 0x%02x\n", msg[8]); + DEBUGOUT_1 (" bClassEnvelope ....: 0x%02x\n", msg[9]); + print_pr_data (msg, msglen, 10); +} + + +static void +print_p2r_secure (const unsigned char *msg, size_t msglen) +{ + unsigned int val; + + print_p2r_header ("PC_to_RDR_Secure", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bBMI ..............: 0x%02x\n", msg[7]); + val = convert_le_u16 (msg+8); + DEBUGOUT_2 (" wLevelParameter ...: 0x%04x%s\n", val, + val == 1? " (continued)": + val == 2? " (continues+ends)": + val == 3? " (continues+continued)": + val == 16? " (DataBlock-expected)":""); + print_pr_data (msg, msglen, 10); +} + + +static void +print_p2r_mechanical (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_Mechanical", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bFunction .........: 0x%02x\n", msg[7]); + print_pr_data (msg, msglen, 8); +} + + +static void +print_p2r_abort (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_Abort", msg, msglen); + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_setdatarate (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("PC_to_RDR_SetDataRate", msg, msglen); + if (msglen < 10) + return; + print_pr_data (msg, msglen, 7); +} + + +static void +print_p2r_unknown (const unsigned char *msg, size_t msglen) +{ + print_p2r_header ("Unknown PC_to_RDR command", msg, msglen); + if (msglen < 10) + return; + print_pr_data (msg, msglen, 0); +} + + +static void +print_r2p_header (const char *name, const unsigned char *msg, size_t msglen) +{ + DEBUGOUT_1 ("%s:\n", name); + if (msglen < 9) + return; + DEBUGOUT_1 (" dwLength ..........: %u\n", convert_le_u32 (msg+1)); + DEBUGOUT_1 (" bSlot .............: %u\n", msg[5]); + DEBUGOUT_1 (" bSeq ..............: %u\n", msg[6]); + DEBUGOUT_1 (" bStatus ...........: %u\n", msg[7]); + if (msg[8]) + DEBUGOUT_1 (" bError ............: %u\n", msg[8]); +} + + +static void +print_r2p_datablock (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("RDR_to_PC_DataBlock", msg, msglen); + if (msglen < 10) + return; + if (msg[9]) + DEBUGOUT_2 (" bChainParameter ...: 0x%02x%s\n", msg[9], + msg[9] == 1? " (continued)": + msg[9] == 2? " (continues+ends)": + msg[9] == 3? " (continues+continued)": + msg[9] == 16? " (XferBlock-expected)":""); + print_pr_data (msg, msglen, 10); +} + + +static void +print_r2p_slotstatus (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("RDR_to_PC_SlotStatus", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_2 (" bClockStatus ......: 0x%02x%s\n", msg[9], + msg[9] == 0? " (running)": + msg[9] == 1? " (stopped-L)": + msg[9] == 2? " (stopped-H)": + msg[9] == 3? " (stopped)":""); + print_pr_data (msg, msglen, 10); +} +static void +print_r2p_parameters (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("RDR_to_PC_Parameters", msg, msglen); + if (msglen < 10) + return; + + DEBUGOUT_1 (" protocol ..........: T=%d\n", msg[9]); + if (msglen == 17 && msg[9] == 1) + { + /* Protocol T=1. */ + DEBUGOUT_1 (" bmFindexDindex ....: %02X\n", msg[10]); + DEBUGOUT_1 (" bmTCCKST1 .........: %02X\n", msg[11]); + DEBUGOUT_1 (" bGuardTimeT1 ......: %02X\n", msg[12]); + DEBUGOUT_1 (" bmWaitingIntegersT1: %02X\n", msg[13]); + DEBUGOUT_1 (" bClockStop ........: %02X\n", msg[14]); + DEBUGOUT_1 (" bIFSC .............: %d\n", msg[15]); + DEBUGOUT_1 (" bNadValue .........: %d\n", msg[16]); + } + else + print_pr_data (msg, msglen, 10); +} + + +static void +print_r2p_escape (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("RDR_to_PC_Escape", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" buffer[9] .........: %02X\n", msg[9]); + print_pr_data (msg, msglen, 10); +} + + +static void +print_r2p_datarate (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("RDR_to_PC_DataRate", msg, msglen); + if (msglen < 10) + return; + if (msglen >= 18) + { + DEBUGOUT_1 (" dwClockFrequency ..: %u\n", convert_le_u32 (msg+10)); + DEBUGOUT_1 (" dwDataRate ..... ..: %u\n", convert_le_u32 (msg+14)); + print_pr_data (msg, msglen, 18); + } + else + print_pr_data (msg, msglen, 10); +} + + +static void +print_r2p_unknown (const unsigned char *msg, size_t msglen) +{ + print_r2p_header ("Unknown RDR_to_PC command", msg, msglen); + if (msglen < 10) + return; + DEBUGOUT_1 (" bMessageType ......: %02X\n", msg[0]); + DEBUGOUT_1 (" buffer[9] .........: %02X\n", msg[9]); + print_pr_data (msg, msglen, 10); +} + + /* Given a handle used for special transport prepare it for use. In particular setup all information in way that resembles what parse_cccid_descriptor does. */ @@ -492,7 +877,7 @@ else if ((us & 0x00040000)) { DEBUGOUT (" Short and extended APDU level exchange\n"); - handle->apdu_level = 1; + handle->apdu_level = 2; } else if ((us & 0x00070000)) DEBUGOUT (" WARNING: conflicting exchange levels\n"); @@ -559,6 +944,11 @@ 0x5111 - SCR 331-DI 0x5115 - SCR 335 0xe003 - SPR 532 + The + 0x5117 - SCR 3320 USB ID-000 reader + seems to be very slow but enabling this workaround boosts the + performance to a a more or less acceptable level (tested by David). + */ if (handle->id_vendor == VENDOR_SCM && handle->max_ifsd > 48 @@ -566,6 +956,7 @@ ||(handle->id_product == 0x5111 && handle->bcd_device < 0x0620) ||(handle->id_product == 0x5115 && handle->bcd_device < 0x0514) ||(handle->id_product == 0xe003 && handle->bcd_device < 0x0504) + ||(handle->id_product == 0x5117 && handle->bcd_device < 0x0522) )) { DEBUGOUT ("enabling workaround for buggy SCM readers\n"); @@ -986,13 +1377,24 @@ char *rid, *p; fd = open (transports[i].name, O_RDWR); - if (fd == -1) - continue; + if (fd == -1 && scan_mode && errno == EBUSY) + { + /* Ignore this error in scan mode because it indicates that + the device exists but is already open (most likely by us) + and thus in general suitable as a reader. */ + } + else if (fd == -1) + { + DEBUGOUT_2 ("failed to open `%s': %s\n", + transports[i].name, strerror (errno)); + continue; + } rid = malloc (strlen (transports[i].name) + 30 + 10); if (!rid) { - close (fd); + if (fd != -1) + close (fd); free (rid_list); return -1; /* Error. */ } @@ -1003,7 +1405,8 @@ p = malloc ((rid_list? strlen (rid_list):0) + 1 + strlen (rid) + 1); if (!p) { - close (fd); + if (fd != -1) + close (fd); free (rid_list); free (rid); return -1; /* Error. */ @@ -1039,7 +1442,8 @@ --readerno; } free (rid); - close (fd); + if (fd != -1) + close (fd); } if (scan_mode) @@ -1055,7 +1459,11 @@ /* Set the level of debugging to LEVEL and return the old level. -1 just returns the old level. A level of 0 disables debugging, 1 enables debugging, 2 enables additional tracing of the T=1 - protocol, other values are not yet defined. */ + protocol, 3 additionally enables debugging for GetSlotStatus, other + values are not yet defined. + + Note that libusb may provide its own debugging feature which is + enabled by setting the envvar USB_DEBUG. */ int ccid_set_debug_level (int level) { @@ -1228,7 +1636,7 @@ set_msg_len (msg, 0); msglen = 10; - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (!rc) bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus, seqno, 2000, 0); @@ -1321,6 +1729,20 @@ } +int +ccid_set_progress_cb (ccid_driver_t handle, + void (*cb)(void *, const char *, int, int, int), + void *cb_arg) +{ + if (!handle || !handle->rid) + return CCID_DRIVER_ERR_INV_VALUE; + + handle->progress_cb = cb; + handle->progress_cb_arg = cb_arg; + return 0; +} + + /* Close the reader HANDLE. */ int ccid_close_reader (ccid_driver_t handle) @@ -1339,7 +1761,7 @@ int ccid_check_card_presence (ccid_driver_t handle) { - + (void)handle; /* Not yet implemented. */ return -1; } @@ -1372,20 +1794,97 @@ /* Write a MSG of length MSGLEN to the designated bulk out endpoint. Returns 0 on success. */ static int -bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen) +bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen, + int no_debug) { int rc; + /* No need to continue and clutter the log with USB write error + messages after we got the first ENODEV. */ + if (handle->enodev_seen) + return CCID_DRIVER_ERR_NO_READER; + + if (debug_level && (!no_debug || debug_level >= 3)) + { + switch (msglen? msg[0]:0) + { + case PC_to_RDR_IccPowerOn: + print_p2r_iccpoweron (msg, msglen); + break; + case PC_to_RDR_IccPowerOff: + print_p2r_iccpoweroff (msg, msglen); + break; + case PC_to_RDR_GetSlotStatus: + print_p2r_getslotstatus (msg, msglen); + break; + case PC_to_RDR_XfrBlock: + print_p2r_xfrblock (msg, msglen); + break; + case PC_to_RDR_GetParameters: + print_p2r_getparameters (msg, msglen); + break; + case PC_to_RDR_ResetParameters: + print_p2r_resetparameters (msg, msglen); + break; + case PC_to_RDR_SetParameters: + print_p2r_setparameters (msg, msglen); + break; + case PC_to_RDR_Escape: + print_p2r_escape (msg, msglen); + break; + case PC_to_RDR_IccClock: + print_p2r_iccclock (msg, msglen); + break; + case PC_to_RDR_T0APDU: + print_p2r_to0apdu (msg, msglen); + break; + case PC_to_RDR_Secure: + print_p2r_secure (msg, msglen); + break; + case PC_to_RDR_Mechanical: + print_p2r_mechanical (msg, msglen); + break; + case PC_to_RDR_Abort: + print_p2r_abort (msg, msglen); + break; + case PC_to_RDR_SetDataRate: + print_p2r_setdatarate (msg, msglen); + break; + default: + print_p2r_unknown (msg, msglen); + break; + } + } + if (handle->idev) { rc = usb_bulk_write (handle->idev, handle->ep_bulk_out, (char*)msg, msglen, - 1000 /* ms timeout */); + 5000 /* ms timeout */); if (rc == msglen) return 0; +#ifdef ENODEV + if (rc == -(ENODEV)) + { + /* The Linux libusb returns a negative error value. Catch + the most important one. */ + errno = ENODEV; + rc = -1; + } +#endif /*ENODEV*/ + if (rc == -1) - DEBUGOUT_1 ("usb_bulk_write error: %s\n", strerror (errno)); + { + DEBUGOUT_1 ("usb_bulk_write error: %s\n", strerror (errno)); +#ifdef ENODEV + if (errno == ENODEV) + { + handle->enodev_seen = 1; + return CCID_DRIVER_ERR_NO_READER; + } +#endif /*ENODEV*/ + } else DEBUGOUT_1 ("usb_bulk_write failed: %d\n", rc); } @@ -1407,14 +1906,16 @@ is the sequence number used to send the request and EXPECTED_TYPE the type of message we expect. Does checks on the ccid header. TIMEOUT is the timeout value in ms. NO_DEBUG may be set to - avoid debug messages in case of no error. Returns 0 on success. */ + avoid debug messages in case of no error; this can be overriden + with a glibal debug level of at least 3. Returns 0 on success. */ static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length, size_t *nread, int expected_type, int seqno, int timeout, int no_debug) { - int i, rc; + int rc; size_t msglen; + int eagain_retries = 0; /* Fixme: The next line for the current Valgrind without support for USB IOCTLs. */ @@ -1428,7 +1929,13 @@ timeout); if (rc < 0) { - DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (errno)); + rc = errno; + DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc)); + if (rc == EAGAIN && eagain_retries++ < 3) + { + my_sleep (1); + goto retry; + } return CCID_DRIVER_ERR_CARD_IO_ERROR; } *nread = msglen = rc; @@ -1438,22 +1945,24 @@ rc = read (handle->dev_fd, buffer, length); if (rc < 0) { + rc = errno; DEBUGOUT_2 ("read from %d failed: %s\n", - handle->dev_fd, strerror (errno)); + handle->dev_fd, strerror (rc)); + if (rc == EAGAIN && eagain_retries++ < 5) + { + my_sleep (1); + goto retry; + } return CCID_DRIVER_ERR_CARD_IO_ERROR; } *nread = msglen = rc; } - + eagain_retries = 0; if (msglen < 10) { DEBUGOUT_1 ("bulk-in msg too short (%u)\n", (unsigned int)msglen); - return CCID_DRIVER_ERR_INV_VALUE; - } - if (buffer[0] != expected_type) - { - DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]); + abort_cmd (handle, seqno); return CCID_DRIVER_ERR_INV_VALUE; } if (buffer[5] != 0) @@ -1465,9 +1974,14 @@ { DEBUGOUT_2 ("bulk-in seqno does not match (%d/%d)\n", seqno, buffer[6]); - return CCID_DRIVER_ERR_INV_VALUE; + /* Retry until we are synced again. */ + goto retry; } + /* We need to handle the time extension request before we check that + we got the expected message type. This is in particular required + for the Cherry keyboard which sends a time extension request for + each key hit. */ if ( !(buffer[7] & 0x03) && (buffer[7] & 0xC0) == 0x80) { /* Card present and active, time extension requested. */ @@ -1476,13 +1990,36 @@ goto retry; } - if (!no_debug) + if (buffer[0] != expected_type) { - DEBUGOUT_3 ("status: %02X error: %02X octet[9]: %02X\n" - " data:", buffer[7], buffer[8], buffer[9] ); - for (i=10; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", buffer[i]); - DEBUGOUT_LF (); + DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]); + abort_cmd (handle, seqno); + return CCID_DRIVER_ERR_INV_VALUE; + } + + if (debug_level && (!no_debug || debug_level >= 3)) + { + switch (buffer[0]) + { + case RDR_to_PC_DataBlock: + print_r2p_datablock (buffer, msglen); + break; + case RDR_to_PC_SlotStatus: + print_r2p_slotstatus (buffer, msglen); + break; + case RDR_to_PC_Parameters: + print_r2p_parameters (buffer, msglen); + break; + case RDR_to_PC_Escape: + print_r2p_escape (buffer, msglen); + break; + case RDR_to_PC_DataRate: + print_r2p_datarate (buffer, msglen); + break; + default: + print_r2p_unknown (buffer, msglen); + break; + } } if (CCID_COMMAND_FAILED (buffer)) print_command_failed (buffer); @@ -1501,6 +2038,110 @@ } + +/* Send an abort sequence and wait until everything settled. */ +static int +abort_cmd (ccid_driver_t handle, int seqno) +{ + int rc; + char dummybuf[8]; + unsigned char msg[100]; + size_t msglen; + + if (!handle->idev) + { + /* I don't know how to send an abort to non-USB devices. */ + rc = CCID_DRIVER_ERR_NOT_SUPPORTED; + } + + seqno &= 0xff; + DEBUGOUT_1 ("sending abort sequence for seqno %d\n", seqno); + /* Send the abort command to the control pipe. Note that we don't + need to keep track of sent abort commands because there should + never be another thread using the same slot concurrently. */ + rc = usb_control_msg (handle->idev, + 0x21,/* bmRequestType: host-to-device, + class specific, to interface. */ + 1, /* ABORT */ + (seqno << 8 | 0 /* slot */), + handle->ifc_no, + dummybuf, 0, + 1000 /* ms timeout */); + if (rc < 0) + { + DEBUGOUT_1 ("usb_control_msg error: %s\n", strerror (errno)); + return CCID_DRIVER_ERR_CARD_IO_ERROR; + } + + /* Now send the abort command to the bulk out pipe using the same + SEQNO and SLOT. Do this in a loop to so that all seqno are + tried. */ + seqno--; /* Adjust for next increment. */ + do + { + seqno++; + msg[0] = PC_to_RDR_Abort; + msg[5] = 0; /* slot */ + msg[6] = seqno; + msg[7] = 0; /* RFU */ + msg[8] = 0; /* RFU */ + msg[9] = 0; /* RFU */ + msglen = 10; + set_msg_len (msg, 0); + + rc = usb_bulk_write (handle->idev, + handle->ep_bulk_out, + (char*)msg, msglen, + 5000 /* ms timeout */); + if (rc == msglen) + rc = 0; + else if (rc == -1) + DEBUGOUT_1 ("usb_bulk_write error in abort_cmd: %s\n", + strerror (errno)); + else + DEBUGOUT_1 ("usb_bulk_write failed in abort_cmd: %d\n", rc); + + if (rc) + return rc; + + rc = usb_bulk_read (handle->idev, + handle->ep_bulk_in, + (char*)msg, sizeof msg, + 5000 /*ms timeout*/); + if (rc < 0) + { + DEBUGOUT_1 ("usb_bulk_read error in abort_cmd: %s\n", + strerror (errno)); + return CCID_DRIVER_ERR_CARD_IO_ERROR; + } + msglen = rc; + + if (msglen < 10) + { + DEBUGOUT_1 ("bulk-in msg in abort_cmd too short (%u)\n", + (unsigned int)msglen); + return CCID_DRIVER_ERR_INV_VALUE; + } + if (msg[5] != 0) + { + DEBUGOUT_1 ("unexpected bulk-in slot (%d) in abort_cmd\n", msg[5]); + return CCID_DRIVER_ERR_INV_VALUE; + } + + DEBUGOUT_3 ("status: %02X error: %02X octet[9]: %02X\n", + msg[7], msg[8], msg[9]); + if (CCID_COMMAND_FAILED (msg)) + print_command_failed (msg); + } + while (msg[0] != RDR_to_PC_SlotStatus && msg[5] != 0 && msg[6] != seqno); + + handle->seqno = ((seqno + 1) & 0xff); + DEBUGOUT ("sending abort sequence succeeded\n"); + + return 0; +} + + /* Note that this function won't return the error codes NO_CARD or CARD_INACTIVE. IF RESULT is not NULL, the result from the operation will get returned in RESULT and its length in RESULTLEN. @@ -1511,7 +2152,7 @@ const unsigned char *data, size_t datalen, unsigned char *result, size_t resultmax, size_t *resultlen) { - int i, rc; + int rc; unsigned char msg[100]; size_t msglen; unsigned char seqno; @@ -1532,11 +2173,7 @@ msglen = 10 + datalen; set_msg_len (msg, datalen); - DEBUGOUT ("sending"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Escape, @@ -1637,7 +2274,7 @@ } -/* Note that this fucntion won't return the error codes NO_CARD or +/* Note that this function won't return the error codes NO_CARD or CARD_INACTIVE */ int ccid_slot_status (ccid_driver_t handle, int *statusbits) @@ -1657,7 +2294,7 @@ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); - rc = bulk_out (handle, msg, 10); + rc = bulk_out (handle, msg, 10, 1); if (rc) return rc; /* Note that we set the NO_DEBUG flag here, so that the logs won't @@ -1687,6 +2324,8 @@ } +/* Return the ATR of the card. This is not a cached value and thus an + actual reset is done. */ int ccid_get_atr (ccid_driver_t handle, unsigned char *atr, size_t maxatrlen, size_t *atrlen) @@ -1699,7 +2338,6 @@ unsigned char seqno; int use_crc = 0; unsigned int edc; - int i; int tried_iso = 0; int got_param; @@ -1710,7 +2348,6 @@ if (statusbits == 2) return CCID_DRIVER_ERR_NO_CARD; - /* For an inactive and also for an active card, issue the PowerOn command to get the ATR. */ again: @@ -1723,7 +2360,7 @@ set_msg_len (msg, 0); msglen = 10; - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_DataBlock, @@ -1768,34 +2405,14 @@ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); msglen = 10; - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (!rc) rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Parameters, seqno, 2000, 0); if (rc) DEBUGOUT ("GetParameters failed\n"); - else - { - DEBUGOUT ("GetParametes returned"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); - if (msglen >= 10) - { - DEBUGOUT_1 (" protocol ..........: T=%d\n", msg[9]); - if (msglen == 17 && msg[9] == 1) - { - DEBUGOUT_1 (" bmFindexDindex ....: %02X\n", msg[10]); - DEBUGOUT_1 (" bmTCCKST1 .........: %02X\n", msg[11]); - DEBUGOUT_1 (" bGuardTimeT1 ......: %02X\n", msg[12]); - DEBUGOUT_1 (" bmWaitingIntegersT1: %02X\n", msg[13]); - DEBUGOUT_1 (" bClockStop ........: %02X\n", msg[14]); - DEBUGOUT_1 (" bIFSC .............: %d\n", msg[15]); - DEBUGOUT_1 (" bNadValue .........: %d\n", msg[16]); - got_param = 1; - } - } - } + else if (msglen == 17 && msg[9] == 1) + got_param = 1; /* Setup parameters to select T=1. */ msg[0] = PC_to_RDR_SetParameters; @@ -1819,12 +2436,7 @@ set_msg_len (msg, 7); msglen = 10 + 7; - DEBUGOUT ("sending"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); - - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Parameters, @@ -1832,6 +2444,11 @@ if (rc) DEBUGOUT ("SetParameters failed (ignored)\n"); + if (!rc && msglen > 15 && msg[15] >= 16 && msg[15] <= 254 ) + handle->ifsc = msg[15]; + else + handle->ifsc = 128; /* Something went wrong, assume 128 bytes. */ + handle->t1_ns = 0; handle->t1_nr = 0; @@ -1859,11 +2476,6 @@ set_msg_len (msg, tpdulen); msglen = 10 + tpdulen; - DEBUGOUT ("sending"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); - if (debug_level > 1) DEBUGOUT_3 ("T=1: put %c-block seq=%d%s\n", ((msg[11] & 0xc0) == 0x80)? 'R' : @@ -1872,7 +2484,7 @@ : !!(msg[11] & 0x40)), (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; @@ -1929,6 +2541,16 @@ } +/* Return true if APDU is an extended length one. */ +static int +is_exlen_apdu (const unsigned char *apdu, size_t apdulen) +{ + if (apdulen < 7 || apdu[4]) + return 0; /* Too short or no Z byte. */ + return 1; +} + + /* Helper for ccid_transceive used for APDU level exchanges. */ static int ccid_transceive_apdu_level (ccid_driver_t handle, @@ -1937,13 +2559,13 @@ size_t *nresp) { int rc; - unsigned char send_buffer[10+259], recv_buffer[10+259]; + unsigned char send_buffer[10+261+300], recv_buffer[10+261+300]; const unsigned char *apdu; size_t apdulen; unsigned char *msg; size_t msglen; unsigned char seqno; - int i; + int bwi = 4; msg = send_buffer; @@ -1951,25 +2573,23 @@ apdulen = apdu_buflen; assert (apdulen); - if (apdulen > 254) + /* The maximum length for a short APDU T=1 block is 261. For an + extended APDU T=1 block the maximum length 65544; however + extended APDU exchange level is not yet supported. */ + if (apdulen > 261) 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[7] = bwi; /* 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); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; @@ -2059,19 +2679,24 @@ unsigned char *resp, size_t maxresplen, size_t *nresp) { int rc; - unsigned char send_buffer[10+259], recv_buffer[10+259]; + /* The size of the buffer used to be 10+259. For the via_escape + hack we need one extra byte, thus 11+259. */ + unsigned char send_buffer[11+259], recv_buffer[11+259]; const unsigned char *apdu; size_t apdulen; unsigned char *msg, *tpdu, *p; size_t msglen, tpdulen, last_tpdulen, n; unsigned char seqno; - int i; unsigned int edc; int use_crc = 0; + int hdrlen, pcboff; size_t dummy_nresp; + int via_escape = 0; int next_chunk = 1; int sending = 1; int retries = 0; + int resyncing = 0; + int nad_byte; if (!nresp) nresp = &dummy_nresp; @@ -2079,13 +2704,37 @@ /* 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); + { + /* We employ a hack for Omnikey readers which are able to send + TPDUs using an escape sequence. There is no documentation + but the Windows driver does it this way. Tested using a + CM6121. This method works also for the Cherry XX44 + keyboards; however there are problems with the + ccid_tranceive_secure which leads to a loss of sync on the + CCID level. If Cherry wants to make their keyboard work + again, they should hand over some docs. */ + if ((handle->id_vendor == VENDOR_OMNIKEY + || (!handle->idev && handle->id_product == TRANSPORT_CM4040)) + && handle->apdu_level < 2 + && is_exlen_apdu (apdu_buf, apdu_buflen)) + via_escape = 1; + else + 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; + hdrlen = via_escape? 11 : 10; + + /* NAD: DAD=1, SAD=0 */ + nad_byte = handle->nonnull_nad? ((1 << 4) | 0): 0; + if (via_escape) + nad_byte = 0; + + last_tpdulen = 0; /* Avoid gcc warning (controlled by RESYNCING). */ for (;;) { if (next_chunk) @@ -2097,18 +2746,14 @@ assert (apdulen); /* Construct an I-Block. */ - if (apdulen > 254) - return CCID_DRIVER_ERR_INV_VALUE; /* Invalid length. */ - - tpdu = msg+10; - /* NAD: DAD=1, SAD=0 */ - tpdu[0] = handle->nonnull_nad? ((1 << 4) | 0): 0; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; tpdu[1] = ((handle->t1_ns & 1) << 6); /* I-block */ - if (apdulen > 128 /* fixme: replace by ifsc */) + if (apdulen > handle->ifsc ) { - apdulen = 128; - apdu_buf += 128; - apdu_buflen -= 128; + apdulen = handle->ifsc; + apdu_buf += handle->ifsc; + apdu_buflen -= handle->ifsc; tpdu[1] |= (1 << 5); /* Set more bit. */ } tpdu[2] = apdulen; @@ -2120,42 +2765,56 @@ tpdu[tpdulen++] = edc; } - 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 */ - set_msg_len (msg, tpdulen); - msglen = 10 + tpdulen; - last_tpdulen = tpdulen; - - DEBUGOUT ("sending"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); + if (via_escape) + { + msg[0] = PC_to_RDR_Escape; + msg[5] = 0; /* slot */ + msg[6] = seqno = handle->seqno++; + msg[7] = 0; /* RFU */ + msg[8] = 0; /* RFU */ + msg[9] = 0; /* RFU */ + msg[10] = 0x1a; /* Omnikey command to send a TPDU. */ + set_msg_len (msg, 1 + tpdulen); + } + else + { + 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 */ + set_msg_len (msg, tpdulen); + } + msglen = hdrlen + tpdulen; + if (!resyncing) + last_tpdulen = tpdulen; + pcboff = hdrlen+1; if (debug_level > 1) - DEBUGOUT_3 ("T=1: put %c-block seq=%d%s\n", - ((msg[11] & 0xc0) == 0x80)? 'R' : - (msg[11] & 0x80)? 'S' : 'I', - ((msg[11] & 0x80)? !!(msg[11]& 0x10) - : !!(msg[11] & 0x40)), - (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); - - rc = bulk_out (handle, msg, msglen); + DEBUGOUT_3 ("T=1: put %c-block seq=%d%s\n", + ((msg[pcboff] & 0xc0) == 0x80)? 'R' : + (msg[pcboff] & 0x80)? 'S' : 'I', + ((msg[pcboff] & 0x80)? !!(msg[pcboff]& 0x10) + : !!(msg[pcboff] & 0x40)), + (!(msg[pcboff] & 0x80) && (msg[pcboff] & 0x20)? + " [more]":"")); + + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; msg = recv_buffer; rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, - RDR_to_PC_DataBlock, seqno, 5000, 0); + via_escape? RDR_to_PC_Escape : RDR_to_PC_DataBlock, + seqno, 5000, 0); if (rc) return rc; - - tpdu = msg + 10; - tpdulen = msglen - 10; - + + tpdu = msg + hdrlen; + tpdulen = msglen - hdrlen; + resyncing = 0; + if (tpdulen < 4) { usb_clear_halt (handle->idev, handle->ep_bulk_in); @@ -2164,11 +2823,13 @@ if (debug_level > 1) DEBUGOUT_4 ("T=1: got %c-block seq=%d err=%d%s\n", - ((msg[11] & 0xc0) == 0x80)? 'R' : - (msg[11] & 0x80)? 'S' : 'I', - ((msg[11] & 0x80)? !!(msg[11]& 0x10) : !!(msg[11] & 0x40)), - ((msg[11] & 0xc0) == 0x80)? (msg[11] & 0x0f) : 0, - (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); + ((msg[pcboff] & 0xc0) == 0x80)? 'R' : + (msg[pcboff] & 0x80)? 'S' : 'I', + ((msg[pcboff] & 0x80)? !!(msg[pcboff]& 0x10) + : !!(msg[pcboff] & 0x40)), + ((msg[pcboff] & 0xc0) == 0x80)? (msg[pcboff] & 0x0f) : 0, + (!(msg[pcboff] & 0x80) && (msg[pcboff] & 0x20)? + " [more]":"")); if (!(tpdu[1] & 0x80)) { /* This is an I-block. */ @@ -2182,9 +2843,8 @@ if (!!(tpdu[1] & 0x40) != handle->t1_nr) { /* Reponse does not match our sequence number. */ msg = send_buffer; - tpdu = msg+10; - /* NAD: DAD=1, SAD=0 */ - tpdu[0] = handle->nonnull_nad? ((1 << 4) | 0): 0; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; tpdu[1] = (0x80 | (handle->t1_nr & 1) << 4 | 2); /* R-block */ tpdu[2] = 0; tpdulen = 3; @@ -2221,9 +2881,8 @@ return 0; /* No chaining requested - ready. */ msg = send_buffer; - tpdu = msg+10; - /* NAD: DAD=1, SAD=0 */ - tpdu[0] = handle->nonnull_nad? ((1 << 4) | 0): 0; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; tpdu[1] = (0x80 | (handle->t1_nr & 1) << 4); /* R-block */ tpdu[2] = 0; tpdulen = 3; @@ -2235,14 +2894,37 @@ else if ((tpdu[1] & 0xc0) == 0x80) { /* This is a R-block. */ if ( (tpdu[1] & 0x0f)) - { /* Error: repeat last block */ - if (++retries > 3) + { + retries++; + if (via_escape && retries == 1 && (msg[pcboff] & 0x0f)) + { + /* Error probably due to switching to TPDU. Send a + resync request. We use the recv_buffer so that + we don't corrupt the send_buffer. */ + msg = recv_buffer; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; + tpdu[1] = 0xc0; /* S-block resync request. */ + tpdu[2] = 0; + tpdulen = 3; + edc = compute_edc (tpdu, tpdulen, use_crc); + if (use_crc) + tpdu[tpdulen++] = (edc >> 8); + tpdu[tpdulen++] = edc; + resyncing = 1; + DEBUGOUT ("T=1: requesting resync\n"); + } + else if (retries > 3) { - DEBUGOUT ("3 failed retries\n"); + DEBUGOUT ("T=1: 3 failed retries\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } - msg = send_buffer; - tpdulen = last_tpdulen; + else + { + /* Error: repeat last block */ + msg = send_buffer; + tpdulen = last_tpdulen; + } } else if (sending && !!(tpdu[1] & 0x10) == handle->t1_ns) { /* Response does not match our sequence number. */ @@ -2265,16 +2947,37 @@ else { /* This is a S-block. */ retries = 0; - DEBUGOUT_2 ("T=1 S-block %s received cmd=%d\n", + DEBUGOUT_2 ("T=1: S-block %s received cmd=%d\n", (tpdu[1] & 0x20)? "response": "request", (tpdu[1] & 0x1f)); - if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 3 && tpdu[2]) - { /* Wait time extension request. */ + if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 1 && tpdu[2] == 1) + { + /* Information field size request. */ + unsigned char ifsc = tpdu[3]; + + if (ifsc < 16 || ifsc > 254) + return CCID_DRIVER_ERR_CARD_IO_ERROR; + + msg = send_buffer; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; + tpdu[1] = (0xc0 | 0x20 | 1); /* S-block response */ + tpdu[2] = 1; + tpdu[3] = ifsc; + tpdulen = 4; + edc = compute_edc (tpdu, tpdulen, use_crc); + if (use_crc) + tpdu[tpdulen++] = (edc >> 8); + tpdu[tpdulen++] = edc; + DEBUGOUT_1 ("T=1: requesting an ifsc=%d\n", ifsc); + } + else if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 3 && tpdu[2]) + { + /* Wait time extension request. */ unsigned char bwi = tpdu[3]; msg = send_buffer; - tpdu = msg+10; - /* NAD: DAD=1, SAD=0 */ - tpdu[0] = handle->nonnull_nad? ((1 << 4) | 0): 0; + tpdu = msg + hdrlen; + tpdu[0] = nad_byte; tpdu[1] = (0xc0 | 0x20 | 3); /* S-block response */ tpdu[2] = 1; tpdu[3] = bwi; @@ -2283,7 +2986,15 @@ if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; - DEBUGOUT_1 ("T=1 waittime extension of bwi=%d\n", bwi); + DEBUGOUT_1 ("T=1: waittime extension of bwi=%d\n", bwi); + print_progress (handle); + } + else if ( (tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 0 && !tpdu[2]) + { + DEBUGOUT ("T=1: resync ack from reader\n"); + /* Repeat previous block. */ + msg = send_buffer; + tpdulen = last_tpdulen; } else return CCID_DRIVER_ERR_CARD_IO_ERROR; @@ -2320,9 +3031,9 @@ unsigned char *msg, *tpdu, *p; size_t msglen, tpdulen, n; unsigned char seqno; - int i; size_t dummy_nresp; int testmode; + int cherry_mode = 0; testmode = !resp && !nresp; @@ -2354,10 +3065,26 @@ || pinlen_min > pinlen_max) return CCID_DRIVER_ERR_INV_VALUE; - /* We have only tested this with an SCM reader so better don't risk - anything and do not allow the use with other readers. */ - if (handle->id_vendor != VENDOR_SCM) - return CCID_DRIVER_ERR_NOT_SUPPORTED; + /* We have only tested a few readers so better don't risk anything + and do not allow the use with other readers. */ + switch (handle->id_vendor) + { + case VENDOR_SCM: /* Tested with SPR 532. */ + case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */ + break; + case VENDOR_CHERRY: + /* The CHERRY XX44 keyboard echos an asterisk for each entered + character on the keyboard channel. We use a special variant + of PC_to_RDR_Secure which directs these characters to the + smart card's bulk-in channel. We also need to append a zero + Lc byte to the APDU. It seems that it will be replaced with + the actual length instead of being appended before the APDU + is send to the card. */ + cherry_mode = 1; + break; + default: + return CCID_DRIVER_ERR_NOT_SUPPORTED; + } if (testmode) return 0; /* Success */ @@ -2372,10 +3099,10 @@ return rc; } - msg[0] = PC_to_RDR_Secure; + msg[0] = cherry_mode? 0x89 : PC_to_RDR_Secure; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; - msg[7] = 4; /* bBWI */ + msg[7] = 0; /* bBWI */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ msg[10] = 0; /* Perform PIN verification. */ @@ -2384,7 +3111,7 @@ if (handle->id_vendor == VENDOR_SCM) { /* For the SPR532 the next 2 bytes need to be zero. We do this - for all SCM product. Kudos to Martin Paljak for this + for all SCM products. Kudos to Martin Paljak for this hint. */ msg[13] = msg[14] = 0; } @@ -2396,8 +3123,11 @@ msg[14] = 0x00; /* bmPINLengthFormat: Units are bytes, position is 0. */ } - msg[15] = pinlen_min; /* wPINMaxExtraDigit-Minimum. */ - msg[16] = pinlen_max; /* wPINMaxExtraDigit-Maximum. */ + + /* The following is a little endian word. */ + msg[15] = pinlen_max; /* wPINMaxExtraDigit-Maximum. */ + msg[16] = pinlen_min; /* wPINMaxExtraDigit-Minimum. */ + msg[17] = 0x02; /* bEntryValidationCondition: Validation key pressed */ if (pinlen_min && pinlen_max && pinlen_min == pinlen_max) @@ -2409,32 +3139,48 @@ /* bTeoProlog follows: */ msg[22] = handle->nonnull_nad? ((1 << 4) | 0): 0; msg[23] = ((handle->t1_ns & 1) << 6); /* I-block */ - msg[24] = 4; /* apdulen. */ + msg[24] = 0; /* The apdulen will be filled in by the reader. */ /* APDU follows: */ msg[25] = apdu_buf[0]; /* CLA */ msg[26] = apdu_buf[1]; /* INS */ msg[27] = apdu_buf[2]; /* P1 */ msg[28] = apdu_buf[3]; /* P2 */ msglen = 29; + if (cherry_mode) + msg[msglen++] = 0; + /* An EDC is not required. */ set_msg_len (msg, msglen - 10); - DEBUGOUT ("sending"); - for (i=0; i < msglen; i++) - DEBUGOUT_CONT_1 (" %02X", msg[i]); - DEBUGOUT_LF (); - - rc = bulk_out (handle, msg, msglen); + rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; msg = recv_buffer; rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, - RDR_to_PC_DataBlock, seqno, 5000, 0); + RDR_to_PC_DataBlock, seqno, 30000, 0); if (rc) return rc; tpdu = msg + 10; tpdulen = msglen - 10; + + if (handle->apdu_level) + { + if (resp) + { + if (tpdulen > maxresplen) + { + DEBUGOUT_2 ("provided buffer too short for received data " + "(%u/%u)\n", + (unsigned int)tpdulen, (unsigned int)maxresplen); + return CCID_DRIVER_ERR_INV_VALUE; + } + + memcpy (resp, tpdu, tpdulen); + *nresp = tpdulen; + } + return 0; + } if (tpdulen < 4) { @@ -2507,7 +3253,7 @@ } else { /* This is a S-block. */ - DEBUGOUT_2 ("T=1 S-block %s received cmd=%d for Secure operation\n", + DEBUGOUT_2 ("T=1: S-block %s received cmd=%d for Secure operation\n", (tpdu[1] & 0x20)? "response": "request", (tpdu[1] & 0x1f)); return CCID_DRIVER_ERR_CARD_IO_ERROR; @@ -2548,6 +3294,7 @@ fprintf (stderr, "operation failed: %s\n", p); } + static void print_data (const unsigned char *data, size_t length) { @@ -2580,7 +3327,7 @@ { int rc; ccid_driver_t ccid; - unsigned int slotstat; + int slotstat; unsigned char result[512]; size_t resultlen; int no_pinpad = 0; @@ -2608,7 +3355,7 @@ } else if ( !strcmp (*argv, "--debug")) { - ccid_set_debug_level (1); + ccid_set_debug_level (ccid_set_debug_level (-1)+1); argc--; argv++; } else if ( !strcmp (*argv, "--no-poll")) diff -Nru gnupg-1.4.9/g10/ccid-driver.h gnupg-1.4.10/g10/ccid-driver.h --- gnupg-1.4.9/g10/ccid-driver.h 2007-10-23 11:40:11.000000000 +0100 +++ gnupg-1.4.10/g10/ccid-driver.h 2009-07-21 14:21:44.000000000 +0100 @@ -50,7 +50,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ccid-driver.h 4603 2007-10-23 10:48:09Z wk $ + * $Id: ccid-driver.h 5085 2009-07-21 14:30:13Z wk $ */ #ifndef CCID_DRIVER_H @@ -80,6 +80,9 @@ int ccid_set_debug_level (int level); char *ccid_get_reader_list (void); int ccid_open_reader (ccid_driver_t *handle, const char *readerid); +int ccid_set_progress_cb (ccid_driver_t handle, + void (*cb)(void *, const char *, int, int, int), + void *cb_arg); int ccid_shutdown_reader (ccid_driver_t handle); int ccid_close_reader (ccid_driver_t handle); int ccid_get_atr (ccid_driver_t handle, diff -Nru gnupg-1.4.9/g10/ChangeLog gnupg-1.4.10/g10/ChangeLog --- gnupg-1.4.9/g10/ChangeLog 2008-03-25 09:20:23.000000000 +0000 +++ gnupg-1.4.10/g10/ChangeLog 2009-09-02 16:49:40.000000000 +0100 @@ -1,3 +1,294 @@ +2009-09-02 Werner Koch + + * app-openpgp.c (do_decipher): Compute required Le. + * iso7816.c (iso7816_decipher): Add new arg LE. + + * compress-bz2.c (do_uncompress): Detect unexpected EOF. Fixes + bug#1011. + +2009-08-26 Werner Koch + + * keyedit.c (menu_revsig): Check for signature right away. Fix + Debian-bug#543530. + +2009-08-13 Werner Koch + + * cardglue.h: Add new error code mappings. + + From GnuPG-2: + * app-openpgp.c (change_keyattr_from_string): New. + (do_setattr): Support KEY-ATTR. + * ccid-driver.c (print_pr_data): Fix 64 bit compat problem. + * ccid-driver.c (parse_ccid_descriptor): Enable hack for SCR 3320. + * card-util.c (generate_card_keys): Remove special case for + GnuPG-2. Ask for the keysize and change it. + (card_generate_subkey): Ask for the keysize and change it. + (get_info_for_key_operation): Read KEY-ATTR. + (show_keysize_warning, ask_card_keysize): New. + (do_change_keysize): New. + +2009-08-11 David Shaw + + * keyserver.c (keyserver_spawn): Try and detect mis-coded Latin1 + and convert it to UTF8. Whether the heuristics succeed or not, + the resulting string must be valid UTF8 as LDAP requires that. + This is bug 1055. + +2009-08-03 Werner Koch + + * card-util.c (generate_card_keys): Ask for off-card keys only if + the card supports it. + (get_info_for_key_operation): Read EXTCAP. + (card_store_subkey): Check for non matching sizes. + + * cardglue.c (agent_scd_writecert, agent_scd_readcert): New stubs. + * misc.c (not_in_gpg1_notice): New. + +2009-07-30 Werner Koch + + * misc.c (md5_digest_warn): New. + (print_digest_algo_note): Divert to new function. + * sig-check.c (do_check): Print MD5 warning. + +2009-07-31 David Shaw + + * gpg.c (main): --pgp6 includes --disable-mdc. + +2009-07-29 Werner Koch + + * keygen.c (keygen_set_std_prefs): Remove RMD-160 from the list. + Change order to SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. + (gen_dsa): Use a 256 bit Q for 2048 bit P. Round to FIPS allowed + values in non-expert mode. + (ask_algo): Add arg R_SUBKEY_ALGO. Change return value semantics. + Change presented order of algorithms. Make RSA+RSA the default. + (generate_keypair, generate_subkeypair): Adjust for change. + +2009-07-23 Werner Koch + + * keygen.c (generate_keypair): Allow Elgamal > 3072 in BOTH mode. + Reported by Jeroen Schot. Fixes bug#1091. + (ask_keysize): Add new arg PRIMARY_KEYSIZE. Set DSA default to + 2048. Print a different prompt for a subkey. + (gen_dsa): Remove check for dsa2 option. + + * trustdb.c (how_to_fix_the_trustdb): New. + * tdbio.c (tdbio_invalid): Print hints on how to fix the trustdb. + * gpg.c (main) : Print hints. + +2009-07-23 David Shaw + + * keyserver.c (keyserver_import_ldap): Try a DNS-SD lookup to find + a domain-specific LDAP server before resorting to keys.{domain}. + +2009-07-22 Werner Koch + + * cardglue.h (struct agent_card_info_s): Add field EXTCAP. + * cardglue.c (agent_learn): Read KEY-ATTR. + (learn_status_cb): Parse EXTCAP. + +2009-07-21 Werner Koch + + * app-common.h, app-openpgp.c, iso7816.c, iso7816.h, apdu.c, + * apdu.h, ccid-driver.c, ccid-driver.h, card-util.c: Update from + GnuPG 2.0 SVN revision 5084. + + * cardglue.h (GCRY_MD_SHA256): Add more GCRY_MD constants. + (gcry_handler_progress_t): Add definition. + (struct agent_card_info_s): Add fields apptype, is_v2, key_attr. + * cardglue.c (learn_status_cb): Set them. + (agent_release_card_info): Release APPTYPE. + (unescape_status_string, send_status_direct): New. + (gcry_mpi_release, gcry_mpi_set_opaque): New. + (gcry_md_algo_name): New. + (open_card): s/initialized/ref_count/. + (agent_learn): Pass new new flag arg to learn_status. + (agent_scd_genkey): Add new arg createtime. + * keygen.c (gen_card_key, gen_card_key_with_backup): Add new arg + TIMESTAMP. + (write_direct_sig, write_selfsigs, write_keybinding) + (make_backsig): Ditto. + (do_generate_keypair): Pass timestamp to all signing functions. + (generate_card_subkeypair): Ditto. + * keyedit.c (menu_backsign): Pass a new timestamp to all backsisg. + + * gpg.c (main): Disable keypad support. + * options.h (struct): Add field disable_keypad. + +2009-07-17 Werner Koch + + * keyring.c (keyring_rebuild_cache): Replace the assert by a + proper error message and allow to delete a bad keyblock. + +2009-07-16 Werner Koch + + * misc.c (has_invalid_email_chars): Let non-ascii characters pass + through. Fixes bug#1087. + +2009-06-24 Werner Koch + + * passphrase.c (passphrase_to_dek): Do not deref a PW of NULL. + * revoke.c (gen_revoke): Remove unused malloc of PK. + +2009-06-17 Werner Koch + + * parse-packet.c (parse): Use a casted -1 instead of a 32 bit + constant to check for a garbled package. Fixes bug#1040. + +2009-06-05 David Shaw + + * gpg.c (main): Remove Camellia restriction. + +2009-06-02 Werner Koch + + * gpgv.c (tty_cleanup_after_signal): Add new stub. + +2009-05-22 Werner Koch + + * signal.c (got_fatal_signal): Call tty_cleanup_after_signal. + +2009-05-20 Werner Koch + + * gpg.c (main): Fix --fingerprint/--with-fingerprint command + detection. Fixes bug#1044. + +2009-05-11 Werner Koch + + * apdu.c (send_le): Replace log_error by log_info. Fixes bug#1043. + + * skclist.c (build_sk_list): Use log_info for "duplicated entry". + Fixes bug#1045. + + * encode.c (encode_simple, encode_crypt): Print empty file warning + only in verbose mode. Closes bug#1039. + * sign.c (write_plaintext_packet): + +2009-05-06 Werner Koch + + * keyring.c (keyring_get_keyblock): Fix memory leak due to + ring_trust packets. Fixes bug#1034. + + * getkey.c (finish_lookup): Remove dead code. + +2009-05-05 Werner Koch + + * keygen.c (read_parameter_file): Add keyword "Creation-Date". + (output_control_s): s/create/creation/. + (enum para_name): Add pCREATIONDATE, pKEYCREATIONDATE. Remove + pCREATETIME. + (generate_keypair): Do not set old pCREATETIME. + (parse_creation_string): New. + (proc_parameter_file): Set pCREATIONDATE. + (do_generate_keypair): Remove arg TIMESTAMP. Set it using + pKEYCREATIONDATE. + (get_parameter_u32): Set a default pKEYCREATIONDATE. + + * tdbio.c (lookup_hashtable): Add const to function args. + (cmp_trec_fpr): Ditto. + (tdbio_search_trust_byfpr): Remove cast. + + * parse-packet.c (parse): Remove special treatment for compressed + new style packets. Fixes bug#931. + +2009-04-03 Werner Koch + + * gpgv.c (main): Pass readonly flag to keydb_add_resource. + * keydb.c (keydb_add_resource): Add arg READONLY. + +2009-03-20 David Shaw + + * keyring.c (rename_tmp_file): Force a fsync (via iobuf_ioctl) on + secret keyring files to be extra safe on filesystems that may not + sync data and metadata together (ext4). Also check return code + from the cache invalidation to make sure we're safe over NFS and + similar. + +2009-03-14 David Shaw + + * gpgv.c (strusage): Fix name of program in "Syntax" line. + +2009-02-09 Werner Koch + + * keylist.c (print_capabilities): Take care of cert-only keys. + Fixes bug#998. + +2009-02-03 David Shaw + + * keyserver.c (keyserver_typemap): gpgkeys_hkp handles hkps as + well. + +2008-12-21 David Shaw + + * gpg.c (main): Properly handle UTF8 usernames with --sign-key and + --lsign-key. + +2008-12-11 Werner Koch + + * sig-check.c (check_revocation_keys): Close message digest. + (signature_check2): Switch to SHA-1 for SIG_ID computation. This + is to match 2.0.10. + +2008-12-09 Werner Koch + + * keygen.c (proc_parameter_file): Check that key and subkey usages + are allowed. + +2008-11-18 David Shaw + + * trustdb.c (validate_one_keyblock): Fix the trust signature + calculations so that we lower the trust depth of signatures to fit + within the current chain, rather than discarding any signature + that does not fit within the trust depth. + +2008-10-03 David Shaw + + * main.h, mainproc.c (check_sig_and_print), + keylist.c (list_keyblock_print), pkclist.c (do_edit_ownertrust), + keyedit.c (menu_showphoto), photoid.c (generate_photo_id, + show_photos), misc.c (pct_expando): Add %v and %V expandos so + that displaying photo IDs can show the attribute validity + tag (%v) and string (%V). Originally by Daniel Gillmor. + +2008-09-24 David Shaw + + * keyedit.c (keyedit_menu): Fix bug where a modified keyring loses + its modified status after a "clean" or "minimize" that doesn't + need to do anything. + +2008-09-23 David Shaw + + * pkclist.c (select_algo_from_prefs): Redo function to rank prefs + and pick a consensus winner across all keys. + +2008-09-04 David Shaw + + * keyserver.c (keyserver_import_cert): Allow keyserver URLs in + addition to full URLs in CERT records. + +2008-08-11 Werner Koch + + * keygen.c (ask_expire_interval): Check for time overflow of an + u32. Fixes bug #947. Use SIZEOF_TIME_T for the 2039--2106 check. + +2008-08-01 Werner Koch + + * tdbio.c (open_db) [!EROFS]: Move closing parens out of the + ifdef. Reported by Ken Takusagawa. + +2008-04-30 Werner Koch + + * getkey.c (parse_auto_key_locate): Ignore nodefault and local + methods. + +2008-04-17 David Shaw + + * parse-packet.c (parse_key): Add constant for Camellia-192. + +2008-04-12 David Shaw + + * getkey.c (merge_selfsigs_subkey): If there are multiple 0x19 + backsigs, take the most recent one. + 2008-03-25 Werner Koch * keyserver.c (parse_keyrec): Take care of char defaulting to @@ -274,8 +565,8 @@ 2007-01-31 David Shaw - * keygen.c (do_generate_keypair, proc_parameter_file, - generate_keypair, generate_subkeypair): Pass a timestamp through + * keygen.c (do_generate_keypair, proc_parameter_file) + (generate_keypair, generate_subkeypair): Pass a timestamp through to all the gen_xxx functions. * keyedit.c (sign_uids): Another multiple to single timestamp @@ -13295,7 +13586,7 @@ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008, 2009 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 diff -Nru gnupg-1.4.9/g10/compress-bz2.c gnupg-1.4.10/g10/compress-bz2.c --- gnupg-1.4.9/g10/compress-bz2.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/compress-bz2.c 2009-09-02 14:36:58.000000000 +0100 @@ -117,6 +117,7 @@ size_t n; int nread, count; int refill = !bzs->avail_in; + int eofseen = 0; if( DBG_FILTER ) log_debug("begin bzDecompress: avail_in=%u, avail_out=%u, inbuf=%u\n", @@ -131,12 +132,16 @@ bzs->next_in = zfx->inbuf; count = zfx->inbufsize - n; nread = iobuf_read( a, zfx->inbuf + n, count ); - if( nread == -1 ) nread = 0; + if( nread == -1 ) + { + eofseen = 1; + nread = 0; + } n += nread; bzs->avail_in = n; } - - refill = 1; + if (!eofseen) + refill = 1; if( DBG_FILTER ) log_debug("enter bzDecompress: avail_in=%u, avail_out=%u\n", @@ -150,6 +155,13 @@ rc = -1; /* eof */ else if( zrc != BZ_OK && zrc != BZ_PARAM_ERROR ) log_fatal("bz2lib inflate problem: rc=%d\n", zrc ); + else if (zrc == BZ_OK && eofseen + && !bzs->avail_in && bzs->avail_out > 0) + { + log_error ("unexpected EOF in bz2lib\n"); + rc = G10ERR_READ_FILE; + break; + } } while( bzs->avail_out && zrc != BZ_STREAM_END && zrc != BZ_PARAM_ERROR ); diff -Nru gnupg-1.4.9/g10/compress.c gnupg-1.4.10/g10/compress.c --- gnupg-1.4.9/g10/compress.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/compress.c 2009-09-02 14:04:53.000000000 +0100 @@ -175,7 +175,8 @@ #endif /* __riscos__ */ count = zfx->inbufsize - n; nread = iobuf_read( a, zfx->inbuf + n, count ); - if( nread == -1 ) nread = 0; + if( nread == -1 ) + nread = 0; n += nread; /* If we use the undocumented feature to suppress * the zlib header, we have to give inflate an diff -Nru gnupg-1.4.9/g10/encode.c gnupg-1.4.10/g10/encode.c --- gnupg-1.4.9/g10/encode.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/encode.c 2009-05-11 09:16:22.000000000 +0100 @@ -286,7 +286,7 @@ int overflow; if ( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info(_("WARNING: `%s' is an empty file\n"), filename ); /* We can't encode the length of very large files because OpenPGP uses only 32 bit for file sizes. So if the the @@ -564,7 +564,7 @@ int overflow; if ( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info(_("WARNING: `%s' is an empty file\n"), filename ); /* We can't encode the length of very large files because OpenPGP uses only 32 bit for file sizes. So if the the diff -Nru gnupg-1.4.9/g10/exec.c gnupg-1.4.10/g10/exec.c --- gnupg-1.4.9/g10/exec.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/exec.c 2008-12-11 16:40:05.000000000 +0000 @@ -321,7 +321,7 @@ #if defined(HAVE_GETUID) && defined(HAVE_GETEUID) /* There should be no way to get to this spot while still carrying setuid privs. Just in case, bomb out if we are. */ - if(getuid()!=geteuid()) + if ( getuid () != geteuid () ) BUG(); #endif diff -Nru gnupg-1.4.9/g10/getkey.c gnupg-1.4.10/g10/getkey.c --- gnupg-1.4.9/g10/getkey.c 2007-12-12 18:03:42.000000000 +0000 +++ gnupg-1.4.10/g10/getkey.c 2009-05-06 09:01:47.000000000 +0100 @@ -2037,6 +2037,26 @@ } } +/* Convert a buffer to a signature. Useful for 0x19 embedded sigs. + Caller must free the signature when they are done. */ +static PKT_signature * +buf_to_sig(const byte *buf,size_t len) +{ + PKT_signature *sig=xmalloc_clear(sizeof(PKT_signature)); + IOBUF iobuf=iobuf_temp_with_content(buf,len); + int save_mode=set_packet_list_mode(0); + + if(parse_signature(iobuf,PKT_SIGNATURE,len,sig)!=0) + { + xfree(sig); + sig=NULL; + } + + set_packet_list_mode(save_mode); + iobuf_close(iobuf); + + return sig; +} static void merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) @@ -2146,48 +2166,74 @@ subpk->is_valid = 1; - /* Find the first 0x19 embedded signature on our self-sig. */ + /* Find the most recent 0x19 embedded signature on our self-sig. */ if(subpk->backsig==0) { int seq=0; size_t n; + PKT_signature *backsig=NULL; + + sigdate=0; /* We do this while() since there may be other embedded signatures in the future. We only want 0x19 here. */ + while((p=enum_sig_subpkt(sig->hashed, SIGSUBPKT_SIGNATURE,&n,&seq,NULL))) if(n>3 && ((p[0]==3 && p[2]==0x19) || (p[0]==4 && p[1]==0x19))) - break; + { + PKT_signature *tempsig=buf_to_sig(p,n); + if(tempsig) + { + if(tempsig->timestamp>sigdate) + { + if(backsig) + free_seckey_enc(backsig); + + backsig=tempsig; + sigdate=backsig->timestamp; + } + else + free_seckey_enc(tempsig); + } + } - if(p==NULL) - { - seq=0; - /* It is safe to have this in the unhashed area since the - 0x19 is located on the selfsig for convenience, not - security. */ - while((p=enum_sig_subpkt(sig->unhashed,SIGSUBPKT_SIGNATURE, - &n,&seq,NULL))) - if(n>3 && ((p[0]==3 && p[2]==0x19) || (p[0]==4 && p[1]==0x19))) - break; - } + seq=0; - if(p) - { - PKT_signature *backsig=xmalloc_clear(sizeof(PKT_signature)); - IOBUF backsig_buf=iobuf_temp_with_content(p,n); - int save_mode=set_packet_list_mode(0); + /* It is safe to have this in the unhashed area since the 0x19 + is located on the selfsig for convenience, not security. */ - if(parse_signature(backsig_buf,PKT_SIGNATURE,n,backsig)==0) - { - if(check_backsig(mainpk,subpk,backsig)==0) - subpk->backsig=2; - else - subpk->backsig=1; - } + while((p=enum_sig_subpkt(sig->unhashed,SIGSUBPKT_SIGNATURE, + &n,&seq,NULL))) + if(n>3 && ((p[0]==3 && p[2]==0x19) || (p[0]==4 && p[1]==0x19))) + { + PKT_signature *tempsig=buf_to_sig(p,n); + if(tempsig) + { + if(tempsig->timestamp>sigdate) + { + if(backsig) + free_seckey_enc(backsig); + + backsig=tempsig; + sigdate=backsig->timestamp; + } + else + free_seckey_enc(tempsig); + } + } + + if(backsig) + { + /* At ths point, backsig contains the most recent 0x19 sig. + Let's see if it is good. */ - set_packet_list_mode(save_mode); + /* 2==valid, 1==invalid, 0==didn't check */ + if(check_backsig(mainpk,subpk,backsig)==0) + subpk->backsig=2; + else + subpk->backsig=1; - iobuf_close(backsig_buf); free_seckey_enc(backsig); } } @@ -2495,17 +2541,7 @@ latest_key = foundk? foundk:keyblock; goto found; } - - if (!req_usage) { - PKT_public_key *pk = foundk->pkt->pkt.public_key; - if (pk->user_id) - free_user_id (pk->user_id); - pk->user_id = scopy_user_id (foundu); - ctx->found_key = foundk; - cache_user_id( keyblock ); - return 1; /* found */ - } - + latest_date = 0; latest_key = NULL; /* do not look at subkeys if a certification key is requested */ @@ -2962,6 +2998,12 @@ if(tok[0]=='\0') continue; + /* For now we silently ignore the new methods introduced with + 2.0.10. */ + if (!ascii_strcasecmp (tok,"nodefault") + || !ascii_strcasecmp (tok,"local")) + continue; + akl=xmalloc_clear(sizeof(*akl)); if(ascii_strcasecmp(tok,"ldap")==0) diff -Nru gnupg-1.4.9/g10/gpg.c gnupg-1.4.10/g10/gpg.c --- gnupg-1.4.9/g10/gpg.c 2008-03-20 09:06:43.000000000 +0000 +++ gnupg-1.4.10/g10/gpg.c 2009-08-03 17:37:12.000000000 +0100 @@ -1,6 +1,6 @@ /* gpg.c - The GnuPG utility (main for gpg) * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008 Free Software Foundation, Inc. + * 2007, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1859,7 +1859,7 @@ int eyes_only=0; int multifile=0; int pwfd = -1; - int with_fpr = 0; /* make an option out of --fingerprint */ + int fpr_maybe_cmd = 0; /* --fingerprint maybe a command. */ int any_explicit_recipient = 0; int require_secmem=0,got_secmem=0; #ifdef USE_SHM_COPROCESSING @@ -1932,6 +1932,7 @@ #else opt.pcsc_driver = "libpcsclite.so"; #endif + opt.disable_keypad = 1; /* No keypad support; use gpg2 instead. */ #endif /*ENABLE_CARD_SUPPORT*/ /* check whether we have a config file on the commandline */ @@ -2012,7 +2013,7 @@ #if defined(HAVE_GETUID) && defined(HAVE_GETEUID) /* There should be no way to get to this spot while still carrying setuid privs. Just in case, bomb out if we are. */ - if(getuid()!=geteuid()) + if ( getuid () != geteuid () ) BUG(); #endif @@ -2228,8 +2229,13 @@ case oWithFingerprint: opt.with_fingerprint = 1; - with_fpr=1; /*fall thru*/ - case oFingerprint: opt.fingerprint++; break; + opt.fingerprint++; + break; + case oFingerprint: + opt.fingerprint++; + fpr_maybe_cmd = 1; + break; + case oSecretKeyring: append_to_strlist( &sec_nrings, pargs.r.ret_str); break; @@ -2928,14 +2934,6 @@ log_info("%s\n",s); } #endif -#ifdef USE_CAMELLIA - /* We better also print a runtime warning if people build it with - support for Camellia (which is not yet defiend by OpenPGP). */ - log_info ("WARNING: This version has been built with support for the " - "Camellia cipher.\n"); - log_info (" It is for testing only and is NOT for production " - "use!\n"); -#endif if (opt.verbose > 2) log_info ("using character set `%s'\n", get_native_charset ()); @@ -3060,6 +3058,7 @@ } else if(PGP6) { + opt.disable_mdc=1; opt.escape_from=1; opt.force_v3_sigs=1; opt.ask_sig_expire=0; @@ -3268,9 +3267,12 @@ xfree(p); } - if( !cmd && opt.fingerprint && !with_fpr ) { - set_cmd( &cmd, aListKeys); - } + /* If there is no command but the --fingerprint is given, default + to the --list-keys command. */ + if (!cmd && fpr_maybe_cmd) + { + set_cmd (&cmd, aListKeys); + } if( cmd == aKMode || cmd == aKModeC ) { /* kludge to be compatible to pgp */ if( cmd == aKModeC ) { @@ -3342,8 +3344,8 @@ case aGenRandom: case aDeArmor: case aEnArmor: - case aFixTrustDB: break; + case aFixTrustDB: case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break; case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break; default: rc = setup_trustdb(1, trustdb_name ); break; @@ -3539,7 +3541,7 @@ append_to_strlist( &sl, "save" ); username = make_username( fname ); - keyedit_menu(fname, locusr, sl, 0, 0 ); + keyedit_menu(username, locusr, sl, 0, 0 ); xfree(username); free_strlist(sl); break; @@ -3873,9 +3875,7 @@ break; case aFixTrustDB: - log_error("this command is not yet implemented.\n"); - log_error("A workaround is to use \"--export-ownertrust\", remove\n"); - log_error("the trustdb file and do an \"--import-ownertrust\".\n" ); + how_to_fix_the_trustdb (); break; case aListTrustPath: diff -Nru gnupg-1.4.9/g10/gpgv.c gnupg-1.4.10/g10/gpgv.c --- gnupg-1.4.9/g10/gpgv.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/gpgv.c 2009-06-02 15:21:26.000000000 +0100 @@ -1,6 +1,6 @@ /* gpgv.c - The GnuPG signature verify utility - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, - * 2006 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2006, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -99,7 +99,7 @@ _("Usage: gpgv [options] [files] (-h for help)"); break; case 41: p = - _("Syntax: gpg [options] [files]\n" + _("Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n"); break; @@ -178,9 +178,9 @@ set_packet_list_mode(1); if( !nrings ) /* no keyring given: use default one */ - keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 0, 0); + keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 8, 0); for(sl = nrings; sl; sl = sl->next ) - keydb_add_resource (sl->d, 0, 0 ); + keydb_add_resource (sl->d, 8, 0 ); FREE_STRLIST(nrings); @@ -417,6 +417,7 @@ void tty_kill_prompt(void) {} int tty_get_answer_is_yes( const char *prompt ) {return 0;} int tty_no_terminal(int onoff) {return 0;} +void tty_cleanup_after_signal (void) {} #ifdef HAVE_LIBREADLINE void tty_enable_completion(rl_completion_func_t *completer) {} void tty_disable_completion(void) {} diff -Nru gnupg-1.4.9/g10/iso7816.c gnupg-1.4.10/g10/iso7816.c --- gnupg-1.4.9/g10/iso7816.c 2007-10-23 11:40:12.000000000 +0100 +++ gnupg-1.4.10/g10/iso7816.c 2009-09-02 17:18:18.000000000 +0100 @@ -1,5 +1,5 @@ /* iso7816.c - ISO 7816 commands - * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: iso7816.c 4603 2007-10-23 10:48:09Z wk $ + * $Id: iso7816.c 5136 2009-09-02 17:30:53Z wk $ */ #include @@ -45,9 +45,9 @@ #define CMD_SELECT_FILE 0xA4 -#define CMD_VERIFY 0x20 -#define CMD_CHANGE_REFERENCE_DATA 0x24 -#define CMD_RESET_RETRY_COUNTER 0x2C +#define CMD_VERIFY ISO7816_VERIFY +#define CMD_CHANGE_REFERENCE_DATA ISO7816_CHANGE_REFERENCE_DATA +#define CMD_RESET_RETRY_COUNTER ISO7816_RESET_RETRY_COUNTER #define CMD_GET_DATA 0xCA #define CMD_PUT_DATA 0xDA #define CMD_MSE 0x22 @@ -66,7 +66,10 @@ switch (sw) { case SW_EEPROM_FAILURE: ec = GPG_ERR_HARDWARE; break; + case SW_TERM_STATE: ec = GPG_ERR_CARD; break; case SW_WRONG_LENGTH: ec = GPG_ERR_INV_VALUE; break; + case SW_SM_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break; + case SW_CC_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break; case SW_CHV_WRONG: ec = GPG_ERR_BAD_PIN; break; case SW_CHV_BLOCKED: ec = GPG_ERR_PIN_BLOCKED; break; case SW_USE_CONDITIONS: ec = GPG_ERR_USE_CONDITIONS; break; @@ -93,6 +96,7 @@ case SW_HOST_GENERAL_ERROR: ec = GPG_ERR_GENERAL; break; case SW_HOST_NO_READER: ec = GPG_ERR_ENODEV; break; case SW_HOST_ABORTED: ec = GPG_ERR_CANCELED; break; + case SW_HOST_NO_KEYPAD: ec = GPG_ERR_NOT_SUPPORTED; break; default: if ((sw & 0x010000)) @@ -122,12 +126,15 @@ requested application ID. The function can't be used to enumerate AIDs and won't return the AID on success. The return value is 0 for okay or a GPG error code. Note that ISO error codes are - internally mapped. */ + internally mapped. Bit 0 of FLAGS should be set if the card does + not understand P2=0xC0. */ gpg_error_t -iso7816_select_application (int slot, const char *aid, size_t aidlen) +iso7816_select_application (int slot, const char *aid, size_t aidlen, + unsigned int flags) { int sw; - sw = apdu_send_simple (slot, 0x00, CMD_SELECT_FILE, 4, 0, aidlen, aid); + sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE, 4, + (flags&1)? 0 :0x0c, aidlen, aid); return map_sw (sw); } @@ -152,7 +159,7 @@ { p0 = (tag == 0x3F00)? 0: is_dir? 1:2; p1 = 0x0c; /* No FC return. */ - sw = apdu_send_simple (slot, 0x00, CMD_SELECT_FILE, + sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE, p0, p1, 2, (char*)tagbuf ); return map_sw (sw); } @@ -188,7 +195,7 @@ p0 = 0x08; p1 = 0x0c; /* No FC return. */ - sw = apdu_send_simple (slot, 0x00, CMD_SELECT_FILE, + sw = apdu_send_simple (slot, 0, 0x00, CMD_SELECT_FILE, p0, p1, buflen, (char*)buffer ); return map_sw (sw); } @@ -206,7 +213,7 @@ *result = NULL; *resultlen = 0; - sw = apdu_send (slot, 0x80, 0xAA, list_dirs? 1:2, 0, -1, NULL, + sw = apdu_send (slot, 0, 0x80, 0xAA, list_dirs? 1:2, 0, -1, NULL, result, resultlen); if (sw != SW_SUCCESS) { @@ -219,27 +226,101 @@ } +/* This funcion sends an already formatted APDU to the card. With + HANDLE_MORE set to true a MORE DATA status will be handled + internally. The return value is a gpg error code (i.e. a mapped + status word). This is basically the same as apdu_send_direct but + it maps the status word and does not return it in the result + buffer. */ +gpg_error_t +iso7816_apdu_direct (int slot, const void *apdudata, size_t apdudatalen, + int handle_more, + unsigned char **result, size_t *resultlen) +{ + int sw; + + if (!result || !resultlen) + return gpg_error (GPG_ERR_INV_VALUE); + *result = NULL; + *resultlen = 0; + + sw = apdu_send_direct (slot, 0, apdudata, apdudatalen, handle_more, + result, resultlen); + if (!sw) + { + if (*resultlen < 2) + sw = SW_HOST_GENERAL_ERROR; + else + { + sw = ((*result)[*resultlen-2] << 8) | (*result)[*resultlen-1]; + (*resultlen)--; + (*resultlen)--; + } + } + if (sw != SW_SUCCESS) + { + /* Make sure that pending buffers are released. */ + xfree (*result); + *result = NULL; + *resultlen = 0; + } + return map_sw (sw); +} + + +/* Check whether the reader supports the ISO command code COMMAND on + the keypad. Returns 0 on success. */ +gpg_error_t +iso7816_check_keypad (int slot, int command, iso7816_pininfo_t *pininfo) +{ + int sw; + + sw = apdu_check_keypad (slot, command, + pininfo->mode, pininfo->minlen, pininfo->maxlen, + pininfo->padlen); + return iso7816_map_sw (sw); +} + /* Perform a VERIFY command on SLOT using the card holder verification - vector CHVNO with a CHV of lenght CHVLEN. Returns 0 on success. */ + vector CHVNO with a CHV of lenght CHVLEN. With PININFO non-NULL + the keypad of the reader will be used. Returns 0 on success. */ gpg_error_t -iso7816_verify (int slot, int chvno, const char *chv, size_t chvlen) +iso7816_verify_kp (int slot, int chvno, const char *chv, size_t chvlen, + iso7816_pininfo_t *pininfo) { int sw; - sw = apdu_send_simple (slot, 0x00, CMD_VERIFY, 0, chvno, chvlen, chv); + if (pininfo && pininfo->mode) + sw = apdu_send_simple_kp (slot, 0x00, CMD_VERIFY, 0, chvno, chvlen, chv, + pininfo->mode, + pininfo->minlen, + pininfo->maxlen, + pininfo->padlen); + else + sw = apdu_send_simple (slot, 0, 0x00, CMD_VERIFY, 0, chvno, chvlen, chv); return map_sw (sw); } +/* Perform a VERIFY command on SLOT using the card holder verification + vector CHVNO with a CHV of lenght CHVLEN. Returns 0 on success. */ +gpg_error_t +iso7816_verify (int slot, int chvno, const char *chv, size_t chvlen) +{ + return iso7816_verify_kp (slot, chvno, chv, chvlen, NULL); +} + /* Perform a CHANGE_REFERENCE_DATA command on SLOT for the card holder verification vector CHVNO. If the OLDCHV is NULL (and OLDCHVLEN 0), a "change reference data" is done, otherwise an "exchange reference data". The new reference data is expected in NEWCHV of - length NEWCHVLEN. */ + length NEWCHVLEN. With PININFO non-NULL the keypad of the reader + will be used. */ gpg_error_t -iso7816_change_reference_data (int slot, int chvno, - const char *oldchv, size_t oldchvlen, - const char *newchv, size_t newchvlen) +iso7816_change_reference_data_kp (int slot, int chvno, + const char *oldchv, size_t oldchvlen, + const char *newchv, size_t newchvlen, + iso7816_pininfo_t *pininfo) { int sw; char *buf; @@ -256,45 +337,110 @@ memcpy (buf, oldchv, oldchvlen); memcpy (buf+oldchvlen, newchv, newchvlen); - sw = apdu_send_simple (slot, 0x00, CMD_CHANGE_REFERENCE_DATA, - oldchvlen? 0 : 1, chvno, oldchvlen+newchvlen, buf); + if (pininfo && pininfo->mode) + sw = apdu_send_simple_kp (slot, 0x00, CMD_CHANGE_REFERENCE_DATA, + oldchvlen? 0 : 1, chvno, oldchvlen+newchvlen, buf, + pininfo->mode, + pininfo->minlen, + pininfo->maxlen, + pininfo->padlen); + else + sw = apdu_send_simple (slot, 0, 0x00, CMD_CHANGE_REFERENCE_DATA, + oldchvlen? 0 : 1, chvno, oldchvlen+newchvlen, buf); xfree (buf); return map_sw (sw); } +/* Perform a CHANGE_REFERENCE_DATA command on SLOT for the card holder + verification vector CHVNO. If the OLDCHV is NULL (and OLDCHVLEN + 0), a "change reference data" is done, otherwise an "exchange + reference data". The new reference data is expected in NEWCHV of + length NEWCHVLEN. */ +gpg_error_t +iso7816_change_reference_data (int slot, int chvno, + const char *oldchv, size_t oldchvlen, + const char *newchv, size_t newchvlen) +{ + return iso7816_change_reference_data_kp (slot, chvno, oldchv, oldchvlen, + newchv, newchvlen, NULL); +} + + gpg_error_t -iso7816_reset_retry_counter (int slot, int chvno, - const char *newchv, size_t newchvlen) +iso7816_reset_retry_counter_kp (int slot, int chvno, + const char *newchv, size_t newchvlen, + iso7816_pininfo_t *pininfo) { int sw; if (!newchv || !newchvlen ) return gpg_error (GPG_ERR_INV_VALUE); - sw = apdu_send_simple (slot, 0x00, CMD_RESET_RETRY_COUNTER, - 2, chvno, newchvlen, newchv); + /* FIXME: The keypad mode has not yet been tested. */ + if (pininfo && pininfo->mode) + sw = apdu_send_simple_kp (slot, 0x00, CMD_RESET_RETRY_COUNTER, + 2, chvno, newchvlen, newchv, + pininfo->mode, + pininfo->minlen, + pininfo->maxlen, + pininfo->padlen); + else + sw = apdu_send_simple (slot, 0, 0x00, CMD_RESET_RETRY_COUNTER, + 2, chvno, newchvlen, newchv); + return map_sw (sw); +} + + +gpg_error_t +iso7816_reset_retry_counter_with_rc (int slot, int chvno, + const char *data, size_t datalen) +{ + int sw; + + if (!data || !datalen ) + return gpg_error (GPG_ERR_INV_VALUE); + + sw = apdu_send_simple (slot, 0, 0x00, CMD_RESET_RETRY_COUNTER, + 0, chvno, datalen, data); return map_sw (sw); } +gpg_error_t +iso7816_reset_retry_counter (int slot, int chvno, + const char *newchv, size_t newchvlen) +{ + return iso7816_reset_retry_counter_kp (slot, chvno, newchv, newchvlen, NULL); +} + + + /* Perform a GET DATA command requesting TAG and storing the result in a newly allocated buffer at the address passed by RESULT. Return the length of this data at the address of RESULTLEN. */ gpg_error_t -iso7816_get_data (int slot, int tag, +iso7816_get_data (int slot, int extended_mode, int tag, unsigned char **result, size_t *resultlen) { int sw; + int le; if (!result || !resultlen) return gpg_error (GPG_ERR_INV_VALUE); *result = NULL; *resultlen = 0; - sw = apdu_send (slot, 0x00, CMD_GET_DATA, - ((tag >> 8) & 0xff), (tag & 0xff), -1, NULL, - result, resultlen); + if (extended_mode > 0 && extended_mode < 256) + le = 65534; /* Not 65535 in case it is used as some special flag. */ + else if (extended_mode > 0) + le = extended_mode; + else + le = 256; + + sw = apdu_send_le (slot, extended_mode, 0x00, CMD_GET_DATA, + ((tag >> 8) & 0xff), (tag & 0xff), -1, NULL, le, + result, resultlen); if (sw != SW_SUCCESS) { /* Make sure that pending buffers are released. */ @@ -309,14 +455,29 @@ /* Perform a PUT DATA command on card in SLOT. Write DATA of length - DATALEN to TAG. */ + DATALEN to TAG. EXTENDED_MODE controls whether extended length + headers or command chaining is used instead of single length + bytes. */ gpg_error_t -iso7816_put_data (int slot, int tag, +iso7816_put_data (int slot, int extended_mode, int tag, const unsigned char *data, size_t datalen) { int sw; - sw = apdu_send_simple (slot, 0x00, CMD_PUT_DATA, + sw = apdu_send_simple (slot, extended_mode, 0x00, CMD_PUT_DATA, + ((tag >> 8) & 0xff), (tag & 0xff), + datalen, (const char*)data); + return map_sw (sw); +} + +/* Same as iso7816_put_data but uses an odd instruction byte. */ +gpg_error_t +iso7816_put_data_odd (int slot, int extended_mode, int tag, + const unsigned char *data, size_t datalen) +{ + int sw; + + sw = apdu_send_simple (slot, extended_mode, 0x00, CMD_PUT_DATA+1, ((tag >> 8) & 0xff), (tag & 0xff), datalen, (const char*)data); return map_sw (sw); @@ -335,7 +496,7 @@ if (p1 < 0 || p1 > 255 || p2 < 0 || p2 > 255 ) return gpg_error (GPG_ERR_INV_VALUE); - sw = apdu_send_simple (slot, 0x00, CMD_MSE, p1, p2, + sw = apdu_send_simple (slot, 0, 0x00, CMD_MSE, p1, p2, data? datalen : -1, (const char*)data); return map_sw (sw); } @@ -344,9 +505,10 @@ /* Perform the security operation COMPUTE DIGITAL SIGANTURE. On success 0 is returned and the data is availavle in a newly allocated buffer stored at RESULT with its length stored at - RESULTLEN. */ + RESULTLEN. For LE see do_generate_keypair. */ gpg_error_t -iso7816_compute_ds (int slot, const unsigned char *data, size_t datalen, +iso7816_compute_ds (int slot, int extended_mode, + const unsigned char *data, size_t datalen, int le, unsigned char **result, size_t *resultlen) { int sw; @@ -356,8 +518,16 @@ *result = NULL; *resultlen = 0; - sw = apdu_send (slot, 0x00, CMD_PSO, 0x9E, 0x9A, datalen, (const char*)data, - result, resultlen); + if (!extended_mode) + le = 256; /* Ignore provided Le and use what apdu_send uses. */ + else if (le >= 0 && le < 256) + le = 256; + + sw = apdu_send_le (slot, extended_mode, + 0x00, CMD_PSO, 0x9E, 0x9A, + datalen, (const char*)data, + le, + result, resultlen); if (sw != SW_SUCCESS) { /* Make sure that pending buffers are released. */ @@ -375,9 +545,11 @@ indicator to be used. It should be 0 if no padding is required, a value of -1 suppresses the padding byte. On success 0 is returned and the plaintext is available in a newly allocated buffer stored - at RESULT with its length stored at RESULTLEN. */ + at RESULT with its length stored at RESULTLEN. For LE see + do_generate_keypair. */ gpg_error_t -iso7816_decipher (int slot, const unsigned char *data, size_t datalen, +iso7816_decipher (int slot, int extended_mode, + const unsigned char *data, size_t datalen, int le, int padind, unsigned char **result, size_t *resultlen) { int sw; @@ -388,25 +560,32 @@ *result = NULL; *resultlen = 0; + if (!extended_mode) + le = 256; /* Ignore provided Le and use what apdu_send uses. */ + else if (le >= 0 && le < 256) + le = 256; + if (padind >= 0) { /* We need to prepend the padding indicator. */ buf = xtrymalloc (datalen + 1); if (!buf) return gpg_error (gpg_err_code_from_errno (errno)); - + *buf = padind; /* Padding indicator. */ memcpy (buf+1, data, datalen); - sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86, - datalen+1, (char*)buf, - result, resultlen); + sw = apdu_send_le (slot, extended_mode, + 0x00, CMD_PSO, 0x80, 0x86, + datalen+1, (char*)buf, le, + result, resultlen); xfree (buf); } else { - sw = apdu_send (slot, 0x00, CMD_PSO, 0x80, 0x86, - datalen, (const char *)data, - result, resultlen); + sw = apdu_send_le (slot, extended_mode, + 0x00, CMD_PSO, 0x80, 0x86, + datalen, (const char *)data, le, + result, resultlen); } if (sw != SW_SUCCESS) { @@ -421,9 +600,11 @@ } +/* For LE see do_generate_keypair. */ gpg_error_t -iso7816_internal_authenticate (int slot, +iso7816_internal_authenticate (int slot, int extended_mode, const unsigned char *data, size_t datalen, + int le, unsigned char **result, size_t *resultlen) { int sw; @@ -433,8 +614,16 @@ *result = NULL; *resultlen = 0; - sw = apdu_send (slot, 0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0, - datalen, (const char*)data, result, resultlen); + if (!extended_mode) + le = 256; /* Ignore provided Le and use what apdu_send uses. */ + else if (le >= 0 && le < 256) + le = 256; + + sw = apdu_send_le (slot, extended_mode, + 0x00, CMD_INTERNAL_AUTHENTICATE, 0, 0, + datalen, (const char*)data, + le, + result, resultlen); if (sw != SW_SUCCESS) { /* Make sure that pending buffers are released. */ @@ -448,10 +637,15 @@ } +/* LE is the expected return length. This is usually 0 except if + extended length mode is used and more than 256 byte will be + returned. In that case a value of -1 uses a large default + (e.g. 4096 bytes), a value larger 256 used that value. */ static gpg_error_t -do_generate_keypair (int slot, int readonly, - const unsigned char *data, size_t datalen, - unsigned char **result, size_t *resultlen) +do_generate_keypair (int slot, int extended_mode, int readonly, + const unsigned char *data, size_t datalen, + int le, + unsigned char **result, size_t *resultlen) { int sw; @@ -460,8 +654,11 @@ *result = NULL; *resultlen = 0; - sw = apdu_send (slot, 0x00, CMD_GENERATE_KEYPAIR, readonly? 0x81:0x80, 0, - datalen, (const char*)data, result, resultlen); + sw = apdu_send_le (slot, extended_mode, + 0x00, CMD_GENERATE_KEYPAIR, readonly? 0x81:0x80, 0, + datalen, (const char*)data, + le >= 0 && le < 256? 256:le, + result, resultlen); if (sw != SW_SUCCESS) { /* Make sure that pending buffers are released. */ @@ -476,20 +673,24 @@ gpg_error_t -iso7816_generate_keypair (int slot, +iso7816_generate_keypair (int slot, int extended_mode, const unsigned char *data, size_t datalen, + int le, unsigned char **result, size_t *resultlen) { - return do_generate_keypair (slot, 0, data, datalen, result, resultlen); + return do_generate_keypair (slot, extended_mode, 0, + data, datalen, le, result, resultlen); } gpg_error_t -iso7816_read_public_key (int slot, - const unsigned char *data, size_t datalen, - unsigned char **result, size_t *resultlen) +iso7816_read_public_key (int slot, int extended_mode, + const unsigned char *data, size_t datalen, + int le, + unsigned char **result, size_t *resultlen) { - return do_generate_keypair (slot, 1, data, datalen, result, resultlen); + return do_generate_keypair (slot, extended_mode, 1, + data, datalen, le, result, resultlen); } @@ -508,8 +709,8 @@ { result = NULL; n = length > 254? 254 : length; - sw = apdu_send_le (slot, 0x00, CMD_GET_CHALLENGE, 0, 0, -1, NULL, - n, + sw = apdu_send_le (slot, 0, + 0x00, CMD_GET_CHALLENGE, 0, 0, -1, NULL, n, &result, &resultlen); if (sw != SW_SUCCESS) { @@ -557,21 +758,14 @@ { buffer = NULL; bufferlen = 0; - /* Note, that we to set N to 254 due to problems either with the - ccid driver or some TCOS cards. It actually should be 0 - which is the official ISO value to read a variable length - object. */ - if (read_all || nmax > 254) - n = 254; - else - n = nmax; - sw = apdu_send_le (slot, 0x00, CMD_READ_BINARY, + n = read_all? 0 : nmax; + sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY, ((offset>>8) & 0xff), (offset & 0xff) , -1, NULL, n, &buffer, &bufferlen); if ( SW_EXACT_LENGTH_P(sw) ) { n = (sw & 0x00ff); - sw = apdu_send_le (slot, 0x00, CMD_READ_BINARY, + sw = apdu_send_le (slot, 0, 0x00, CMD_READ_BINARY, ((offset>>8) & 0xff), (offset & 0xff) , -1, NULL, n, &buffer, &bufferlen); } @@ -598,7 +792,7 @@ unsigned char *p = xtryrealloc (*result, *resultlen + bufferlen); if (!p) { - gpg_error_t err = gpg_error_from_errno (errno); + gpg_error_t err = gpg_error_from_syserror (); xfree (buffer); xfree (*result); *result = NULL; @@ -658,13 +852,11 @@ buffer = NULL; bufferlen = 0; - /* Fixme: Either the ccid driver or the TCOS cards have problems - with an Le of 0. */ - sw = apdu_send_le (slot, 0x00, CMD_READ_RECORD, + sw = apdu_send_le (slot, 0, 0x00, CMD_READ_RECORD, recno, short_ef? short_ef : 0x04, -1, NULL, - 254, &buffer, &bufferlen); + 0, &buffer, &bufferlen); if (sw != SW_SUCCESS && sw != SW_EOF_REACHED) { diff -Nru gnupg-1.4.9/g10/iso7816.h gnupg-1.4.10/g10/iso7816.h --- gnupg-1.4.9/g10/iso7816.h 2007-10-23 11:40:12.000000000 +0100 +++ gnupg-1.4.10/g10/iso7816.h 2009-09-02 17:18:18.000000000 +0100 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . * - * $Id: iso7816.h 4603 2007-10-23 10:48:09Z wk $ + * $Id: iso7816.h 5136 2009-09-02 17:30:53Z wk $ */ #ifndef ISO7816_H @@ -26,10 +26,30 @@ #include "cardglue.h" #endif +/* Command codes used by iso7816_check_keypad. */ +#define ISO7816_VERIFY 0x20 +#define ISO7816_CHANGE_REFERENCE_DATA 0x24 +#define ISO7816_RESET_RETRY_COUNTER 0x2C + + +/* Information to be passed to keypad equipped readers. See + ccid-driver.c for details. */ +struct iso7816_pininfo_s +{ + int mode; /* A mode of 0 means: Do not use the keypad. */ + int minlen; + int maxlen; + int padlen; + int padchar; +}; +typedef struct iso7816_pininfo_s iso7816_pininfo_t; + + gpg_error_t iso7816_map_sw (int sw); gpg_error_t iso7816_select_application (int slot, - const char *aid, size_t aidlen); + const char *aid, size_t aidlen, + unsigned int flags); gpg_error_t iso7816_select_file (int slot, int tag, int is_dir, unsigned char **result, size_t *resultlen); gpg_error_t iso7816_select_path (int slot, @@ -37,36 +57,62 @@ unsigned char **result, size_t *resultlen); gpg_error_t iso7816_list_directory (int slot, int list_dirs, unsigned char **result, size_t *resultlen); +gpg_error_t iso7816_apdu_direct (int slot, + const void *apdudata, size_t apdudatalen, + int handle_more, + unsigned char **result, size_t *resultlen); +gpg_error_t iso7816_check_keypad (int slot, int command, + iso7816_pininfo_t *pininfo); gpg_error_t iso7816_verify (int slot, int chvno, const char *chv, size_t chvlen); +gpg_error_t iso7816_verify_kp (int slot, + int chvno, const char *chv, size_t chvlen, + iso7816_pininfo_t *pininfo); gpg_error_t iso7816_change_reference_data (int slot, int chvno, const char *oldchv, size_t oldchvlen, const char *newchv, size_t newchvlen); +gpg_error_t iso7816_change_reference_data_kp (int slot, int chvno, + const char *oldchv, size_t oldchvlen, + const char *newchv, size_t newchvlen, + iso7816_pininfo_t *pininfo); gpg_error_t iso7816_reset_retry_counter (int slot, int chvno, const char *newchv, size_t newchvlen); -gpg_error_t iso7816_get_data (int slot, int tag, +gpg_error_t iso7816_reset_retry_counter_kp (int slot, int chvno, + const char *newchv, + size_t newchvlen, + iso7816_pininfo_t *pininfo); +gpg_error_t iso7816_reset_retry_counter_with_rc (int slot, int chvno, + const char *data, + size_t datalen); +gpg_error_t iso7816_get_data (int slot, int extended_mode, int tag, unsigned char **result, size_t *resultlen); -gpg_error_t iso7816_put_data (int slot, int tag, +gpg_error_t iso7816_put_data (int slot, int extended_mode, int tag, const unsigned char *data, size_t datalen); +gpg_error_t iso7816_put_data_odd (int slot, int extended_mode, int tag, + const unsigned char *data, size_t datalen); gpg_error_t iso7816_manage_security_env (int slot, int p1, int p2, const unsigned char *data, size_t datalen); -gpg_error_t iso7816_compute_ds (int slot, +gpg_error_t iso7816_compute_ds (int slot, int extended_mode, const unsigned char *data, size_t datalen, + int le, unsigned char **result, size_t *resultlen); -gpg_error_t iso7816_decipher (int slot, +gpg_error_t iso7816_decipher (int slot, int extended_mode, const unsigned char *data, size_t datalen, - int padind, + int le, int padind, unsigned char **result, size_t *resultlen); -gpg_error_t iso7816_internal_authenticate (int slot, - const unsigned char *data, size_t datalen, - unsigned char **result, size_t *resultlen); -gpg_error_t iso7816_generate_keypair (int slot, - const unsigned char *data, size_t datalen, - unsigned char **result, size_t *resultlen); -gpg_error_t iso7816_read_public_key (int slot, +gpg_error_t iso7816_internal_authenticate (int slot, int extended_mode, const unsigned char *data, size_t datalen, + int le, unsigned char **result, size_t *resultlen); +gpg_error_t iso7816_generate_keypair (int slot, int extended_mode, + const unsigned char *data, size_t datalen, + int le, + unsigned char **result, size_t *resultlen); +gpg_error_t iso7816_read_public_key (int slot, int extended_mode, + const unsigned char *data, size_t datalen, + int le, + unsigned char **result, size_t *resultlen); gpg_error_t iso7816_get_challenge (int slot, int length, unsigned char *buffer); diff -Nru gnupg-1.4.9/g10/keydb.c gnupg-1.4.10/g10/keydb.c --- gnupg-1.4.9/g10/keydb.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/keydb.c 2009-04-03 10:39:51.000000000 +0100 @@ -196,6 +196,7 @@ * Flag 1 == force * Flag 2 == mark resource as primary * Flag 4 == This is a default resources + * Flag 8 == Readonly */ int keydb_add_resource (const char *url, int flags, int secret) @@ -204,10 +205,14 @@ const char *resname = url; char *filename = NULL; int force=(flags&1); + int readonly=!!(flags&8); int rc = 0; KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE; void *token; + if (readonly) + force = 0; + /* Do we have an URL? * gnupg-ring:filename := this is a plain keyring * filename := See what is is, but create as plain keyring. @@ -235,7 +240,7 @@ else filename = xstrdup (resname); - if (!force) + if (!force && !readonly) force = secret? !any_secret : !any_public; /* see whether we can determine the filetype */ diff -Nru gnupg-1.4.9/g10/keyedit.c gnupg-1.4.10/g10/keyedit.c --- gnupg-1.4.9/g10/keyedit.c 2007-11-19 09:53:46.000000000 +0000 +++ gnupg-1.4.10/g10/keyedit.c 2009-08-26 06:35:31.000000000 +0100 @@ -1,6 +1,6 @@ /* keyedit.c - keyedit stuff - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -2185,11 +2185,13 @@ break; case cmdCLEAN: - redisplay=modified=menu_clean(keyblock,0); + if(menu_clean(keyblock,0)) + redisplay=modified=1; break; case cmdMINIMIZE: - redisplay=modified=menu_clean(keyblock,1); + if(menu_clean(keyblock,1)) + redisplay=modified=1; break; case cmdQUIT: @@ -3650,6 +3652,7 @@ PKT_public_key *main_pk; PKT_secret_key *main_sk,*sub_sk=NULL; KBNODE node; + u32 timestamp; assert(pub_keyblock->pkt->pkttype==PKT_PUBLIC_KEY); assert(sec_keyblock->pkt->pkttype==PKT_SECRET_KEY); @@ -3659,6 +3662,10 @@ main_sk=copy_secret_key(NULL,sec_keyblock->pkt->pkt.secret_key); keyid_from_pk(main_pk,NULL); + /* We use the same timestamp for all backsigs so that we don't + reveal information about the used machine. */ + timestamp = make_timestamp (); + for(node=pub_keyblock;node;node=node->next) { PKT_public_key *sub_pk=NULL; @@ -3746,7 +3753,8 @@ set_next_passphrase(passphrase); xfree(passphrase); - rc=make_backsig(sig_pk->pkt->pkt.signature,main_pk,sub_pk,sub_sk); + rc = make_backsig (sig_pk->pkt->pkt.signature, main_pk, sub_pk, sub_sk, + timestamp); if(rc==0) { PKT_signature *newsig; @@ -4674,6 +4682,36 @@ assert(keyblock->pkt->pkttype==PKT_PUBLIC_KEY); + /* First check whether we have any signatures at all. */ + any = 0; + for (node = keyblock; node; node = node->next ) + { + node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A); + if (node->pkt->pkttype == PKT_USER_ID) { + if (node->flag&NODFLG_SELUID || all) + skip = 0; + else + skip = 1; + } + else if (!skip && node->pkt->pkttype == PKT_SIGNATURE + && ((sig = node->pkt->pkt.signature), + !seckey_available(sig->keyid) )) + { + if ((sig->sig_class&~3) == 0x10) + { + any = 1; + break; + } + } + } + + if (!any) + { + tty_printf (_("Not signed by you.\n")); + return 0; + } + + /* FIXME: detect duplicates here */ tty_printf(_("You have signed these user IDs on key %s:\n"), keystr_from_pk(keyblock->pkt->pkt.public_key)); @@ -5092,7 +5130,7 @@ "key %s (uid %d)\n"), image_type_to_string(type,1), (ulong)size,keystr_from_pk(pk),count); - show_photos(&uid->attribs[i],1,pk,NULL); + show_photos(&uid->attribs[i],1,pk,NULL,uid); } } } diff -Nru gnupg-1.4.9/g10/keygen.c gnupg-1.4.10/g10/keygen.c --- gnupg-1.4.9/g10/keygen.c 2007-12-03 14:23:10.000000000 +0000 +++ gnupg-1.4.10/g10/keygen.c 2009-07-29 09:42:59.000000000 +0100 @@ -1,6 +1,6 @@ /* keygen.c - generate a key pair * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * 2007, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -57,8 +57,9 @@ pPREFERENCES, pREVOKER, pUSERID, + pCREATIONDATE, + pKEYCREATIONDATE, /* Same in seconds since epoch. */ pEXPIREDATE, - pCREATETIME, /* in n seconds */ pKEYEXPIRE, /* in n seconds */ pSUBKEYEXPIRE, /* in n seconds */ pPASSPHRASE, @@ -77,8 +78,8 @@ union { DEK *dek; STRING2KEY *s2k; - u32 create; u32 expire; + u32 creation; unsigned int usage; struct revocation_key revkey; char value[1]; @@ -119,16 +120,18 @@ static int nzip_prefs; static int mdc_available,ks_modify; -static void do_generate_keypair( struct para_data_s *para, +static void do_generate_keypair (struct para_data_s *para, struct output_control_s *outctrl, - u32 timestamp, int card ); + int card); static int write_keyblock( IOBUF out, KBNODE node ); static int gen_card_key (int algo, int keyno, int is_primary, KBNODE pub_root, KBNODE sec_root, PKT_secret_key **ret_sk, + u32 *timestamp, u32 expireval, struct para_data_s *para); static int gen_card_key_with_backup (int algo, int keyno, int is_primary, KBNODE pub_root, KBNODE sec_root, + u32 timestamp, u32 expireval, struct para_data_s *para, const char *backup_dir); @@ -295,7 +298,7 @@ byte sym[MAX_PREFS], hash[MAX_PREFS], zip[MAX_PREFS]; int nsym=0, nhash=0, nzip=0, val, rc=0; int mdc=1, modify=0; /* mdc defaults on, modify defaults off. */ - char dummy_string[45+1]; /* Enough for 15 items. */ + char dummy_string[20*4+1]; /* Enough for 20 items. */ if (!string || !ascii_strcasecmp (string, "default")) { @@ -339,14 +342,29 @@ if(!check_cipher_algo(CIPHER_ALGO_IDEA)) strcat(dummy_string,"S1 "); - /* SHA-1 */ - strcat(dummy_string,"H2 "); - if(!check_digest_algo(DIGEST_ALGO_SHA256)) - strcat(dummy_string,"H8 "); + /* The default hash algo order is: + SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. + Ordering SHA-1 before SHA-384 might be viewed as a bit + strange; it is done because we expect that soon enough + SHA-3 will be available and at that point there should + be no more need for SHA-384 etc. Anyway this order is + just a default and can easily be changed by a config + option. */ + if (!check_digest_algo (DIGEST_ALGO_SHA256)) + strcat (dummy_string, "H8 "); + + strcat (dummy_string,"H2 ");/* SHA-1 */ + + if (!check_digest_algo (DIGEST_ALGO_SHA384)) + strcat (dummy_string, "H9 "); + + if (!check_digest_algo (DIGEST_ALGO_SHA512)) + strcat (dummy_string, "H10 "); + + if (!check_digest_algo (DIGEST_ALGO_SHA224)) + strcat (dummy_string, "H11 "); - /* RIPEMD160 */ - strcat(dummy_string,"H3 "); /* ZLIB */ strcat(dummy_string,"Z2 "); @@ -500,7 +518,8 @@ /* Return a fake user ID containing the preferences. Caller must free. */ -PKT_user_id *keygen_get_std_prefs(void) +PKT_user_id * +keygen_get_std_prefs (void) { int i,j=0; PKT_user_id *uid=xmalloc_clear(sizeof(PKT_user_id)); @@ -628,6 +647,8 @@ int keygen_upd_std_prefs( PKT_signature *sig, void *opaque ) { + (void)opaque; + if (!prefs_initialized) keygen_set_std_prefs (NULL, 0); @@ -769,17 +790,20 @@ return 0; } +/* Create a back-signature. If TIMESTAMP is not NULL, use it for the + signature creation time. */ int -make_backsig(PKT_signature *sig,PKT_public_key *pk, - PKT_public_key *sub_pk,PKT_secret_key *sub_sk) +make_backsig (PKT_signature *sig, PKT_public_key *pk, + PKT_public_key *sub_pk, PKT_secret_key *sub_sk, + u32 timestamp) { PKT_signature *backsig; int rc; cache_public_key(sub_pk); - rc=make_keysig_packet(&backsig,pk,NULL,sub_pk,sub_sk,0x19,0,0, - sub_pk->timestamp,0,NULL,NULL); + rc= make_keysig_packet (&backsig, pk, NULL, sub_pk, sub_sk, 0x19, + 0, 0, timestamp, 0, NULL, NULL); if(rc) log_error("make_keysig_packet failed for backsig: %s\n",g10_errstr(rc)); else @@ -862,7 +886,7 @@ static int write_direct_sig( KBNODE root, KBNODE pub_root, PKT_secret_key *sk, - struct revocation_key *revkey ) + struct revocation_key *revkey, u32 timestamp) { PACKET *pkt; PKT_signature *sig; @@ -884,8 +908,9 @@ cache_public_key (pk); /* and make the signature */ - rc = make_keysig_packet(&sig,pk,NULL,NULL,sk,0x1F,0,0,pk->timestamp,0, - keygen_add_revkey,revkey); + rc = make_keysig_packet (&sig, pk, NULL, NULL, sk, 0x1F, + 0, 0, timestamp, 0, + keygen_add_revkey, revkey); if( rc ) { log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) ); return rc; @@ -899,8 +924,8 @@ } static int -write_selfsigs( KBNODE sec_root, KBNODE pub_root, PKT_secret_key *sk, - unsigned int use ) +write_selfsigs (KBNODE sec_root, KBNODE pub_root, PKT_secret_key *sk, + unsigned int use, u32 timestamp) { PACKET *pkt; PKT_signature *sig; @@ -928,8 +953,9 @@ cache_public_key (pk); /* and make the signature */ - rc = make_keysig_packet( &sig, pk, uid, NULL, sk, 0x13, 0, 0, - pk->timestamp, 0, keygen_add_std_prefs, pk ); + rc = make_keysig_packet (&sig, pk, uid, NULL, sk, 0x13, + 0, 0, timestamp, 0, + keygen_add_std_prefs, pk); if( rc ) { log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) ); return rc; @@ -948,9 +974,9 @@ } static int -write_keybinding( KBNODE root, KBNODE pub_root, +write_keybinding (KBNODE root, KBNODE pub_root, PKT_secret_key *pri_sk, PKT_secret_key *sub_sk, - unsigned int use ) + unsigned int use, u32 timestamp) { PACKET *pkt; PKT_signature *sig; @@ -983,8 +1009,8 @@ /* and make the signature */ oduap.usage = use; oduap.pk = sub_pk; - rc=make_keysig_packet(&sig, pri_pk, NULL, sub_pk, pri_sk, 0x18, 0, 0, - sub_pk->timestamp, 0, + rc=make_keysig_packet(&sig, pri_pk, NULL, sub_pk, pri_sk, 0x18, + 0, 0, timestamp, 0, keygen_add_key_flags_and_expire, &oduap ); if( rc ) { log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) ); @@ -994,7 +1020,7 @@ /* make a backsig */ if(use&PUBKEY_USAGE_SIG) { - rc=make_backsig(sig,pri_pk,sub_pk,sub_sk); + rc = make_backsig (sig, pri_pk, sub_pk, sub_sk, timestamp); if(rc) return rc; } @@ -1103,7 +1129,7 @@ MPI *factors; unsigned int qbits; - if( nbits < 512 || (!opt.flags.dsa2 && nbits > 1024)) + if( nbits < 512) { nbits = 1024; log_info(_("keysize invalid; using %u bits\n"), nbits ); @@ -1120,6 +1146,14 @@ log_info(_("keysize rounded up to %u bits\n"), nbits ); } + /* To comply with FIPS rules we round up to the next value unless + in expert mode. */ + if (!opt.expert && nbits > 1024 && (nbits % 1024)) + { + nbits = ((nbits + 1023) / 1024) * 1024; + log_info (_("keysize rounded up to %u bits\n"), nbits ); + } + /* Figure out a q size based on the key size. FIPS 180-3 says: @@ -1131,11 +1165,11 @@ 2048/256 is an odd pair since there is also a 2048/224 and 3072/256. Matching sizes is not a very exact science. - We'll do 256 qbits for nbits over 2048, 224 for nbits over 1024 + We'll do 256 qbits for nbits over 2047, 224 for nbits over 1024 but less than 2048, and 160 for 1024 (DSA1). */ - if(nbits>2048) + if(nbits>2047) qbits=256; else if(nbits>1024) qbits=224; @@ -1438,101 +1472,139 @@ } -/**************** - * Returns: 0 to create both a DSA and a Elgamal key. - * and only if key flags are to be written the desired usage. - */ +/* Ask for an algorithm. The function returns the algorithm id to + create. If ADDMODE is false the function won't show an option to + create the primary and subkey combined and won't set R_USAGE + either. If a combined algorithm has been selected, the subkey + algorithm is stored at R_SUBKEY_ALGO. */ static int -ask_algo (int addmode, unsigned int *r_usage) +ask_algo (int addmode, int *r_subkey_algo, unsigned int *r_usage) { - char *answer; - int algo; + char *answer; + int algo; + int dummy_algo; + + if (!r_subkey_algo) + r_subkey_algo = &dummy_algo; + + tty_printf(_("Please select what kind of key you want:\n")); + if (!addmode) + tty_printf (_(" (%d) RSA and RSA (default)\n"), 1 ); + if ( !addmode ) + tty_printf (_(" (%d) DSA and Elgamal\n"), 2 ); - *r_usage = 0; - tty_printf(_("Please select what kind of key you want:\n")); - 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"), 4 ); - tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); - if (addmode) - tty_printf(_(" (%d) RSA (encrypt only)\n"), 6 ); - if (opt.expert) - tty_printf( _(" (%d) RSA (set your own capabilities)\n"), 7 ); + tty_printf( _(" (%d) DSA (sign only)\n"), 3 ); + tty_printf( _(" (%d) RSA (sign only)\n"), 4 ); - for(;;) { - answer = cpr_get("keygen.algo",_("Your selection? ")); - cpr_kill_prompt(); - algo = *answer? atoi(answer): 1; - xfree(answer); - if( algo == 1 && !addmode ) { - algo = 0; /* create both keys */ - break; + if (addmode) + { + tty_printf (_(" (%d) Elgamal (encrypt only)\n"), 5 ); + tty_printf (_(" (%d) RSA (encrypt only)\n"), 6 ); + } + if (opt.expert) + { + tty_printf (_(" (%d) DSA (set your own capabilities)\n"), 7 ); + tty_printf (_(" (%d) RSA (set your own capabilities)\n"), 8 ); + } + + for (;;) + { + *r_usage = 0; + *r_subkey_algo = 0; + answer = cpr_get ("keygen.algo", _("Your selection? ")); + cpr_kill_prompt (); + algo = *answer? atoi(answer): 1; + xfree (answer); + if ( algo == 1 && !addmode ) + { + algo = PUBKEY_ALGO_RSA; + *r_subkey_algo = PUBKEY_ALGO_RSA; + break; } - else if( algo == 7 && opt.expert ) { - algo = PUBKEY_ALGO_RSA; - *r_usage=ask_key_flags(algo,addmode); - break; + else if (algo == 2 && !addmode) + { + algo = PUBKEY_ALGO_DSA; + *r_subkey_algo = PUBKEY_ALGO_ELGAMAL_E; + break; } - else if( algo == 6 && addmode ) { - algo = PUBKEY_ALGO_RSA; - *r_usage = PUBKEY_USAGE_ENC; - break; + else if (algo == 3) + { + algo = PUBKEY_ALGO_DSA; + *r_usage = PUBKEY_USAGE_SIG; + break; } - else if( algo == 5 ) { - algo = PUBKEY_ALGO_RSA; - *r_usage = PUBKEY_USAGE_SIG; - break; + else if (algo == 4) + { + algo = PUBKEY_ALGO_RSA; + *r_usage = PUBKEY_USAGE_SIG; + break; } - else if( algo == 4 && addmode ) { - algo = PUBKEY_ALGO_ELGAMAL_E; - *r_usage = PUBKEY_USAGE_ENC; - break; + else if (algo == 5 && 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,addmode); - break; + else if (algo == 6 && addmode) + { + algo = PUBKEY_ALGO_RSA; + *r_usage = PUBKEY_USAGE_ENC; + break; } - else if( algo == 2 ) { - algo = PUBKEY_ALGO_DSA; - *r_usage = PUBKEY_USAGE_SIG; - break; + else if (algo == 7 && opt.expert) + { + algo = PUBKEY_ALGO_DSA; + *r_usage = ask_key_flags (algo, addmode); + break; } - else - tty_printf(_("Invalid selection.\n")); + else if (algo == 8 && opt.expert) + { + algo = PUBKEY_ALGO_RSA; + *r_usage = ask_key_flags (algo, addmode); + break; + } + else + tty_printf (_("Invalid selection.\n")); } - - return algo; + + return algo; } -static unsigned -ask_keysize( int algo ) +/* Ask for the key size. ALGO is the algorithm. If PRIMARY_KEYSIZE + is not 0, the function asks for the size of the encryption + subkey. */ +static unsigned int +ask_keysize (int algo, unsigned int primary_keysize) { - unsigned nbits,min,def=2048,max=4096; + unsigned nbits, min, def=2048, max=4096; + int for_subkey = !!primary_keysize; + int autocomp = 0; if(opt.expert) min=512; else min=1024; + if (primary_keysize && !opt.expert) + { + /* Deduce the subkey size from the primary key size. */ + if (algo == PUBKEY_ALGO_DSA && primary_keysize > 3072) + nbits = 3072; /* For performance reasons we don't support more + than 3072 bit DSA. However we won't see this + case anyway because DSA can't be used as an + encryption subkey ;-). */ + else + nbits = primary_keysize; + autocomp = 1; + goto leave; + } + switch(algo) { case PUBKEY_ALGO_DSA: - if(opt.flags.dsa2) - { - def=1024; - max=3072; - } - else - { - tty_printf(_("DSA keypair will have %u bits.\n"),1024); - return 1024; - } + def=2048; + max=3072; break; case PUBKEY_ALGO_RSA: @@ -1547,12 +1619,11 @@ { char *prompt,*answer; -#define PROMPTSTRING _("What keysize do you want? (%u) ") - - prompt=xmalloc(strlen(PROMPTSTRING)+20); - sprintf(prompt,PROMPTSTRING,def); - -#undef PROMPTSTRING + if (for_subkey) + prompt = xasprintf (_("What keysize do you want " + "for the subkey? (%u) "), def); + else + prompt = xasprintf (_("What keysize do you want? (%u) "), def); answer = cpr_get("keygen.size",prompt); cpr_kill_prompt(); @@ -1569,15 +1640,18 @@ tty_printf(_("Requested keysize is %u bits\n"), nbits ); + leave: if( algo == PUBKEY_ALGO_DSA && (nbits % 64) ) { nbits = ((nbits + 63) / 64) * 64; - tty_printf(_("rounded up to %u bits\n"), nbits ); + if (!autocomp) + 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 ); + if (!autocomp) + tty_printf (_("rounded up to %u bits\n"), nbits); } return nbits; @@ -1595,25 +1669,43 @@ * similar. */ u32 -parse_expire_string(u32 timestamp,const char *string) +parse_expire_string (u32 timestamp, const char *string) { - int mult; - u32 seconds,abs_date=0; - - if( !*string ) - seconds = 0; - else if ( !strncmp (string, "seconds=", 8) ) - seconds = atoi (string+8); - else if( (abs_date = scan_isodatestr(string)) && abs_date > timestamp ) - seconds = abs_date - timestamp; - else if( (mult=check_valid_days(string)) ) - seconds = atoi(string) * 86400L * mult; - else - seconds=(u32)-1; + int mult; + u32 seconds; + u32 abs_date = 0; + + if ( !*string ) + seconds = 0; + else if ( !strncmp (string, "seconds=", 8) ) + seconds = atoi (string+8); + else if( (abs_date = scan_isodatestr(string)) && abs_date > timestamp ) + seconds = abs_date - timestamp; + else if( (mult=check_valid_days(string)) ) + seconds = atoi(string) * 86400L * mult; + else + seconds=(u32)-1; + + return seconds; +} - return seconds; +/* Parse an Creation-Date string which is either "1986-04-26" or + "19860426T042640". Returns 0 on error. */ +static u32 +parse_creation_string (const char *string) +{ + u32 seconds; + + if (!*string) + seconds = 0; + else if ( !strncmp (string, "seconds=", 8) ) + seconds = atoi (string+8); + else if ( !(seconds = scan_isodatestr (string))) + seconds = isotime2seconds (string); + return seconds; } + /* object == 0 for a key, and 1 for a sig */ u32 ask_expire_interval(u32 timestamp,int object,const char *def_expire) @@ -1678,7 +1770,7 @@ } cpr_kill_prompt(); trim_spaces(answer); - interval = parse_expire_string( timestamp, answer ); + interval = parse_expire_string (timestamp, answer); if( interval == (u32)-1 ) { tty_printf(_("invalid value\n")); @@ -1697,12 +1789,18 @@ ? _("Key expires at %s\n") : _("Signature expires at %s\n"), asctimestamp((ulong)(timestamp + interval) ) ); - /* 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)(timestamp+interval)) < 0 ) - tty_printf(_("Your system can't display dates beyond 2038.\n" - "However, it will be correctly handled up to 2106.\n")); +#if SIZEOF_TIME_T <= 4 + if ((time_t)((ulong)(timestamp+interval)) < 0 ) + tty_printf (_("Your system can't display dates beyond 2038.\n" + "However, it will be correctly handled up to" + " 2106.\n")); + else +#endif /*SIZEOF_TIME_T*/ + if ( (time_t)((unsigned long)(timestamp+interval)) < timestamp ) + { + tty_printf (_("invalid value\n")); + continue; + } } if( cpr_enabled() || cpr_get_answer_is_yes("keygen.valid.okay", @@ -2115,16 +2213,56 @@ static u32 get_parameter_u32( struct para_data_s *para, enum para_name key ) { - struct para_data_s *r = get_parameter( para, key ); + struct para_data_s *r; - if( !r ) - return 0; + r = get_parameter (para, key); + if (!r && key == pKEYCREATIONDATE) + { + /* Return a default for the creation date if it has not yet been + set. We need to set this into the parameter list so that a + second call for pKEYCREATIONDATE returns the same value. The + default is the current time unless an explicit creation date + has been specified. Checking the creation date here is only + for the case that it has not yet been parsed. */ + r = get_parameter (para, pCREATIONDATE); + if (r && *r->u.value) + { + u32 seconds; + + seconds = parse_creation_string (r->u.value); + if (!seconds) + log_error ("invalid creation date in line %d\n", r->lnr ); + else /* Okay: Change this parameter. */ + { + r->u.creation = seconds; + r->key = pKEYCREATIONDATE; + } + } + + r = get_parameter (para, key); + if (!r) + { + /* Create a new parameter. */ + r = xmalloc_clear (sizeof *r); + r->key = key; + r->u.creation = make_timestamp (); + r->next = para; + para = r; + } + + r = get_parameter (para, key); + assert (r); + } + + + if (!r) + return 0; + if( r->key == pKEYCREATIONDATE ) + return r->u.creation; if( r->key == pKEYEXPIRE || r->key == pSUBKEYEXPIRE ) return r->u.expire; if( r->key == pKEYUSAGE || r->key == pSUBKEYUSAGE ) return r->u.usage; - if( r->key == pCREATETIME ) - return r->u.create; return (unsigned int)strtoul( r->u.value, NULL, 10 ); } @@ -2165,13 +2303,6 @@ size_t n; char *p; int have_user_id=0,err,algo; - u32 timestamp; - - /* If we were told a creation time from outside, use it. Otherwise - look at the clock. */ - timestamp=get_parameter_u32( para, pCREATETIME ); - if(!timestamp) - timestamp=make_timestamp(); /* Check that we have all required parameters. */ r = get_parameter( para, pKEYTYPE ); @@ -2190,42 +2321,62 @@ return -1; } - err=parse_parameter_usage (fname, para, pKEYUSAGE); - if(err==0) + err = parse_parameter_usage (fname, para, pKEYUSAGE); + if (!err) { /* Default to algo capabilities if key-usage is not provided */ - r=xmalloc_clear(sizeof(*r)); - r->key=pKEYUSAGE; - r->u.usage=openpgp_pk_algo_usage(algo); - r->next=para; - para=r; + r = xmalloc_clear(sizeof(*r)); + r->key = pKEYUSAGE; + r->u.usage = openpgp_pk_algo_usage(algo); + r->next = para; + para = r; } - else if(err==-1) + else if (err == -1) return -1; + else + { + r = get_parameter (para, pKEYUSAGE); + if (r && (r->u.usage & ~openpgp_pk_algo_usage (algo))) + { + log_error ("%s:%d: specified Key-Usage not allowed for algo %d\n", + fname, r->lnr, algo); + return -1; + } + } r = get_parameter( para, pSUBKEYTYPE ); if(r) { - algo=get_parameter_algo( para, pSUBKEYTYPE); - if(check_pubkey_algo(algo)) + algo = get_parameter_algo (para, pSUBKEYTYPE); + if (check_pubkey_algo (algo)) { - log_error("%s:%d: invalid algorithm\n", fname, r->lnr ); + log_error ("%s:%d: invalid algorithm\n", fname, r->lnr ); return -1; } - err=parse_parameter_usage (fname, para, pSUBKEYUSAGE); - if(err==0) + err = parse_parameter_usage (fname, para, pSUBKEYUSAGE); + if (!err) { /* Default to algo capabilities if subkey-usage is not provided */ - r=xmalloc_clear(sizeof(*r)); - r->key=pSUBKEYUSAGE; - r->u.usage=openpgp_pk_algo_usage(algo); - r->next=para; - para=r; + r = xmalloc_clear (sizeof(*r)); + r->key = pSUBKEYUSAGE; + r->u.usage = openpgp_pk_algo_usage (algo); + r->next = para; + para = r; } - else if(err==-1) + else if (err == -1) return -1; + else + { + r = get_parameter (para, pSUBKEYUSAGE); + if (r && (r->u.usage & ~openpgp_pk_algo_usage (algo))) + { + log_error ("%s:%d: specified Subkey-Usage not allowed" + " for algo %d\n", fname, r->lnr, algo); + return -1; + } + } } if( get_parameter_value( para, pUSERID ) ) @@ -2289,9 +2440,9 @@ /* make DEK and S2K from the Passphrase */ r = get_parameter( para, pPASSPHRASE ); if( r && *r->u.value ) { - /* we have a plain text passphrase - create a DEK from it. - * It is a little bit ridiculous to keep it ih secure memory - * but becuase we do this alwasy, why not here */ + /* We have a plain text passphrase - create a DEK from it. + * It is a little bit ridiculous to keep it in secure memory + * but because we do this alwasy, why not here. */ STRING2KEY *s2k; DEK *dek; @@ -2317,14 +2468,31 @@ para = r; } - /* make KEYEXPIRE from Expire-Date */ + /* Make KEYCREATIONDATE from Creation-Date. */ + r = get_parameter (para, pCREATIONDATE); + if (r && *r->u.value) + { + u32 seconds; + + seconds = parse_creation_string (r->u.value); + if (!seconds) + { + log_error ("%s:%d: invalid creation date\n", fname, r->lnr ); + return -1; + } + r->u.creation = seconds; + r->key = pKEYCREATIONDATE; /* Change that entry. */ + } + + /* Make KEYEXPIRE from Expire-Date. */ r = get_parameter( para, pEXPIREDATE ); if( r && *r->u.value ) { u32 seconds; - seconds = parse_expire_string( timestamp, r->u.value ); - if( seconds == (u32)-1 ) + seconds = parse_expire_string + (get_parameter_u32 (para, pKEYCREATIONDATE), r->u.value); + if (seconds == (u32)(-1)) { log_error("%s:%d: invalid expire date\n", fname, r->lnr ); return -1; @@ -2344,7 +2512,7 @@ return -1; } - do_generate_keypair( para, outctrl, timestamp, card ); + do_generate_keypair (para, outctrl, card); return 0; } @@ -2370,6 +2538,7 @@ { "Name-Email", pNAMEEMAIL }, { "Name-Comment", pNAMECOMMENT }, { "Expire-Date", pEXPIREDATE }, + { "Creation-Date", pCREATIONDATE }, { "Passphrase", pPASSPHRASE }, { "Preferences", pPREFERENCES }, { "Revoker", pREVOKER }, @@ -2574,7 +2743,7 @@ int algo; unsigned int use; int both = 0; - u32 timestamp,expire; + u32 expire; struct para_data_s *para = NULL; struct para_data_s *r; struct output_control_s outctrl; @@ -2594,13 +2763,6 @@ return; } - timestamp=make_timestamp(); - r = xmalloc_clear( sizeof *r ); - r->key = pCREATETIME; - r->u.create = timestamp; - r->next = para; - para = r; - if (card_serialno) { #ifdef ENABLE_CARD_SUPPORT @@ -2652,16 +2814,19 @@ } else { - algo = ask_algo( 0, &use ); - if( !algo ) - { /* default: DSA with ElG subkey of the specified size */ + int subkey_algo; + + algo = ask_algo (0, &subkey_algo, &use ); + if (subkey_algo) + { + /* Create primary and subkey at once. */ both = 1; r = xmalloc_clear( sizeof *r + 20 ); r->key = pKEYTYPE; - sprintf( r->u.value, "%d", PUBKEY_ALGO_DSA ); + sprintf (r->u.value, "%d", algo); r->next = para; para = r; - nbits = ask_keysize( PUBKEY_ALGO_DSA ); + nbits = ask_keysize (algo, 0); r = xmalloc_clear( sizeof *r + 20 ); r->key = pKEYLENGTH; sprintf( r->u.value, "%u", nbits); @@ -2673,10 +2838,9 @@ r->next = para; para = r; - algo = PUBKEY_ALGO_ELGAMAL_E; r = xmalloc_clear( sizeof *r + 20 ); r->key = pSUBKEYTYPE; - sprintf( r->u.value, "%d", algo ); + sprintf( r->u.value, "%d", subkey_algo ); r->next = para; para = r; r = xmalloc_clear( sizeof *r + 20 ); @@ -2704,10 +2868,10 @@ r->next = para; para = r; } - + nbits = 0; } - nbits = ask_keysize( algo ); + nbits = ask_keysize (both? subkey_algo : algo, nbits); r = xmalloc_clear( sizeof *r + 20 ); r->key = both? pSUBKEYLENGTH : pKEYLENGTH; sprintf( r->u.value, "%u", nbits); @@ -2715,7 +2879,8 @@ para = r; } - expire = ask_expire_interval(timestamp,0,NULL); + expire = ask_expire_interval (get_parameter_u32 (para, pKEYCREATIONDATE), + 0, NULL); r = xmalloc_clear( sizeof *r + 20 ); r->key = pKEYEXPIRE; r->u.expire = expire; @@ -2852,8 +3017,8 @@ } static void -do_generate_keypair( struct para_data_s *para,struct output_control_s *outctrl, - u32 timestamp,int card ) +do_generate_keypair (struct para_data_s *para,struct output_control_s *outctrl, + int card) { KBNODE pub_root = NULL; KBNODE sec_root = NULL; @@ -2862,6 +3027,7 @@ struct revocation_key *revkey; int rc; int did_sub = 0; + u32 timestamp; if( outctrl->dryrun ) { @@ -2939,7 +3105,7 @@ } - /* we create the packets as a tree of kbnodes. Because the + /* We create the packets as a tree of kbnodes. Because the * structure we create is known in advance we simply generate a * linked list. The first packet is a dummy packet which we flag * as deleted. The very first packet must always be a KEY packet. @@ -2948,6 +3114,17 @@ start_tree(&pub_root); start_tree(&sec_root); + timestamp = get_parameter_u32 (para, pKEYCREATIONDATE); + + /* Note that, depending on the backend (i.e. the used scdaemon + version or the internal code), the card key generation may + update TIMESTAMP for each key. Thus we need to pass TIMESTAMP + to all signing function to make sure that the binding signature + is done using the timestamp of the corresponding (sub)key and + not that of the primary key. An alternative implementation + could tell the signing function the node of the subkey but that + is more work than just to pass the current timestamp. */ + if (!card) { rc = do_create( get_parameter_algo( para, pKEYTYPE ), @@ -2962,6 +3139,7 @@ else { rc = gen_card_key (PUBKEY_ALGO_RSA, 1, 1, pub_root, sec_root, NULL, + ×tamp, get_parameter_u32 (para, pKEYEXPIRE), para); if (!rc) { @@ -2972,9 +3150,9 @@ if(!rc && (revkey=get_parameter_revkey(para,pREVOKER))) { - rc=write_direct_sig(pub_root,pub_root,pri_sk,revkey); - if(!rc) - write_direct_sig(sec_root,pub_root,pri_sk,revkey); + rc = write_direct_sig (pub_root, pub_root, pri_sk, revkey, timestamp); + if (!rc) + write_direct_sig (sec_root, pub_root, pri_sk, revkey, timestamp); } if( !rc && (s=get_parameter_value(para, pUSERID)) ) @@ -2983,9 +3161,10 @@ if( !rc ) write_uid(sec_root, s ); - if( !rc ) - rc = write_selfsigs(sec_root, pub_root, pri_sk, - get_parameter_uint (para, pKEYUSAGE)); + if (!rc) + rc = write_selfsigs (sec_root, pub_root, pri_sk, + get_parameter_uint (para, pKEYUSAGE), + timestamp); } /* Write the auth key to the card before the encryption key. This @@ -2998,12 +3177,15 @@ if (!rc && card && get_parameter (para, pAUTHKEYTYPE)) { rc = gen_card_key (PUBKEY_ALGO_RSA, 3, 0, pub_root, sec_root, NULL, + ×tamp, get_parameter_u32 (para, pKEYEXPIRE), para); if (!rc) - rc = write_keybinding (pub_root, pub_root, pri_sk, sub_sk, PUBKEY_USAGE_AUTH); + rc = write_keybinding (pub_root, pub_root, pri_sk, sub_sk, + PUBKEY_USAGE_AUTH, timestamp); if (!rc) - rc = write_keybinding (sec_root, pub_root, pri_sk, sub_sk, PUBKEY_USAGE_AUTH); + rc = write_keybinding (sec_root, pub_root, pri_sk, sub_sk, + PUBKEY_USAGE_AUTH, timestamp); } if( !rc && get_parameter( para, pSUBKEYTYPE ) ) @@ -3028,6 +3210,7 @@ the card. Write a backup file. */ rc = gen_card_key_with_backup (PUBKEY_ALGO_RSA, 2, 0, pub_root, sec_root, + timestamp, get_parameter_u32 (para, pKEYEXPIRE), para, s); @@ -3035,15 +3218,18 @@ else rc = gen_card_key (PUBKEY_ALGO_RSA, 2, 0, pub_root, sec_root, NULL, + ×tamp, get_parameter_u32 (para, pKEYEXPIRE), para); } if( !rc ) - rc = write_keybinding(pub_root, pub_root, pri_sk, sub_sk, - get_parameter_uint (para, pSUBKEYUSAGE)); + rc = write_keybinding (pub_root, pub_root, pri_sk, sub_sk, + get_parameter_uint (para, pSUBKEYUSAGE), + timestamp ); if( !rc ) - rc = write_keybinding(sec_root, pub_root, pri_sk, sub_sk, - get_parameter_uint (para, pSUBKEYUSAGE)); + rc = write_keybinding (sec_root, pub_root, pri_sk, sub_sk, + get_parameter_uint (para, pSUBKEYUSAGE), + timestamp); did_sub = 1; } @@ -3239,9 +3425,9 @@ if( rc ) goto leave; - algo = ask_algo( 1, &use ); + algo = ask_algo (1, NULL, &use); assert(algo); - nbits = ask_keysize( algo ); + nbits = ask_keysize (algo, 0); expire = ask_expire_interval(timestamp,0,NULL); if( !cpr_enabled() && !cpr_get_answer_is_yes("keygen.sub.okay", _("Really create? (y/N) "))) @@ -3258,16 +3444,19 @@ NULL, NULL ); } - rc = do_create( algo, nbits, pub_keyblock, sec_keyblock, + rc = do_create (algo, nbits, pub_keyblock, sec_keyblock, dek, s2k, &sub_sk, timestamp, expire, 1 ); - if( !rc ) - rc = write_keybinding(pub_keyblock, pub_keyblock, pri_sk, sub_sk, use); - if( !rc ) - rc = write_keybinding(sec_keyblock, pub_keyblock, pri_sk, sub_sk, use); - if( !rc ) { + if (!rc) + rc = write_keybinding (pub_keyblock, pub_keyblock, pri_sk, sub_sk, + use, timestamp); + if (!rc) + rc = write_keybinding (sec_keyblock, pub_keyblock, pri_sk, sub_sk, + use, timestamp); + if (!rc) + { okay = 1; write_status_text (STATUS_KEY_CREATED, "S"); - } + } leave: if( rc ) @@ -3373,11 +3562,13 @@ if (passphrase) set_next_passphrase (passphrase); rc = gen_card_key (algo, keyno, 0, pub_keyblock, sec_keyblock, - &sub_sk, expire, para); + &sub_sk, ×tamp, expire, para); if (!rc) - rc = write_keybinding (pub_keyblock, pub_keyblock, pri_sk, sub_sk, use); + rc = write_keybinding (pub_keyblock, pub_keyblock, pri_sk, sub_sk, use, + timestamp); if (!rc) - rc = write_keybinding (sec_keyblock, pub_keyblock, pri_sk, sub_sk, use); + rc = write_keybinding (sec_keyblock, pub_keyblock, pri_sk, sub_sk, use, + timestamp); if (!rc) { okay = 1; @@ -3422,10 +3613,11 @@ } +/* Note that TIMESTAMP is an in/out arg. */ static int gen_card_key (int algo, int keyno, int is_primary, KBNODE pub_root, KBNODE sec_root, PKT_secret_key **ret_sk, - u32 expireval, struct para_data_s *para) + u32 *timestamp, u32 expireval, struct para_data_s *para) { #ifdef ENABLE_CARD_SUPPORT int rc; @@ -3438,7 +3630,7 @@ assert (algo == PUBKEY_ALGO_RSA); /* Fixme: We don't have the serialnumber available, thus passing NULL. */ - rc = agent_scd_genkey (&info, keyno, 1, NULL); + rc = agent_scd_genkey (&info, keyno, 1, NULL, timestamp); /* if (gpg_err_code (rc) == GPG_ERR_EEXIST) */ /* { */ /* tty_printf ("\n"); */ @@ -3462,6 +3654,9 @@ return gpg_error (GPG_ERR_GENERAL); } + if (*timestamp != info.created_at) + log_info ("Note that the key does not use the suggested creation date\n"); + *timestamp = info.created_at; pk = xcalloc (1, sizeof *pk ); sk = xcalloc (1, sizeof *sk ); @@ -3509,6 +3704,7 @@ static int gen_card_key_with_backup (int algo, int keyno, int is_primary, KBNODE pub_root, KBNODE sec_root, + u32 timestamp, u32 expireval, struct para_data_s *para, const char *backup_dir) { @@ -3523,7 +3719,7 @@ sk_unprotected = NULL; sk_protected = NULL; - rc = generate_raw_key (algo, 1024, make_timestamp (), + rc = generate_raw_key (algo, 1024, timestamp, &sk_unprotected, &sk_protected); if (rc) return rc; diff -Nru gnupg-1.4.9/g10/keylist.c gnupg-1.4.10/g10/keylist.c --- gnupg-1.4.9/g10/keylist.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/keylist.c 2009-04-03 10:36:33.000000000 +0100 @@ -1,6 +1,6 @@ /* keylist.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, - * 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -547,7 +547,8 @@ if(pk || (sk && sk->protect.s2k.mode!=1001)) { unsigned int use = pk? pk->pubkey_usage : sk->pubkey_usage; - + int c_printed = 0; + if ( use & PUBKEY_USAGE_ENC ) putchar ('e'); @@ -555,9 +556,19 @@ { putchar ('s'); if( pk? pk->is_primary : sk->is_primary ) - putchar ('c'); + { + putchar ('c'); + /* The PUBKEY_USAGE_CERT flag was introduced later and + we used to always print 'c' for a primary key. To + avoid any regression here we better track whether we + printed 'c' already. */ + c_printed = 1; + } } + if ( (use & PUBKEY_USAGE_CERT) && !c_printed ) + putchar ('c'); + if ( (use & PUBKEY_USAGE_AUTH) ) putchar ('a'); } @@ -583,6 +594,8 @@ if(pk->is_primary) cert = 1; } + if ( pk->pubkey_usage & PUBKEY_USAGE_CERT ) + cert = 1; if ( (pk->pubkey_usage & PUBKEY_USAGE_AUTH) ) auth = 1; } @@ -600,6 +613,8 @@ if(sk->is_primary) cert = 1; } + if ( (sk->pubkey_usage & PUBKEY_USAGE_CERT) ) + cert = 1; if ( (sk->pubkey_usage & PUBKEY_USAGE_AUTH) ) auth = 1; } @@ -839,7 +854,7 @@ putchar('\n'); if((opt.list_options&LIST_SHOW_PHOTOS) && uid->attribs!=NULL) - show_photos(uid->attribs,uid->numattribs,pk,sk); + show_photos(uid->attribs,uid->numattribs,pk,sk,uid); } else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) { diff -Nru gnupg-1.4.9/g10/keyring.c gnupg-1.4.10/g10/keyring.c --- gnupg-1.4.9/g10/keyring.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/keyring.c 2009-07-17 11:15:40.000000000 +0100 @@ -1,5 +1,5 @@ /* keyring.c - keyring file handling - * Copyright (C) 2001, 2004 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004, 2007, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -419,38 +419,43 @@ if ( lastnode && lastnode->pkt->pkttype == PKT_SIGNATURE && (pkt->pkt.ring_trust->sigcache & 1) ) { - /* this is a ring trust packet with a checked signature + /* This is a ring trust packet with a checked signature * status cache following directly a signature paket. - * Set the cache status into that signature packet */ + * Set the cache status into that signature packet. */ PKT_signature *sig = lastnode->pkt->pkt.signature; sig->flags.checked = 1; sig->flags.valid = !!(pkt->pkt.ring_trust->sigcache & 2); } - /* reset lastnode, so that we set the cache status only from - * the ring trust packet immediately folling a signature */ + /* Reset LASTNODE, so that we set the cache status only + * from the ring trust packets immediately following + * signature packets. */ lastnode = NULL; - } - else { - node = lastnode = new_kbnode (pkt); - if (!keyblock) - keyblock = node; - else - add_kbnode (keyblock, node); - - if ( pkt->pkttype == PKT_PUBLIC_KEY - || pkt->pkttype == PKT_PUBLIC_SUBKEY - || pkt->pkttype == PKT_SECRET_KEY - || pkt->pkttype == PKT_SECRET_SUBKEY) { - if (++pk_no == hd->found.pk_no) - node->flag |= 1; - } - else if ( pkt->pkttype == PKT_USER_ID) { - if (++uid_no == hd->found.uid_no) - node->flag |= 2; - } + free_packet(pkt); + init_packet(pkt); + continue; } + node = lastnode = new_kbnode (pkt); + if (!keyblock) + keyblock = node; + else + add_kbnode (keyblock, node); + + if ( pkt->pkttype == PKT_PUBLIC_KEY + || pkt->pkttype == PKT_PUBLIC_SUBKEY + || pkt->pkttype == PKT_SECRET_KEY + || pkt->pkttype == PKT_SECRET_SUBKEY) + { + if (++pk_no == hd->found.pk_no) + node->flag |= 1; + } + else if ( pkt->pkttype == PKT_USER_ID) + { + if (++uid_no == hd->found.uid_no) + node->flag |= 2; + } + pkt = xmalloc (sizeof *pkt); init_packet(pkt); } @@ -1212,10 +1217,17 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, const char *fname, int secret ) { - int rc=0; + int rc=G10ERR_GENERAL; + + /* It's a secret keyring, so let's force a fsync just to be safe on + filesystems that may not sync data and metadata together + (ext4). */ + if(secret && iobuf_ioctl(NULL,4,0,(char*)tmpfname)!=0) + goto fail; /* invalidate close caches*/ - iobuf_ioctl (NULL, 2, 0, (char*)tmpfname ); + if(iobuf_ioctl (NULL, 2, 0, (char*)tmpfname )!=0) + goto fail; iobuf_ioctl (NULL, 2, 0, (char*)bakfname ); iobuf_ioctl (NULL, 2, 0, (char*)fname ); @@ -1245,15 +1257,7 @@ tmpfname, fname, strerror(errno) ); register_secured_file (fname); rc = G10ERR_RENAME_FILE; - if (secret) - { - log_info(_("WARNING: 2 files with confidential" - " information exists.\n")); - log_info(_("%s is the unchanged one\n"), fname ); - log_info(_("%s is the new one\n"), tmpfname ); - log_info(_("Please fix this possible security flaw\n")); - } - return rc; + goto fail; } /* Now make sure the file has the same permissions as the original */ @@ -1275,6 +1279,17 @@ #endif return 0; + + fail: + if(secret) + { + log_info(_("WARNING: 2 files with confidential information exists.\n")); + log_info(_("%s is the unchanged one\n"), fname ); + log_info(_("%s is the new one\n"), tmpfname ); + log_info(_("Please fix this possible security flaw\n")); + } + + return rc; } @@ -1384,7 +1399,20 @@ log_error ("keyring_get_keyblock failed: %s\n", g10_errstr(rc)); goto leave; } - assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY); + if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY) + { + /* We had a few reports about corrupted keyrings; if we have + been called directly from the command line we delete such + a keyblock instead of bailing out. */ + log_error ("unexpected keyblock found (pkttype=%d)%s\n", + keyblock->pkt->pkttype, noisy? " - deleted":""); + if (noisy) + continue; + log_info ("Hint: backup your keys and try running `%s'\n", + "gpg --rebuild-keydb-caches"); + rc = G10ERR_INV_KEYRING; + goto leave; + } /* check all signature to set the signature's cache flags */ for (node=keyblock; node; node=node->next) diff -Nru gnupg-1.4.9/g10/keyserver.c gnupg-1.4.10/g10/keyserver.c --- gnupg-1.4.9/g10/keyserver.c 2008-03-25 09:20:27.000000000 +0000 +++ gnupg-1.4.10/g10/keyserver.c 2009-08-13 08:07:19.000000000 +0100 @@ -1,6 +1,6 @@ /* keyserver.c - generic keyserver code - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -38,6 +38,9 @@ #include "trustdb.h" #include "keyserver-internal.h" #include "util.h" +#ifdef USE_DNS_SRV +#include "srv.h" +#endif #ifdef HAVE_W32_SYSTEM /* It seems Vista doesn't grok X_OK and so fails access() tests. @@ -927,6 +930,8 @@ { if(strcmp(type,"ldaps")==0) return "ldap"; + else if(strcmp(type,"hkps")==0) + return "hkp"; else return type; } @@ -1265,24 +1270,49 @@ { PKT_user_id *uid=node->pkt->pkt.user_id; int r; + char *uidstr1,*uidstr2,*uidstr3; + size_t uidstrlen; if(uid->attrib_data) continue; fprintf(spawn->tochild,"uid:"); - /* Quote ':', '%', and any 8-bit - characters */ - for(r=0;rlen;r++) + /* Make sure it's real UTF8. What happens + here is that first we heuristically try + and convert the string (which may be + mis-coded) into UTF8. We then bring it + to native and then back to UTF8. For + true UTF8, this whole process should be + lossless. For the common Latin-1 + mis-encoding, it will become UTF8. For + other encodings, it will become UTF8 but + with unknown characters quoted. This + preserves the notion that anything in the + stream to the keyserver handler program + is UTF8. */ + uidstr1=string_to_utf8(uid->name); + uidstr2=utf8_to_native(uidstr1,strlen(uidstr1),-1); + uidstr3=native_to_utf8(uidstr2); + + uidstrlen=strlen(uidstr3); + + /* Quote ':', '%', and anything not + printable ASCII */ + for(r=0;rname[r]==':' || uid->name[r]=='%' - || uid->name[r]&0x80) + if(uidstr3[r]==':' || uidstr3[r]=='%' + || uidstr3[r]<' ' || uidstr3[r]>'~') fprintf(spawn->tochild,"%%%02X", - (byte)uid->name[r]); + (byte)uidstr3[r]); else - fprintf(spawn->tochild,"%c",uid->name[r]); + fprintf(spawn->tochild,"%c",uidstr3[r]); } + xfree(uidstr1); + xfree(uidstr2); + xfree(uidstr3); + fprintf(spawn->tochild,":%u:%u:", uid->created,uid->expiredate); @@ -2018,13 +2048,7 @@ spec=parse_keyserver_uri(url,1,NULL,0); if(spec) { - STRLIST list=NULL; - - add_to_strlist(&list,url); - - rc=keyserver_fetch(list); - - free_strlist(list); + rc=keyserver_import_fprint(*fpr,*fpr_len,spec); free_keyserver_spec(spec); } } @@ -2097,17 +2121,19 @@ return rc; } -/* Use the PGP Universal trick of asking ldap://keys.(maildomain) for - the key. */ +/* Import a key by name using LDAP */ int keyserver_import_ldap(const char *name,unsigned char **fpr,size_t *fpr_len) { char *domain; struct keyserver_spec *keyserver; STRLIST list=NULL; - int rc; - - append_to_strlist(&list,name); + int rc,hostlen=1; +#ifdef USE_DNS_SRV + struct srventry *srvlist=NULL; + int srvcount,i; + char srvname[MAXDNAME]; +#endif /* Parse out the domain */ domain=strrchr(name,'@'); @@ -2117,16 +2143,48 @@ domain++; keyserver=xmalloc_clear(sizeof(struct keyserver_spec)); - keyserver->scheme=xstrdup("ldap"); - keyserver->host=xmalloc(5+strlen(domain)+1); - strcpy(keyserver->host,"keys."); + keyserver->host=xmalloc(1); + keyserver->host[0]='\0'; + +#ifdef USE_DNS_SRV + snprintf(srvname,MAXDNAME,"_pgpkey-ldap._tcp.%s",domain); + + srvcount=getsrv(srvname,&srvlist); + + for(i=0;ihost=xrealloc(keyserver->host,hostlen); + + strcat(keyserver->host,srvlist[i].target); + + if(srvlist[i].port!=389) + { + char port[7]; + + hostlen+=6; /* a colon, plus 5 digits (unsigned 16-bit value) */ + keyserver->host=xrealloc(keyserver->host,hostlen); + + snprintf(port,7,":%u",srvlist[i].port); + strcat(keyserver->host,port); + } + + strcat(keyserver->host," "); + } + + free(srvlist); +#endif + + /* If all else fails, do the PGP Universal trick of + ldap://keys.(domain) */ + + hostlen+=5+strlen(domain); + keyserver->host=xrealloc(keyserver->host,hostlen); + strcat(keyserver->host,"keys."); strcat(keyserver->host,domain); - keyserver->uri=xmalloc(strlen(keyserver->scheme)+ - 3+strlen(keyserver->host)+1); - strcpy(keyserver->uri,keyserver->scheme); - strcat(keyserver->uri,"://"); - strcat(keyserver->uri,keyserver->host); + + append_to_strlist(&list,name); rc=keyserver_work(KS_GETNAME,list,NULL,0,fpr,fpr_len,keyserver); diff -Nru gnupg-1.4.9/g10/main.h gnupg-1.4.10/g10/main.h --- gnupg-1.4.9/g10/main.h 2007-12-03 14:27:41.000000000 +0000 +++ gnupg-1.4.10/g10/main.h 2009-08-03 17:19:20.000000000 +0100 @@ -1,6 +1,6 @@ /* main.h - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -91,11 +91,17 @@ #define idea_cipher_warn(a) #endif +void md5_digest_warn (int show); + +void not_in_gpg1_notice (void); + struct expando_args { PKT_public_key *pk; PKT_secret_key *sk; byte imagetype; + int validity_info; + const char *validity_string; }; char *pct_expando(const char *string,struct expando_args *args); @@ -181,7 +187,8 @@ int keygen_add_notations(PKT_signature *sig,void *opaque); int keygen_add_revkey(PKT_signature *sig, void *opaque); int make_backsig(PKT_signature *sig,PKT_public_key *pk, - PKT_public_key *sub_pk,PKT_secret_key *sub_sk); + PKT_public_key *sub_pk,PKT_secret_key *sub_sk, + u32 timestamp); int generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock ); #ifdef ENABLE_CARD_SUPPORT int generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock, diff -Nru gnupg-1.4.9/g10/mainproc.c gnupg-1.4.10/g10/mainproc.c --- gnupg-1.4.9/g10/mainproc.c 2007-12-12 17:44:49.000000000 +0000 +++ gnupg-1.4.10/g10/mainproc.c 2008-12-11 16:40:05.000000000 +0000 @@ -1,6 +1,6 @@ /* mainproc.c - handle packets - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1800,7 +1800,8 @@ if(opt.verify_options&VERIFY_SHOW_PHOTOS) show_photos(un->pkt->pkt.user_id->attribs, - un->pkt->pkt.user_id->numattribs,pk,NULL); + un->pkt->pkt.user_id->numattribs, + pk,NULL,un->pkt->pkt.user_id); } p=utf8_to_native(un->pkt->pkt.user_id->name, diff -Nru gnupg-1.4.9/g10/Makefile.in gnupg-1.4.10/g10/Makefile.in --- gnupg-1.4.9/g10/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/g10/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -65,11 +65,11 @@ $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -149,7 +149,7 @@ gpgv_OBJECTS = $(am_gpgv_OBJECTS) gpgv_LDADD = $(LDADD) gpgv_DEPENDENCIES = $(needed_libs) $(am__DEPENDENCIES_2) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -197,7 +197,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -612,8 +611,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -625,8 +624,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -636,13 +635,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gnupg-1.4.9/g10/misc.c gnupg-1.4.10/g10/misc.c --- gnupg-1.4.9/g10/misc.c 2007-12-12 17:35:18.000000000 +0000 +++ gnupg-1.4.10/g10/misc.c 2009-08-03 17:26:32.000000000 +0100 @@ -1,6 +1,6 @@ /* misc.c - miscellaneous functions - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2005 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -350,8 +350,7 @@ } } else if(algo==DIGEST_ALGO_MD5) - log_info(_("WARNING: digest algorithm %s is deprecated\n"), - digest_algo_to_string(algo)); + md5_digest_warn (1); } /* Return a string which is used as a kind of process ID */ @@ -464,7 +463,41 @@ } #endif -static unsigned long get_signature_count(PKT_secret_key *sk) +/* Print a warning if the md5 digest algorithm has been used. This + warning is printed only once unless SHOW is used. */ +void +md5_digest_warn (int show) +{ + static int warned = 0; + + if (!warned || show) + { + log_info (_("WARNING: digest algorithm %s is deprecated\n"), + digest_algo_to_string (DIGEST_ALGO_MD5)); + log_info (_("please see %s for more information\n"), + "http://www.gnupg.org/faq/weak-digest-algos.html"); + warned = 1; + } +} + + +void +not_in_gpg1_notice (void) +{ + static int warned = 0; + + if (!warned) + { + log_info (_("NOTE: This feature is not available in %s\n"), "GnuPG 1.x"); + log_info (_("please see %s for more information\n"), + "http://www.gnupg.org/faq/features-not-in-gnupg-1.html"); + warned = 1; + } +} + + +static unsigned long +get_signature_count(PKT_secret_key *sk) { #ifdef ENABLE_CARD_SUPPORT if(sk && sk->is_protected && sk->protect.s2k.mode==1002) @@ -503,8 +536,6 @@ while(*ch!='\0') { - char *str=NULL; - if(!done) { /* 8192 is way bigger than we'll need here */ @@ -613,22 +644,46 @@ } break; - case 't': /* e.g. "jpg" */ - str=image_type_to_string(args->imagetype,0); - /* fall through */ - - case 'T': /* e.g. "image/jpeg" */ - if(str==NULL) - str=image_type_to_string(args->imagetype,2); - - if(idx+strlen(str)validity_info && idx+1validity_info; + ret[idx]='\0'; done=1; } break; + /* The text string types */ + case 't': + case 'T': + case 'V': + { + const char *str=NULL; + + switch(*(ch+1)) + { + case 't': /* e.g. "jpg" */ + str=image_type_to_string(args->imagetype,0); + break; + + case 'T': /* e.g. "image/jpeg" */ + str=image_type_to_string(args->imagetype,2); + break; + + case 'V': /* e.g. "full", "expired", etc. */ + str=args->validity_string; + break; + } + + if(str && idx+strlen(str)protect.algo ) { case 7: case 8: case 9: /* AES */ case 10: /* Twofish */ - case 11: case 12: /* Camellia */ + case 11: case 12: case 13: /* Camellia */ sk->protect.ivlen = 16; break; default: diff -Nru gnupg-1.4.9/g10/passphrase.c gnupg-1.4.10/g10/passphrase.c --- gnupg-1.4.9/g10/passphrase.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/passphrase.c 2009-07-08 15:18:16.000000000 +0100 @@ -1003,7 +1003,7 @@ get_last_passphrase(). */ dek = xmalloc_secure_clear ( sizeof *dek ); dek->algo = cipher_algo; - if( !*pw && mode == 2 ) + if( (!pw || !*pw) && mode == 2 ) dek->keylen = 0; else hash_passphrase( dek, pw, s2k, mode==2 ); diff -Nru gnupg-1.4.9/g10/photoid.c gnupg-1.4.10/g10/photoid.c --- gnupg-1.4.9/g10/photoid.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/photoid.c 2008-12-11 16:40:05.000000000 +0000 @@ -1,5 +1,5 @@ /* photoid.c - photo ID handling code - * Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2005, 2006, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -39,6 +39,7 @@ #include "main.h" #include "photoid.h" #include "ttyio.h" +#include "trustdb.h" /* Generate a new photo id packet, or return NULL if canceled */ PKT_user_id * @@ -158,7 +159,7 @@ "user" may not be able to dismiss a viewer window! */ if(opt.command_fd==-1) { - show_photos(uid->attribs,uid->numattribs,pk,NULL); + show_photos(uid->attribs,uid->numattribs,pk,NULL,uid); switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay", _("Is this photo correct (y/N/q)? "))) { @@ -289,8 +290,10 @@ } #endif -void show_photos(const struct user_attribute *attrs, - int count,PKT_public_key *pk,PKT_secret_key *sk) +void +show_photos(const struct user_attribute *attrs, + int count,PKT_public_key *pk,PKT_secret_key *sk, + PKT_user_id *uid) { #ifndef DISABLE_PHOTO_VIEWER int i; @@ -301,6 +304,8 @@ memset(&args,0,sizeof(args)); args.pk=pk; args.sk=sk; + args.validity_info=get_validity_info(pk,uid); + args.validity_string=get_validity_string(pk,uid); if(pk) keyid_from_pk(pk,kid); diff -Nru gnupg-1.4.9/g10/photoid.h gnupg-1.4.10/g10/photoid.h --- gnupg-1.4.9/g10/photoid.h 2007-10-23 08:50:35.000000000 +0100 +++ gnupg-1.4.10/g10/photoid.h 2008-12-11 16:40:05.000000000 +0000 @@ -1,5 +1,5 @@ /* photoid.h - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2005, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -27,7 +27,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk,const char *filename); int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len); char *image_type_to_string(byte type,int style); -void show_photos(const struct user_attribute *attrs, - int count,PKT_public_key *pk,PKT_secret_key *sk); +void show_photos(const struct user_attribute *attrs,int count, + PKT_public_key *pk,PKT_secret_key *sk,PKT_user_id *uid); #endif /* !_PHOTOID_H_ */ diff -Nru gnupg-1.4.9/g10/pkclist.c gnupg-1.4.10/g10/pkclist.c --- gnupg-1.4.9/g10/pkclist.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/pkclist.c 2008-12-11 16:40:05.000000000 +0000 @@ -1,6 +1,6 @@ /* pkclist.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -239,7 +239,8 @@ if((opt.verify_options&VERIFY_SHOW_PHOTOS) && un->pkt->pkt.user_id->attrib_data) show_photos(un->pkt->pkt.user_id->attribs, - un->pkt->pkt.user_id->numattribs,pk,NULL); + un->pkt->pkt.user_id->numattribs,pk,NULL, + un->pkt->pkt.user_id); p=utf8_to_native(un->pkt->pkt.user_id->name, un->pkt->pkt.user_id->len,0); @@ -1254,8 +1255,6 @@ return 0; } - - /**************** * Return -1 if we could not find an algorithm. */ @@ -1263,164 +1262,177 @@ select_algo_from_prefs(PK_LIST pk_list, int preftype, int request, const union pref_hint *hint) { - PK_LIST pkr; - u32 bits[8]; - const prefitem_t *prefs; - int i, j; - int compr_hack=0; - int any; + PK_LIST pkr; + u32 bits[8]; + const prefitem_t *prefs; + int result=-1,i; + unsigned int best=-1; + byte scores[256]; + + if( !pk_list ) + return -1; - if( !pk_list ) - return -1; + memset(bits,0xFF,sizeof(bits)); + memset(scores,0,sizeof(scores)); + + for( pkr = pk_list; pkr; pkr = pkr->next ) + { + u32 mask[8]; + int rank=1,implicit=-1; + + memset(mask,0,sizeof(mask)); - memset( bits, ~0, 8 * sizeof *bits ); - for( pkr = pk_list; pkr; pkr = pkr->next ) { - u32 mask[8]; - - memset( mask, 0, 8 * sizeof *mask ); - if( preftype == PREFTYPE_SYM ) { - if( PGP2 && - pkr->pk->version < 4 && - pkr->pk->selfsigversion < 4 ) - mask[0] |= (1<<1); /* IDEA is implicitly there for v3 keys - with v3 selfsigs (rfc2440:12.1) if - --pgp2 mode is on. This doesn't - mean it's actually available, of - course. */ + switch(preftype) + { + case PREFTYPE_SYM: + /* IDEA is implicitly there for v3 keys with v3 selfsigs if + --pgp2 mode is on. This was a 2440 thing that was + dropped from 4880 but is still relevant to GPG's 1991 + support. All this doesn't mean IDEA is actually + available, of course. */ + if(PGP2 && pkr->pk->version<4 && pkr->pk->selfsigversion<4) + implicit=CIPHER_ALGO_IDEA; else - mask[0] |= (1<<2); /* 3DES is implicitly there for everyone else */ - } - else if( preftype == PREFTYPE_HASH ) { + implicit=CIPHER_ALGO_3DES; + + break; + + case PREFTYPE_HASH: /* While I am including this code for completeness, note that currently --pgp2 mode locks the hash at MD5, so this - function will never even be called. Even if the hash - wasn't locked at MD5, we don't support sign+encrypt in - --pgp2 mode, and that's the only time PREFTYPE_HASH is - used anyway. -dms */ - if( PGP2 && - pkr->pk->version < 4 && - pkr->pk->selfsigversion < 4 ) - mask[0] |= (1<<1); /* MD5 is there for v3 keys with v3 - selfsigs when --pgp2 is on. */ + code will never even be called. Even if the hash wasn't + locked at MD5, we don't support sign+encrypt in --pgp2 + mode, and that's the only time PREFTYPE_HASH is used + anyway. -dms */ + + /* MD5 is there for v3 keys with v3 selfsigs when --pgp2 is + on. */ + if(PGP2 && pkr->pk->version<4 && pkr->pk->selfsigversion<4) + implicit=DIGEST_ALGO_MD5; else - mask[0] |= (1<<2); /* SHA1 is there for everyone else */ + implicit=DIGEST_ALGO_SHA1; + + break; + + case PREFTYPE_ZIP: + /* Uncompressed is always an option. */ + implicit=COMPRESS_ALGO_NONE; } - else if( preftype == PREFTYPE_ZIP ) - mask[0] |= (1<<0); /* Uncompressed is implicit */ - if (pkr->pk->user_id) /* selected by user ID */ - prefs = pkr->pk->user_id->prefs; - else - prefs = pkr->pk->prefs; + if (pkr->pk->user_id) /* selected by user ID */ + prefs = pkr->pk->user_id->prefs; + else + prefs = pkr->pk->prefs; - any = 0; - if( prefs ) { - for (i=0; prefs[i].type; i++ ) { - if( prefs[i].type == preftype ) { - mask[prefs[i].value/32] |= 1 << (prefs[i].value%32); - any = 1; + if( prefs ) + { + for (i=0; prefs[i].type; i++ ) + { + if( prefs[i].type == preftype ) + { + scores[prefs[i].value]+=rank; + mask[prefs[i].value/32] |= 1<<(prefs[i].value%32); + + rank++; + + /* We saw the implicit algorithm, so we don't need + tack it on the end ourselves. */ + if(implicit==prefs[i].value) + implicit=-1; } } } - if( (!prefs || !any) && preftype == PREFTYPE_ZIP ) { - mask[0] |= 3; /* asume no_compression and old pgp */ - compr_hack = 1; + if(rank==1 && preftype==PREFTYPE_ZIP) + { + /* If the compression preferences are not present, they are + assumed to be ZIP, Uncompressed (RFC4880:13.3.1) */ + scores[1]=1; /* ZIP is first choice */ + scores[0]=2; /* Uncompressed is second choice */ + mask[0]|=3; } -#if 0 - log_debug("pref mask=%08lX%08lX%08lX%08lX%08lX%08lX%08lX%08lX\n", - (ulong)mask[7], (ulong)mask[6], (ulong)mask[5], (ulong)mask[4], - (ulong)mask[3], (ulong)mask[2], (ulong)mask[1], (ulong)mask[0]); -#endif - for(i=0; i < 8; i++ ) - bits[i] &= mask[i]; -#if 0 - log_debug("pref bits=%08lX%08lX%08lX%08lX%08lX%08lX%08lX%08lX\n", - (ulong)bits[7], (ulong)bits[6], (ulong)bits[5], (ulong)bits[4], - (ulong)bits[3], (ulong)bits[2], (ulong)bits[1], (ulong)bits[0]); -#endif - } - /* usable algorithms are now in bits - * We now use the last key from pk_list to select - * the algorithm we want to use. there are no - * preferences for the last key, we select the one - * corresponding to first set bit. - */ - i = -1; - any = 0; - - /* Can we use the requested algorithm? */ - if(request>-1 && (bits[request/32] & (1<<(request%32))) && - algo_available(preftype,request,hint)) - return request; - - /* If we have personal prefs set, use them instead of the last key */ - if(preftype==PREFTYPE_SYM && opt.personal_cipher_prefs) - prefs=opt.personal_cipher_prefs; - else if(preftype==PREFTYPE_HASH && opt.personal_digest_prefs) - prefs=opt.personal_digest_prefs; - else if(preftype==PREFTYPE_ZIP && opt.personal_compress_prefs) - prefs=opt.personal_compress_prefs; - - if( prefs ) { - for(j=0; prefs[j].type; j++ ) { - if( prefs[j].type == preftype ) { - if( (bits[prefs[j].value/32] & (1<<(prefs[j].value%32))) ) { - if( algo_available( preftype, prefs[j].value, hint ) ) { - any = 1; - i = prefs[j].value; - break; - } - } - } + /* If the key didn't have the implicit algorithm listed + explicitly, add it here at the tail of the list. */ + if(implicit>-1) + { + scores[implicit]+=rank; + mask[implicit/32] |= 1<<(implicit%32); } - } - if( !prefs || !any ) { - for(j=0; j < 256; j++ ) - if( (bits[j/32] & (1<<(j%32))) ) { - if( algo_available( preftype, j, hint ) ) { - i = j; - break; - } - } + + for(i=0;i<8;i++) + bits[i]&=mask[i]; } -#if 0 - log_debug("prefs of type %d: selected %d\n", preftype, i ); -#endif - if( compr_hack && !i ) { - /* selected no compression, but we should check whether - * algorithm 1 is also available (the ordering is not relevant - * in this case). */ - if( bits[0] & (1<<1) ) - i = 1; /* yep; we can use compression algo 1 */ - } - - /* "If you are building an authentication system, the recipient - may specify a preferred signing algorithm. However, the signer - would be foolish to use a weak algorithm simply because the - recipient requests it." RFC2440:13. If we settle on MD5, and - SHA1 is also available, use SHA1 instead. Of course, if the - user intentionally chose MD5 (by putting it in their personal - prefs), then we should do what they say. */ + /* We've now scored all of the algorithms, and the usable ones have + bits set. Let's pick the winner. */ - if(preftype==PREFTYPE_HASH && - i==DIGEST_ALGO_MD5 && (bits[0] & (1<-1 && (bits[request/32] & (1<<(request%32))) && + algo_available(preftype,request,hint)) + result=request; + + if(result==-1) + { + /* If we have personal prefs set, use them. */ + prefs=NULL; + if(preftype==PREFTYPE_SYM && opt.personal_cipher_prefs) + prefs=opt.personal_cipher_prefs; + else if(preftype==PREFTYPE_HASH && opt.personal_digest_prefs) + prefs=opt.personal_digest_prefs; + else if(preftype==PREFTYPE_ZIP && opt.personal_compress_prefs) + prefs=opt.personal_compress_prefs; - if(opt.personal_digest_prefs) - for(j=0; prefs[j].type; j++ ) - if(opt.personal_digest_prefs[j].type==PREFTYPE_HASH && - opt.personal_digest_prefs[j].value==DIGEST_ALGO_MD5) + if( prefs ) + for(i=0; prefs[i].type; i++ ) + { + if(bits[prefs[i].value/32] & (1<<(prefs[i].value%32)) + && algo_available( preftype, prefs[i].value, hint)) { - i=DIGEST_ALGO_MD5; + result = prefs[i].value; break; } - } + } + } + + if(result==-1) + { + /* At this point, we have not selected an algorithm due to a + special request or via personal prefs. Pick the highest + ranked algorithm (i.e. the one with the lowest score). */ + + for(i=0;i<256;i++) + { + /* Note the '<' here. This means in case of a tie, we will + favor the lower algorithm number. We have a choice + between the lower number (probably an older algorithm + with more time in use), or the higher number (probably a + newer algorithm with less time in use). Older is + probably safer here, even though the newer algorithms + tend to be "stronger". */ + if(scores[i] && scores[i]. + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. */ #include diff -Nru gnupg-1.4.9/g10/revoke.c gnupg-1.4.10/g10/revoke.c --- gnupg-1.4.9/g10/revoke.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/revoke.c 2009-07-08 15:18:16.000000000 +0100 @@ -488,8 +488,6 @@ keyid_from_sk( sk, sk_keyid ); print_seckey_info (sk); - pk = xmalloc_clear( sizeof *pk ); - /* FIXME: We should get the public key direct from the secret one */ pub_keyblock=get_pubkeyblock(sk_keyid); diff -Nru gnupg-1.4.9/g10/sig-check.c gnupg-1.4.10/g10/sig-check.c --- gnupg-1.4.9/g10/sig-check.c 2007-12-03 14:27:41.000000000 +0000 +++ gnupg-1.4.10/g10/sig-check.c 2009-07-30 12:01:05.000000000 +0100 @@ -124,19 +124,31 @@ * and the timestamp, but the drawback of this is, that it is * not possible to sign more than one identical document within * one second. Some remote batch processing applications might - * like this feature here */ + * like this feature here. + * + * Note that before 1.4.10, we used RIPE-MD160 for the hash + * and accidently didn't include the timestamp and algorithm + * information in the hash. Given that this feature is not + * commonly used and that a replay attacks detection should + * not solely be based on this feature (because it does not + * work with RSA), we take the freedom and switch to SHA-1 + * with 1.4.10 to take advantage of hardware supported SHA-1 + * implementations and to match the 2.0.10 behaviour. We also + * include the missing information in the hash. Note also the + * SIG_ID as computed by gpg 1.x and gpg 2.x didn't matched + * either because 2.x used to print MPIs not in PGP format. */ MD_HANDLE md; u32 a = sig->timestamp; int i, nsig = pubkey_get_nsig( sig->pubkey_algo ); byte *p, *buffer; - md = md_open( DIGEST_ALGO_RMD160, 0); - md_putc( digest, sig->pubkey_algo ); - md_putc( digest, sig->digest_algo ); - md_putc( digest, (a >> 24) & 0xff ); - md_putc( digest, (a >> 16) & 0xff ); - md_putc( digest, (a >> 8) & 0xff ); - md_putc( digest, a & 0xff ); + md = md_open (DIGEST_ALGO_SHA1, 0); + md_putc (md, sig->pubkey_algo); + md_putc (md, sig->digest_algo); + md_putc (md, (a >> 24) & 0xff); + md_putc (md, (a >> 16) & 0xff); + md_putc (md, (a >> 8) & 0xff); + md_putc (md, a & 0xff); for(i=0; i < nsig; i++ ) { unsigned n = mpi_get_nbits( sig->data[i]); @@ -306,6 +318,12 @@ mpi_free(result); } + /* Print the MD5 warning if not yet done. Thus at most we get one + warning during signature checking. Note that while validating + a key we might have already checked MD5 key signatures. */ + if (sig->digest_algo == DIGEST_ALGO_MD5) + md5_digest_warn (0); + if( !rc && sig->flags.unknown_critical ) { log_info(_("assuming bad signature from key %s" @@ -427,6 +445,7 @@ hash_public_key(md,pk); rc=signature_check(sig,md); cache_sig_result(sig,rc); + md_close (md); break; } } diff -Nru gnupg-1.4.9/g10/signal.c gnupg-1.4.10/g10/signal.c --- gnupg-1.4.9/g10/signal.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/signal.c 2009-05-22 15:25:52.000000000 +0100 @@ -88,6 +88,7 @@ rl_free_line_state (); rl_cleanup_after_signal (); #endif + tty_cleanup_after_signal (); /* Better don't translate these messages. */ write(2, "\n", 1 ); diff -Nru gnupg-1.4.9/g10/sign.c gnupg-1.4.10/g10/sign.c --- gnupg-1.4.9/g10/sign.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/sign.c 2009-07-30 12:18:31.000000000 +0100 @@ -555,7 +555,7 @@ int overflow; if( !(tmpsize = iobuf_get_filelength(inp, &overflow)) - && !overflow ) + && !overflow && opt.verbose) log_info (_("WARNING: `%s' is an empty file\n"), fname); /* We can't encode the length of very large files because diff -Nru gnupg-1.4.9/g10/skclist.c gnupg-1.4.10/g10/skclist.c --- gnupg-1.4.9/g10/skclist.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/skclist.c 2009-05-11 09:33:52.000000000 +0100 @@ -154,7 +154,7 @@ */ if ( is_duplicated_entry ( locusr_orig, locusr ) ) { - log_error(_("skipped \"%s\": duplicated\n"), locusr->d ); + log_info (_("skipped \"%s\": duplicated\n"), locusr->d ); continue; } sk = xmalloc_clear( sizeof *sk ); diff -Nru gnupg-1.4.9/g10/tdbio.c gnupg-1.4.10/g10/tdbio.c --- gnupg-1.4.9/g10/tdbio.c 2007-10-23 08:50:34.000000000 +0100 +++ gnupg-1.4.10/g10/tdbio.c 2009-07-23 07:47:35.000000000 +0100 @@ -592,8 +592,9 @@ db_fd = open (db_name, O_RDWR | MY_O_BINARY ); if (db_fd == -1 && (errno == EACCES #ifdef EROFS - || errno == EROFS) + || errno == EROFS #endif + ) ) { db_fd = open (db_name, O_RDONLY | MY_O_BINARY ); if (db_fd != -1) @@ -1006,8 +1007,8 @@ */ static int lookup_hashtable( ulong table, const byte *key, size_t keylen, - int (*cmpfnc)(void*, const TRUSTREC *), void *cmpdata, - TRUSTREC *rec ) + int (*cmpfnc)(const void*, const TRUSTREC *), + const void *cmpdata, TRUSTREC *rec ) { int rc; ulong hashrec, item; @@ -1463,10 +1464,10 @@ static int -cmp_trec_fpr ( void *fpr, const TRUSTREC *rec ) +cmp_trec_fpr (const void *fpr, const TRUSTREC *rec ) { - return rec->rectype == RECTYPE_TRUST - && !memcmp( rec->r.trust.fingerprint, fpr, 20); + return (rec->rectype == RECTYPE_TRUST + && !memcmp( rec->r.trust.fingerprint, fpr, 20)); } @@ -1475,9 +1476,9 @@ { int rc; - /* locate the trust record using the hash table */ - rc = lookup_hashtable( get_trusthashrec(), fingerprint, 20, - cmp_trec_fpr, (void*)fingerprint, rec ); + /* Locate the trust record using the hash table. */ + rc = lookup_hashtable (get_trusthashrec(), fingerprint, 20, + cmp_trec_fpr, fingerprint, rec); return rc; } @@ -1498,9 +1499,9 @@ void tdbio_invalid(void) { - log_error(_( - "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n") ); - g10_exit(2); + log_error (_("Error: The trustdb is corrupted.\n")); + how_to_fix_the_trustdb (); + g10_exit (2); } /* diff -Nru gnupg-1.4.9/g10/trustdb.c gnupg-1.4.10/g10/trustdb.c --- gnupg-1.4.9/g10/trustdb.c 2007-12-12 18:12:30.000000000 +0000 +++ gnupg-1.4.10/g10/trustdb.c 2009-07-23 07:48:05.000000000 +0100 @@ -1,6 +1,6 @@ /* trustdb.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -412,6 +412,27 @@ } void +how_to_fix_the_trustdb () +{ + const char *name = trustdb_args.dbname; + + if (!name) + name = "trustdb.gpg"; + + log_info (_("You may try to re-create the trustdb using the commands:\n")); + log_info (" cd %s\n", default_homedir ()); + log_info (" gpg2 --export-ownertrust > otrust.tmp\n"); +#ifdef HAVE_W32_SYSTEM + log_info (" del %s\n", name); +#else + log_info (" rm %s\n", name); +#endif + log_info (" gpg2 --import-ownertrust < otrust.tmp\n"); + log_info (_("If that does not work, please consult the manual\n")); +} + + +void init_trustdb() { int level = trustdb_args.level; @@ -1933,50 +1954,72 @@ (uidnode && check_regexp(kr->trust_regexp, uidnode->pkt->pkt.user_id->name)))) { - if(DBG_TRUST && opt.trust_model==TM_PGP && sig->trust_depth) - log_debug("trust sig on %s, sig depth is %d, kr depth is %d\n", - uidnode->pkt->pkt.user_id->name,sig->trust_depth, - kr->trust_depth); - /* Are we part of a trust sig chain? We always favor the latest trust sig, rather than the greater or lesser trust sig or value. I could make a decent argument for any of these cases, but this seems to be what PGP does, and I'd like to be compatible. -dms */ - if(opt.trust_model==TM_PGP && sig->trust_depth - && pk->trust_timestamp<=sig->timestamp - && (sig->trust_depth<=kr->trust_depth - || kr->ownertrust==TRUST_ULTIMATE)) + if(opt.trust_model==TM_PGP + && sig->trust_depth + && pk->trust_timestamp<=sig->timestamp) { - /* If we got here, we know that: + byte depth; - this is a trust sig. + /* If the depth on the signature is less than the + chain currently has, then use the signature depth + so we don't increase the depth beyond what the + signer wanted. If the depth on the signature is + more than the chain currently has, then use the + chain depth so we use as much of the signature + depth as the chain will permit. An ultimately + trusted signature can restart the depth to + whatever level it likes. */ + + if(sig->trust_depthtrust_depth + || kr->ownertrust==TRUST_ULTIMATE) + depth=sig->trust_depth; + else + depth=kr->trust_depth; - it's a newer trust sig than any previous trust - sig on this key (not uid). - - it is legal in that it was either generated by an - ultimate key, or a key that was part of a trust - chain, and the depth does not violate the - original trust sig. - - if there is a regexp attached, it matched - successfully. - */ - - if(DBG_TRUST) - log_debug("replacing trust value %d with %d and " - "depth %d with %d\n", - pk->trust_value,sig->trust_value, - pk->trust_depth,sig->trust_depth); - - pk->trust_value=sig->trust_value; - pk->trust_depth=sig->trust_depth-1; - - /* If the trust sig contains a regexp, record it - on the pk for the next round. */ - if(sig->trust_regexp) - pk->trust_regexp=sig->trust_regexp; + if(depth) + { + if(DBG_TRUST) + log_debug("trust sig on %s, sig depth is %d," + " kr depth is %d\n", + uidnode->pkt->pkt.user_id->name, + sig->trust_depth, + kr->trust_depth); + + /* If we got here, we know that: + + this is a trust sig. + + it's a newer trust sig than any previous trust + sig on this key (not uid). + + it is legal in that it was either generated by an + ultimate key, or a key that was part of a trust + chain, and the depth does not violate the + original trust sig. + + if there is a regexp attached, it matched + successfully. + */ + + if(DBG_TRUST) + log_debug("replacing trust value %d with %d and " + "depth %d with %d\n", + pk->trust_value,sig->trust_value, + pk->trust_depth,depth); + + pk->trust_value=sig->trust_value; + pk->trust_depth=depth-1; + + /* If the trust sig contains a regexp, record it + on the pk for the next round. */ + if(sig->trust_regexp) + pk->trust_regexp=sig->trust_regexp; + } } if (kr->ownertrust == TRUST_ULTIMATE) diff -Nru gnupg-1.4.9/g10/trustdb.h gnupg-1.4.10/g10/trustdb.h --- gnupg-1.4.9/g10/trustdb.h 2007-10-23 08:50:35.000000000 +0100 +++ gnupg-1.4.10/g10/trustdb.h 2009-07-23 07:49:46.000000000 +0100 @@ -45,6 +45,7 @@ void check_trustdb (void); void update_trustdb (void); int setup_trustdb( int level, const char *dbname ); +void how_to_fix_the_trustdb (void); void init_trustdb( void ); void check_trustdb_stale(void); void sync_trustdb( void ); diff -Nru gnupg-1.4.9/gnupg.spec gnupg-1.4.10/gnupg.spec --- gnupg-1.4.9/gnupg.spec 2008-03-26 17:34:13.000000000 +0000 +++ gnupg-1.4.10/gnupg.spec 2009-09-02 17:21:13.000000000 +0100 @@ -2,7 +2,7 @@ # gnupg -- gnu privacy guard # This is a template. The dist target uses it to create the real file. # -%define version 1.4.9 +%define version 1.4.10 %define name gnupg Summary: GNU Utility for data encryption and digital signatures Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati. diff -Nru gnupg-1.4.9/include/ChangeLog gnupg-1.4.10/include/ChangeLog --- gnupg-1.4.9/include/ChangeLog 2007-12-03 14:27:42.000000000 +0000 +++ gnupg-1.4.10/include/ChangeLog 2009-08-25 19:46:16.000000000 +0100 @@ -1,3 +1,41 @@ +2009-08-25 Werner Koch + + * compat.h: Add xstrconcat. + +2009-08-11 David Shaw + + * util.h: Add string_to_utf8() from GPA. + +2009-07-21 Werner Koch + + * estream-printf.h: New. Taken from libestream.x + +2009-07-20 Werner Koch + + * types.h (strlist_t): Add new alias for STRLIST. + + * memory.h (xtrymalloc,xtrystrdup): New. + + * util.h: Add prototypes for util/convert.c. + +2009-05-26 David Shaw + + * http.h: Pass in a STRLIST for additional headers on http_open + and http_open_document. + +2009-04-05 David Shaw + + * srv.h: Move from util/srv.h. + +2009-04-02 David Shaw + + * http.h: Allow passing srvtag to http_open and + http_open_document. + +2008-04-17 David Shaw + + * cipher.h: Add the 192-bit variant of Camellia. + 2007-11-29 David Shaw * cipher.h: Add the 128-bit variant of Camellia. diff -Nru gnupg-1.4.9/include/cipher.h gnupg-1.4.10/include/cipher.h --- gnupg-1.4.9/include/cipher.h 2007-12-03 14:27:42.000000000 +0000 +++ gnupg-1.4.10/include/cipher.h 2008-12-11 16:39:58.000000000 +0000 @@ -1,6 +1,6 @@ /* cipher.h - * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, + * 2008 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -37,7 +37,8 @@ #define CIPHER_ALGO_AES256 9 #define CIPHER_ALGO_TWOFISH 10 /* twofish 256 bit */ #define CIPHER_ALGO_CAMELLIA128 11 -#define CIPHER_ALGO_CAMELLIA256 12 +#define CIPHER_ALGO_CAMELLIA192 12 +#define CIPHER_ALGO_CAMELLIA256 13 #define CIPHER_ALGO_DUMMY 110 /* no encryption at all */ diff -Nru gnupg-1.4.9/include/compat.h gnupg-1.4.10/include/compat.h --- gnupg-1.4.9/include/compat.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/compat.h 2009-08-25 19:46:37.000000000 +0100 @@ -15,4 +15,11 @@ char *strsep (char **stringp, const char *delim); #endif +#if __GNUC__ >= 4 +char *xstrconcat (const char *s1, ...) __attribute__ ((sentinel(0))); +#else +char *xstrconcat (const char *s1, ...); +#endif + + #endif /* !_COMPAT_H_ */ diff -Nru gnupg-1.4.9/include/distfiles gnupg-1.4.10/include/distfiles --- gnupg-1.4.9/include/distfiles 2006-10-02 13:07:22.000000000 +0100 +++ gnupg-1.4.10/include/distfiles 2009-07-21 13:45:01.000000000 +0100 @@ -14,5 +14,7 @@ dynload.h assuan.h compat.h +srv.h +estream-printf.h ChangeLog diff -Nru gnupg-1.4.9/include/estream-printf.h gnupg-1.4.10/include/estream-printf.h --- gnupg-1.4.9/include/estream-printf.h 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/include/estream-printf.h 2009-07-21 13:34:12.000000000 +0100 @@ -0,0 +1,110 @@ +/* estream-printf.h - Versatile C-99 compliant printf formatting. + * Copyright (C) 2007 g10 Code GmbH + * + * This file is part of Libestream. + * + * Libestream 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. + * + * Libestream is distributed in the hope that 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 Libestream; if not, see . + */ + +#ifndef ESTREAM_PRINTF_H +#define ESTREAM_PRINTF_H + +#include +#include + +/* To use this file with libraries the following macro is useful: + + #define _ESTREAM_EXT_SYM_PREFIX _foo_ + + This prefixes all external symbols with "_foo_". + + For the implementation of the code (estream-printf.c) the following + macros may be used to tune the implementation for certain systems: + + #define _ESTREAM_PRINTF_MALLOC foo_malloc + #define _ESTREAM_PRINTF_FREE foo_free + + Make estream_asprintf and estream_vasprintf use foo_malloc and + foo_free instead of the standard malloc and free functions to + allocate the memory returned to the caller. + + #define _ESTREAM_PRINTF_EXTRA_INCLUDE "foo.h" + + This includes the file "foo.h" which may provide prototypes for + the custom memory allocation functions. + */ + + +#ifdef _ESTREAM_EXT_SYM_PREFIX +#ifndef _ESTREAM_PREFIX +#define _ESTREAM_PREFIX1(x,y) x ## y +#define _ESTREAM_PREFIX2(x,y) _ESTREAM_PREFIX1(x,y) +#define _ESTREAM_PREFIX(x) _ESTREAM_PREFIX2(_ESTREAM_EXT_SYM_PREFIX,x) +#endif /*_ESTREAM_PREFIX*/ +#define estream_printf_out_t _ESTREAM_PREFIX(estream_printf_out_t) +#define estream_format _ESTREAM_PREFIX(estream_format) +#define estream_printf _ESTREAM_PREFIX(estream_printf) +#define estream_fprintf _ESTREAM_PREFIX(estream_fprintf) +#define estream_vfprintf _ESTREAM_PREFIX(estream_vfprintf) +#define estream_snprintf _ESTREAM_PREFIX(estream_snprintf) +#define estream_vsnprintf _ESTREAM_PREFIX(estream_vsnprintf) +#define estream_asprintf _ESTREAM_PREFIX(estream_asprintf) +#define estream_vasprintf _ESTREAM_PREFIX(estream_vasprintf) +#endif /*_ESTREAM_EXT_SYM_PREFIX*/ + +#ifndef _ESTREAM_GCC_A_PRINTF +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) +# define _ESTREAM_GCC_A_PRINTF( f, a ) __attribute__ ((format (printf,f,a))) +#else +# define _ESTREAM_GCC_A_PRINTF( f, a ) +#endif +#endif /*_ESTREAM_GCC_A_PRINTF*/ + + +#ifdef __cplusplus +extern "C" +{ +#if 0 +} +#endif +#endif + + +typedef int (*estream_printf_out_t) + (void *outfncarg, const char *buf, size_t buflen); + +int estream_format (estream_printf_out_t outfnc, void *outfncarg, + const char *format, va_list vaargs) + _ESTREAM_GCC_A_PRINTF(3,0); +int estream_printf (const char *format, ...) + _ESTREAM_GCC_A_PRINTF(1,2); +int estream_fprintf (FILE *fp, const char *format, ... ) + _ESTREAM_GCC_A_PRINTF(2,3); +int estream_vfprintf (FILE *fp, const char *format, va_list arg_ptr) + _ESTREAM_GCC_A_PRINTF(2,0); +int estream_snprintf (char *buf, size_t bufsize, const char *format, ...) + _ESTREAM_GCC_A_PRINTF(3,4); +int estream_vsnprintf (char *buf,size_t bufsize, + const char *format, va_list arg_ptr) + _ESTREAM_GCC_A_PRINTF(3,0); +int estream_asprintf (char **bufp, const char *format, ...) + _ESTREAM_GCC_A_PRINTF(2,3); +int estream_vasprintf (char **bufp, const char *format, va_list arg_ptr) + _ESTREAM_GCC_A_PRINTF(2,0); + + +#ifdef __cplusplus +} +#endif +#endif /*ESTREAM_PRINTF_H*/ diff -Nru gnupg-1.4.9/include/http.h gnupg-1.4.10/include/http.h --- gnupg-1.4.9/include/http.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/http.h 2009-07-08 15:18:15.000000000 +0100 @@ -1,6 +1,6 @@ /* http.h - HTTP protocol handler - * Copyright (C) 1999, 2000, 2001, 2003, 2004, - * 2005 Free Software Foundation, Inc. + * Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -54,8 +54,7 @@ /* put flag values into an enum, so that gdb can display them */ enum { - HTTP_FLAG_NO_SHUTDOWN = 1, - HTTP_FLAG_TRY_SRV = 2 + HTTP_FLAG_NO_SHUTDOWN = 1 }; struct http_context { @@ -75,11 +74,13 @@ typedef struct http_context *HTTP_HD; int http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, - char *auth, unsigned int flags, const char *proxy ); + char *auth, unsigned int flags, const char *proxy, + const char *srvtag, STRLIST headers ); void http_start_data( HTTP_HD hd ); int http_wait_response( HTTP_HD hd, unsigned int *ret_status ); void http_close( HTTP_HD hd ); int http_open_document( HTTP_HD hd, const char *document, char *auth, - unsigned int flags, const char *proxy ); + unsigned int flags, const char *proxy, + const char *srvtag, STRLIST headers ); #endif /*G10_HTTP_H*/ diff -Nru gnupg-1.4.9/include/memory.h gnupg-1.4.10/include/memory.h --- gnupg-1.4.9/include/memory.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/memory.h 2009-07-20 09:40:05.000000000 +0100 @@ -30,6 +30,7 @@ #define M_DBGINFO(a) "["__FILE__ ":" STR(a) "]" #endif /* __riscos__ */ #define xmalloc(n) m_debug_alloc((n), M_DBGINFO( __LINE__ ) ) +#define xtrymalloc(n) m_debug_trymalloc ((n), M_DBGINFO( __LINE__ )) #define xmalloc_clear(n) m_debug_alloc_clear((n), M_DBGINFO(__LINE__) ) #define xmalloc_secure(n) m_debug_alloc_secure(n), M_DBGINFO(__LINE__) ) #define xmalloc_secure_clear(n) m_debug_alloc_secure_clear((n), M_DBGINFO(__LINE__) ) @@ -38,8 +39,10 @@ #define m_check(n) m_debug_check((n), M_DBGINFO(__LINE__) ) /*#define m_copy(a) m_debug_copy((a), M_DBGINFO(__LINE__) )*/ #define xstrdup(a) m_debug_strdup((a), M_DBGINFO(__LINE__) ) +#define xtrystrdup(a) m_debug_trystrdup((a), M_DBGINFO(__LINE__) ) void *m_debug_alloc( size_t n, const char *info ); +void *m_debug_trymalloc (size_t n, const char *info); void *m_debug_alloc_clear( size_t n, const char *info ); void *m_debug_alloc_secure( size_t n, const char *info ); void *m_debug_alloc_secure_clear( size_t n, const char *info ); @@ -48,9 +51,11 @@ void m_debug_check( const void *a, const char *info ); /*void *m_debug_copy( const void *a, const char *info );*/ char *m_debug_strdup( const char *a, const char *info ); +char *m_debug_trystrdup (const char *a, const char *info); #else void *xmalloc( size_t n ); +void *xtrymalloc (size_t n); void *xmalloc_clear( size_t n ); void *xmalloc_secure( size_t n ); void *xmalloc_secure_clear( size_t n ); @@ -59,6 +64,7 @@ void m_check( const void *a ); /*void *m_copy( const void *a );*/ char *xstrdup( const char * a); +char *xtrystrdup (const char *a); #endif size_t m_size( const void *a ); diff -Nru gnupg-1.4.9/include/srv.h gnupg-1.4.10/include/srv.h --- gnupg-1.4.9/include/srv.h 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/include/srv.h 2009-05-05 09:11:03.000000000 +0100 @@ -0,0 +1,49 @@ +/* srv.h + * Copyright (C) 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 3 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, see . + */ + +#ifndef _SRV_H_ +#define _SRV_H_ + +#ifdef USE_DNS_SRV +#ifdef _WIN32 +#include +#else +#include +#include +#include +#endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ +#include "types.h" + +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +struct srventry +{ + u16 priority; + u16 weight; + u16 port; + int run_count; + char target[MAXDNAME]; +}; + +int getsrv(const char *name,struct srventry **list); + +#endif /* !_SRV_H_ */ diff -Nru gnupg-1.4.9/include/ttyio.h gnupg-1.4.10/include/ttyio.h --- gnupg-1.4.9/include/ttyio.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/ttyio.h 2009-05-22 15:26:58.000000000 +0100 @@ -53,5 +53,6 @@ #define tty_enable_completion(x) #define tty_disable_completion() #endif +void tty_cleanup_after_signal (void); #endif /*G10_TTYIO_H*/ diff -Nru gnupg-1.4.9/include/types.h gnupg-1.4.10/include/types.h --- gnupg-1.4.9/include/types.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/types.h 2009-07-20 10:02:46.000000000 +0100 @@ -131,10 +131,12 @@ double g; } PROPERLY_ALIGNED_TYPE; -typedef struct string_list { +struct string_list { struct string_list *next; unsigned int flags; char d[1]; -} *STRLIST; +}; +typedef struct string_list *STRLIST; +typedef struct string_list *strlist_t; #endif /*G10_TYPES_H*/ diff -Nru gnupg-1.4.9/include/util.h gnupg-1.4.10/include/util.h --- gnupg-1.4.9/include/util.h 2007-10-23 09:47:28.000000000 +0100 +++ gnupg-1.4.10/include/util.h 2009-08-13 08:07:18.000000000 +0100 @@ -149,6 +149,7 @@ /*-- miscutil.c --*/ u32 make_timestamp(void); u32 scan_isodatestr( const char *string ); +u32 isotime2seconds (const char *string); const char *strtimevalue( u32 stamp ); const char *strtimestamp( u32 stamp ); /* GMT */ const char *isotimestamp( u32 stamp ); /* GMT with hh:mm:ss */ @@ -189,7 +190,7 @@ const char* get_native_charset(void); char *native_to_utf8( const char *string ); char *utf8_to_native( const char *string, size_t length, int delim); -int check_utf8_string( const char *string ); +char *string_to_utf8 (const char *string); int ascii_isupper (int c); int ascii_islower (int c); @@ -239,11 +240,13 @@ int write_w32_registry_string(const char *root, const char *dir, const char *name, const char *value); -/*-- strgutil.c --*/ -int vasprintf (char **result, const char *format, va_list args); -int asprintf (char **buf, const char *fmt, ...); #endif /*_WIN32*/ +/*-- strgutil.c --*/ +char *xasprintf (const char *fmt, ...); +char *xtryasprintf (const char *fmt, ...); + + /*-- pka.c --*/ char *get_pka_info (const char *address, unsigned char *fpr); @@ -251,6 +254,16 @@ int get_cert(const char *name,size_t max_size,IOBUF *iobuf, unsigned char **fpr,size_t *fpr_len,char **url); +/*-- convert.c --*/ +int hex2bin (const char *string, void *buffer, size_t length); +int hexcolon2bin (const char *string, void *buffer, size_t length); +char *bin2hex (const void *buffer, size_t length, char *stringbuf); +char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf); +const char *hex2str (const char *hexstring, + char *buffer, size_t bufsize, size_t *buflen); +char *hex2str_alloc (const char *hexstring, size_t *r_count); + + /**** other missing stuff ****/ #ifndef HAVE_ATEXIT /* For SunOS */ #define atexit(a) (on_exit((a),0)) diff -Nru gnupg-1.4.9/keyserver/ChangeLog gnupg-1.4.10/keyserver/ChangeLog --- gnupg-1.4.9/keyserver/ChangeLog 2008-03-25 09:19:39.000000000 +0000 +++ gnupg-1.4.10/keyserver/ChangeLog 2009-09-02 16:21:19.000000000 +0100 @@ -1,3 +1,104 @@ +2009-09-02 Werner Koch + + * Makefile.am (gpgkeys_curl_SOURCES, gpgkeys_ldap_SOURCES) + (gpgkeys_finger_SOURCES): Add ksmalloc.c only with non-faked cURL. + +2009-08-25 Werner Koch + + * ksmalloc.c: New + (xtrymalloc, xfree): New. + * Makefile.am (gpgkeys_ldap_SOURCES, gpgkeys_curl_SOURCES): + (gpgkeys_hkp_SOURCES): Add ksmalloc.c. + * gpgkeys_hkp.c, gpgkeys_ldap.c: s/malloc/xtrymalloc/. + +2009-07-06 David Shaw + + * gpgkeys_hkp.c (main, srv_replace): Minor tweaks to use the + DNS-SD names ("pgpkey-http" and "pgpkey-https") in SRV lookups + instead of "hkp" and "hkps". + +2009-06-24 Werner Koch + + * gpgkeys_ldap.c (send_key): Do not loop over a NULL modlist in + fail. Reported by Fabian Keil. + +2009-06-09 David Shaw + + * Makefile.am (gpgkeys_hkp_LDADD): Need DNSLIBS for the resolver + now that we're using SRVs. + +2009-05-27 David Shaw + + * gpgkeys_hkp.c (srv_replace): Fix build warning. + +2009-05-26 David Shaw + + * curl-shim.c (curl_slist_append, curl_slist_free_all): New. + Simple wrappers around STRLIST to emulate the curl way of doing + string lists. + (curl_easy_setopt): Handle the curl HTTPHEADER option. + + * gpgkeys_curl.c, gpgkeys_hkp.c (main): Avoid caches to get the + most recent copy of the key. This is bug #1061. + +2009-05-03 David Shaw + + * gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather + than the ugly ?from= syntax. + +2009-04-20 David Shaw + + * gpgkeys_hkp.c (srv_replace): New function to transform a SRV + hostname to a real hostname. + (main): Call it from here for the HAVE_LIBCURL case (without + libcurl is handled via the curl-shim). + +2009-04-02 David Shaw + + * curl-shim.h, curl-shim.c (curl_easy_setopt, curl_easy_perform): + Add a CURLOPT_SRVTAG_GPG_HACK (passed through the the http + engine). + +2009-04-01 David Shaw + + * gpgkeys_hkp.c (main): Switch default port for SSLized HKP to + 443 (i.e. the regular https port). + +2009-02-03 David Shaw + + * gpgkeys_hkp.c (send_key, get_key, get_name, search_key, main): + Add support for SSLized HKP. + +2008-11-18 David Shaw + + * curl-shim.h, gpgkeys_curl.c, gpgkeys_hkp.c (main): Always show + curl version (even for curl-shim). + +2008-11-18 Werner Koch + + * gpgkeys_curl.c (main): Print curl version according to GNU standards. + * gpgkeys_hkp.c (main): Ditto. + * curl-shim.h (curl_is_gnupg_curl_shim): New. + +2008-11-18 David Shaw + + * curl-shim.h (curl_version): No need to provide a version for + curl-shim as it always matches the GnuPG version. + + * gpgkeys_curl.c, gpgkeys_hkp.c (main): Show which version of curl + we're using as part of --version. + + * gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_hkp.c, + gpgkeys_ldap.c (show_help): Document --version. + +2008-04-14 David Shaw + + * gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all + libcurl number options are passed as long. + + * curl-shim.c (curl_easy_setopt): Minor tweak to match the real + curl better - libcurl uses 'long', not 'unsigned int'. + 2008-03-25 Werner Koch * gpgkeys_ldap.c (build_attrs): Take care of char defaulting to diff -Nru gnupg-1.4.9/keyserver/curl-shim.c gnupg-1.4.10/keyserver/curl-shim.c --- gnupg-1.4.9/keyserver/curl-shim.c 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/curl-shim.c 2009-08-25 19:28:00.000000000 +0100 @@ -1,7 +1,7 @@ /* curl-shim.c - Implement a small subset of the curl API in terms of * the iobuf HTTP API * - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -129,20 +129,26 @@ curl->proxy=va_arg(ap,char *); break; case CURLOPT_POST: - curl->flags.post=va_arg(ap,unsigned int); + curl->flags.post=va_arg(ap,long)?1:0; break; case CURLOPT_POSTFIELDS: curl->postfields=va_arg(ap,char *); break; + case CURLOPT_SRVTAG_GPG_HACK: + curl->srvtag=va_arg(ap,char *); + break; case CURLOPT_FAILONERROR: - curl->flags.failonerror=va_arg(ap,unsigned int); + curl->flags.failonerror=va_arg(ap,long)?1:0; break; case CURLOPT_VERBOSE: - curl->flags.verbose=va_arg(ap,unsigned int); + curl->flags.verbose=va_arg(ap,long)?1:0; break; case CURLOPT_STDERR: curl->errors=va_arg(ap,FILE *); break; + case CURLOPT_HTTPHEADER: + curl->headers=va_arg(ap,struct curl_slist *); + break; default: /* We ignore the huge majority of curl options */ break; @@ -182,7 +188,8 @@ if(curl->flags.post) { - rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,curl->auth,0,proxy); + rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,curl->auth,0,proxy, + curl->srvtag,curl->headers?curl->headers->list:NULL); if(rc==0) { char content_len[50]; @@ -203,7 +210,8 @@ } else { - rc=http_open(&curl->hd,HTTP_REQ_GET,curl->url,curl->auth,0,proxy); + rc=http_open(&curl->hd,HTTP_REQ_GET,curl->url,curl->auth,0,proxy, + curl->srvtag,curl->headers?curl->headers->list:NULL); if(rc==0) { rc=http_wait_response(&curl->hd,&curl->status); @@ -280,7 +288,7 @@ else len=strlen(str); - enc=malloc(len+1); + enc = xtrymalloc(len+1); if(!enc) return enc; @@ -330,3 +338,28 @@ return &data; } + +struct curl_slist * +curl_slist_append(struct curl_slist *list,const char *string) +{ + if(!list) + { + list=calloc(1,sizeof(*list)); + if(!list) + return NULL; + } + + add_to_strlist(&list->list,string); + + return list; +} + +void +curl_slist_free_all(struct curl_slist *list) +{ + if(list) + { + free_strlist(list->list); + free(list); + } +} diff -Nru gnupg-1.4.9/keyserver/curl-shim.h gnupg-1.4.10/keyserver/curl-shim.h --- gnupg-1.4.9/keyserver/curl-shim.h 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/curl-shim.h 2009-07-08 15:18:16.000000000 +0100 @@ -1,5 +1,5 @@ /* curl-shim.h - * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -48,7 +48,9 @@ CURLOPT_CAINFO, CURLOPT_POST, CURLOPT_POSTFIELDS, - CURLOPT_FAILONERROR + CURLOPT_FAILONERROR, + CURLOPT_HTTPHEADER, + CURLOPT_SRVTAG_GPG_HACK } CURLoption; typedef size_t (*write_func)(char *buffer,size_t size, @@ -63,8 +65,10 @@ write_func writer; void *file; char *postfields; + char *srvtag; unsigned int status; FILE *errors; + struct curl_slist *headers; struct { unsigned int post:1; @@ -91,7 +95,16 @@ void curl_easy_cleanup(CURL *curl); char *curl_easy_escape(CURL *curl,char *str,int len); #define curl_free(x) free(x) -#define curl_version() "GnuPG curl-shim "VERSION +#define curl_version() "GnuPG curl-shim" curl_version_info_data *curl_version_info(int type); +struct curl_slist +{ + STRLIST list; +}; + +struct curl_slist *curl_slist_append(struct curl_slist *list, + const char *string); +void curl_slist_free_all(struct curl_slist *list); + #endif /* !_CURL_SHIM_H_ */ diff -Nru gnupg-1.4.9/keyserver/gpgkeys_curl.c gnupg-1.4.10/keyserver/gpgkeys_curl.c --- gnupg-1.4.9/keyserver/gpgkeys_curl.c 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/gpgkeys_curl.c 2009-07-08 15:18:16.000000000 +0100 @@ -1,5 +1,5 @@ /* gpgkeys_curl.c - fetch a key via libcurl - * Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -103,9 +103,10 @@ static void show_help (FILE *fp) { - fprintf (fp,"-h\thelp\n"); - fprintf (fp,"-V\tversion\n"); - fprintf (fp,"-o\toutput to this file\n"); + fprintf (fp,"-h, --help\thelp\n"); + fprintf (fp,"-V\t\tmachine readable version\n"); + fprintf (fp,"--version\thuman readable version\n"); + fprintf (fp,"-o\t\toutput to this file\n"); } int @@ -117,13 +118,15 @@ long follow_redirects=5; char *proxy=NULL; curl_version_info_data *curldata; + struct curl_slist *headers=NULL; console=stderr; /* Kludge to implement standard GNU options. */ if (argc > 1 && !strcmp (argv[1], "--version")) { - fputs ("gpgkeys_curl (GnuPG) " VERSION"\n", stdout); + printf ("gpgkeys_curl (GnuPG) %s\n", VERSION); + printf ("Uses: %s\n", curl_version()); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) @@ -286,7 +289,7 @@ if(follow_redirects) { - curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1); + curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L); if(follow_redirects>0) curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); } @@ -298,12 +301,32 @@ { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); } - curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); + /* Avoid caches to get the most recent copy of the key. This is bug + #1061. In pre-curl versions of the code, we didn't do it. Then + we did do it (as a curl default) until curl changed the default. + Now we're doing it again, but in such a way that changing + defaults in the future won't impact us. We set both the Pragma + and Cache-Control versions of the header, so we're good with both + HTTP 1.0 and 1.1. */ + headers=curl_slist_append(headers,"Pragma: no-cache"); + if(headers) + headers=curl_slist_append(headers,"Cache-Control: no-cache"); + + if(!headers) + { + fprintf(console,"gpgkeys: out of memory when building HTTP headers\n"); + ret=KEYSERVER_NO_MEMORY; + goto fail; + } + + curl_easy_setopt(curl,CURLOPT_HTTPHEADER,headers); + if(proxy) curl_easy_setopt(curl,CURLOPT_PROXY,proxy); @@ -384,6 +407,8 @@ free_ks_options(opt); + curl_slist_free_all(headers); + if(curl) curl_easy_cleanup(curl); diff -Nru gnupg-1.4.9/keyserver/gpgkeys_finger.c gnupg-1.4.10/keyserver/gpgkeys_finger.c --- gnupg-1.4.9/keyserver/gpgkeys_finger.c 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/gpgkeys_finger.c 2009-08-25 19:41:35.000000000 +0100 @@ -352,9 +352,10 @@ static void show_help (FILE *fp) { - fprintf (fp,"-h\thelp\n"); - fprintf (fp,"-V\tversion\n"); - fprintf (fp,"-o\toutput to this file\n"); + fprintf (fp,"-h, --help\thelp\n"); + fprintf (fp,"-V\t\tmachine readable version\n"); + fprintf (fp,"--version\thuman readable version\n"); + fprintf (fp,"-o\t\toutput to this file\n"); } int diff -Nru gnupg-1.4.9/keyserver/gpgkeys_hkp.c gnupg-1.4.10/keyserver/gpgkeys_hkp.c --- gnupg-1.4.9/keyserver/gpgkeys_hkp.c 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/gpgkeys_hkp.c 2009-08-25 19:41:27.000000000 +0100 @@ -1,6 +1,6 @@ /* gpgkeys_hkp.c - talk to an HKP keyserver - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, - * 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -43,6 +43,9 @@ #else #include "curl-shim.h" #endif +#ifdef USE_DNS_SRV +#include "srv.h" +#endif #include "compat.h" #include "keyserver.h" #include "ksutil.h" @@ -54,6 +57,7 @@ static CURL *curl; static struct ks_options *opt; static char errorbuffer[CURL_ERROR_SIZE]; +static char *proto,*port; static size_t curl_mrindex_writer(const void *ptr,size_t size,size_t nmemb,void *stream) @@ -102,7 +106,7 @@ char *key=NULL,*encoded_key=NULL; size_t keysize=1; - key=malloc(1); + key = xtrymalloc(1); if(!key) { fprintf(console,"gpgkeys: unable to allocate memory for key\n"); @@ -175,7 +179,7 @@ free(key); - key=malloc(8+strlen(encoded_key)+1); + key=xtrymalloc(8+strlen(encoded_key)+1); if(!key) { fprintf(console,"gpgkeys: out of memory\n"); @@ -186,13 +190,11 @@ strcpy(key,"keytext="); strcat(key,encoded_key); - strcpy(request,"http://"); + strcpy(request,proto); + strcat(request,"://"); strcat(request,opt->host); strcat(request,":"); - if(opt->port) - strcat(request,opt->port); - else - strcat(request,"11371"); + strcat(request,port); strcat(request,opt->path); /* request is MAX_URL+15 bytes long - MAX_URL covers the whole URL, including any supplied path. The 15 covers /pks/add. */ @@ -202,9 +204,9 @@ fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request); curl_easy_setopt(curl,CURLOPT_URL,request); - curl_easy_setopt(curl,CURLOPT_POST,1); + curl_easy_setopt(curl,CURLOPT_POST,1L); curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key); - curl_easy_setopt(curl,CURLOPT_FAILONERROR,1); + curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L); res=curl_easy_perform(curl); if(res!=0) @@ -253,13 +255,11 @@ return KEYSERVER_NOT_SUPPORTED; } - strcpy(request,"http://"); + strcpy(request,proto); + strcat(request,"://"); strcat(request,opt->host); strcat(request,":"); - if(opt->port) - strcat(request,opt->port); - else - strcat(request,"11371"); + strcat(request,port); strcat(request,opt->path); /* request is MAX_URL+55 bytes long - MAX_URL covers the whole URL, including any supplied path. The 60 overcovers this /pks/... etc @@ -324,7 +324,7 @@ goto fail; } - request=malloc(MAX_URL+60+strlen(searchkey_encoded)); + request=xtrymalloc(MAX_URL+60+strlen(searchkey_encoded)); if(!request) { fprintf(console,"gpgkeys: out of memory\n"); @@ -334,13 +334,11 @@ fprintf(output,"NAME %s BEGIN\n",getkey); - strcpy(request,"http://"); + strcpy(request,proto); + strcat(request,"://"); strcat(request,opt->host); strcat(request,":"); - if(opt->port) - strcat(request,opt->port); - else - strcat(request,"11371"); + strcat(request,port); strcat(request,opt->path); append_path(request,"/pks/lookup?op=get&options=mr&search="); strcat(request,searchkey_encoded); @@ -410,7 +408,7 @@ goto fail; } - request=malloc(MAX_URL+60+strlen(searchkey_encoded)); + request=xtrymalloc(MAX_URL+60+strlen(searchkey_encoded)); if(!request) { fprintf(console,"gpgkeys: out of memory\n"); @@ -420,13 +418,11 @@ fprintf(output,"SEARCH %s BEGIN\n",searchkey); - strcpy(request,"http://"); + strcpy(request,proto); + strcat(request,"://"); strcat(request,opt->host); strcat(request,":"); - if(opt->port) - strcat(request,opt->port); - else - strcat(request,"11371"); + strcat(request,port); strcat(request,opt->path); append_path(request,"/pks/lookup?op=index&options=mr&search="); @@ -494,29 +490,80 @@ } } +#ifdef HAVE_LIBCURL +/* If there is a SRV record, take the highest ranked possibility. + This is a hack, as we don't proceed downwards. */ +static void +srv_replace(const char *srvtag) +{ +#ifdef USE_DNS_SRV + struct srventry *srvlist=NULL; + int srvcount; + + if(!srvtag) + return; + + if(1+strlen(srvtag)+6+strlen(opt->host)+1<=MAXDNAME) + { + char srvname[MAXDNAME]; + + strcpy(srvname,"_"); + strcat(srvname,srvtag); + strcat(srvname,"._tcp."); + strcat(srvname,opt->host); + srvcount=getsrv(srvname,&srvlist); + } + + if(srvlist) + { + char *newname,*newport; + + newname=strdup(srvlist->target); + newport=xtrymalloc(MAX_PORT); + if(newname && newport) + { + free(opt->host); + free(opt->port); + opt->host=newname; + snprintf(newport,MAX_PORT,"%u",srvlist->port); + opt->port=newport; + } + else + { + free(newname); + free(newport); + } + } +#endif +} +#endif + static void show_help (FILE *fp) { - fprintf (fp,"-h\thelp\n"); - fprintf (fp,"-V\tversion\n"); - fprintf (fp,"-o\toutput to this file\n"); + fprintf (fp,"-h, --help\thelp\n"); + fprintf (fp,"-V\t\tmachine readable version\n"); + fprintf (fp,"--version\thuman readable version\n"); + fprintf (fp,"-o\t\toutput to this file\n"); } int main(int argc,char *argv[]) { - int arg,ret=KEYSERVER_INTERNAL_ERROR; + int arg,ret=KEYSERVER_INTERNAL_ERROR,try_srv=1; char line[MAX_LINE]; int failed=0; struct keylist *keylist=NULL,*keyptr=NULL; char *proxy=NULL; + struct curl_slist *headers=NULL; console=stderr; /* Kludge to implement standard GNU options. */ if (argc > 1 && !strcmp (argv[1], "--version")) { - fputs ("gpgkeys_hkp (GnuPG) " VERSION"\n", stdout); + printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION); + printf ("Uses: %s\n", curl_version()); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) @@ -618,19 +665,37 @@ } } } -#if 0 else if(ascii_strcasecmp(start,"try-dns-srv")==0) { if(no) - http_flags&=~HTTP_FLAG_TRY_SRV; + try_srv=0; else - http_flags|=HTTP_FLAG_TRY_SRV; + try_srv=1; } -#endif + continue; } } + + if(!opt->scheme) + { + fprintf(console,"gpgkeys: no scheme supplied!\n"); + ret=KEYSERVER_SCHEME_NOT_FOUND; + goto fail; + } + + if(ascii_strcasecmp(opt->scheme,"hkps")==0) + { + proto="https"; + port="443"; + } + else + { + proto="http"; + port="11371"; + } + if(!opt->host) { fprintf(console,"gpgkeys: no keyserver host provided\n"); @@ -652,6 +717,35 @@ goto fail; } + /* If the user gives a :port, then disable SRV. The semantics of a + specified port and SRV do not play well together. */ + if(opt->port) + port=opt->port; + else if(try_srv) + { + char *srvtag; + + if(ascii_strcasecmp(opt->scheme,"hkp")==0) + srvtag="pgpkey-http"; + else if(ascii_strcasecmp(opt->scheme,"hkps")==0) + srvtag="pgpkey-https"; + else + srvtag=NULL; + +#ifdef HAVE_LIBCURL + /* We're using libcurl, so fake SRV support via our wrapper. + This isn't as good as true SRV support, as we do not try all + possible targets at one particular level and work our way + down the list, but it's better than nothing. */ + srv_replace(srvtag); +#else + /* We're using our internal curl shim, so we can use its (true) + SRV support. Obviously, CURLOPT_SRVTAG_GPG_HACK isn't a real + libcurl option. It's specific to our shim. */ + curl_easy_setopt(curl,CURLOPT_SRVTAG_GPG_HACK,srvtag); +#endif + } + curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); if(opt->auth) @@ -661,19 +755,35 @@ { fprintf(console,"gpgkeys: curl version = %s\n",curl_version()); curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); + curl_easy_setopt(curl,CURLOPT_VERBOSE,1L); + } + + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); + curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); + + /* Avoid caches to get the most recent copy of the key. This is bug + #1061. In pre-curl versions of the code, we didn't do it. Then + we did do it (as a curl default) until curl changed the default. + Now we're doing it again, but in such a way that changing + defaults in the future won't impact us. We set both the Pragma + and Cache-Control versions of the header, so we're good with both + HTTP 1.0 and 1.1. */ + headers=curl_slist_append(headers,"Pragma: no-cache"); + if(headers) + headers=curl_slist_append(headers,"Cache-Control: no-cache"); + + if(!headers) + { + fprintf(console,"gpgkeys: out of memory when building HTTP headers\n"); + ret=KEYSERVER_NO_MEMORY; + goto fail; } + curl_easy_setopt(curl,CURLOPT_HTTPHEADER,headers); + if(proxy) curl_easy_setopt(curl,CURLOPT_PROXY,proxy); -#if 0 - /* By suggested convention, if the user gives a :port, then disable - SRV. */ - if(opt->port) - http_flags&=~HTTP_FLAG_TRY_SRV; -#endif - /* 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. */ @@ -693,7 +803,7 @@ if(line[0]=='\n' || line[0]=='\0') break; - work=malloc(sizeof(struct keylist)); + work=xtrymalloc(sizeof(struct keylist)); if(work==NULL) { fprintf(console,"gpgkeys: out of memory while " @@ -799,7 +909,7 @@ keyptr=keyptr->next; } - searchkey=malloc(len+1); + searchkey=xtrymalloc(len+1); if(searchkey==NULL) { ret=KEYSERVER_NO_MEMORY; @@ -848,6 +958,8 @@ free_ks_options(opt); + curl_slist_free_all(headers); + if(curl) curl_easy_cleanup(curl); diff -Nru gnupg-1.4.9/keyserver/gpgkeys_ldap.c gnupg-1.4.10/keyserver/gpgkeys_ldap.c --- gnupg-1.4.9/keyserver/gpgkeys_ldap.c 2008-03-25 09:19:57.000000000 +0000 +++ gnupg-1.4.10/keyserver/gpgkeys_ldap.c 2009-08-25 19:35:59.000000000 +0100 @@ -147,7 +147,7 @@ static int add_key_to_keylist(const char *key,struct keylist **list) { - struct keylist *keyptr=malloc(sizeof(struct keylist)); + struct keylist *keyptr=xtrymalloc(sizeof(struct keylist)); if(keyptr==NULL) { @@ -320,14 +320,14 @@ return 0; *modlist=grow; - grow[nummods]=malloc(sizeof(LDAPMod)); + grow[nummods]=xtrymalloc(sizeof(LDAPMod)); if(!grow[nummods]) return 0; grow[nummods]->mod_op=LDAP_MOD_REPLACE; grow[nummods]->mod_type=attr; if(value) { - grow[nummods]->mod_values=malloc(sizeof(char *)*2); + grow[nummods]->mod_values=xtrymalloc(sizeof(char *)*2); if(!grow[nummods]->mod_values) { grow[nummods]=NULL; @@ -586,7 +586,7 @@ char keyid[17],state[6]; LDAPMod **modlist,**addlist,**ml; - modlist=malloc(sizeof(LDAPMod *)); + modlist=xtrymalloc(sizeof(LDAPMod *)); if(!modlist) { fprintf(console,"gpgkeys: can't allocate memory for keyserver record\n"); @@ -596,7 +596,7 @@ *modlist=NULL; - addlist=malloc(sizeof(LDAPMod *)); + addlist=xtrymalloc(sizeof(LDAPMod *)); if(!addlist) { fprintf(console,"gpgkeys: can't allocate memory for keyserver record\n"); @@ -647,7 +647,7 @@ goto fail; } - dn=malloc(strlen("pgpCertID=")+16+1+strlen(basekeyspacedn)+1); + dn=xtrymalloc(strlen("pgpCertID=")+16+1+strlen(basekeyspacedn)+1); if(dn==NULL) { fprintf(console,"gpgkeys: can't allocate memory for keyserver record\n"); @@ -657,7 +657,7 @@ sprintf(dn,"pgpCertID=%s,%s",keyid,basekeyspacedn); - key=malloc(1); + key=xtrymalloc(1); if(!key) { fprintf(console,"gpgkeys: unable to allocate memory for key\n"); @@ -777,13 +777,16 @@ fail: /* Unwind and free the whole modlist structure */ - for(ml=modlist;*ml;ml++) + if (modlist) { - free_mod_values(*ml); - free(*ml); + for(ml=modlist;*ml;ml++) + { + free_mod_values(*ml); + free(*ml); + } + free(modlist); } - free(modlist); free(addlist); free(dn); free(key); @@ -809,7 +812,7 @@ attrs[0]=&mod; attrs[1]=NULL; - dn=malloc(strlen("pgpCertid=virtual,")+strlen(basekeyspacedn)+1); + dn=xtrymalloc(strlen("pgpCertid=virtual,")+strlen(basekeyspacedn)+1); if(dn==NULL) { fprintf(console,"gpgkeys: can't allocate memory for keyserver record\n"); @@ -820,7 +823,7 @@ strcpy(dn,"pgpCertid=virtual,"); strcat(dn,basekeyspacedn); - key[0]=malloc(1); + key[0]=xtrymalloc(1); if(key[0]==NULL) { fprintf(console,"gpgkeys: unable to allocate memory for key\n"); @@ -1305,7 +1308,7 @@ "pgpkeysize","pgpkeytype",NULL}; enum ks_search_type search_type; - search=malloc(2+1+9+1+3+strlen(searchkey)+3+1+15+14+1+1+20); + search=xtrymalloc(2+1+9+1+3+strlen(searchkey)+3+1+15+14+1+1+20); if(!search) { fprintf(console,"gpgkeys: out of memory when building search list\n"); @@ -1668,7 +1671,7 @@ LDAPMessage *si_res; char *object; - object=malloc(17+strlen(context[i])+1); + object=xtrymalloc(17+strlen(context[i])+1); if(!object) return -1; @@ -1778,9 +1781,10 @@ static void show_help (FILE *fp) { - fprintf (fp,"-h\thelp\n"); - fprintf (fp,"-V\tversion\n"); - fprintf (fp,"-o\toutput to this file\n"); + fprintf (fp,"-h, --help\thelp\n"); + fprintf (fp,"-V\t\tmachine readable version\n"); + fprintf (fp,"--version\thuman readable version\n"); + fprintf (fp,"-o\t\toutput to this file\n"); } int @@ -2038,7 +2042,7 @@ if(line[0]=='\n' || line[0]=='\0') break; - work=malloc(sizeof(struct keylist)); + work=xtrymalloc(sizeof(struct keylist)); if(work==NULL) { fprintf(console,"gpgkeys: out of memory while " @@ -2322,7 +2326,7 @@ keyptr=keyptr->next; } - searchkey=malloc((len*3)+1); + searchkey=xtrymalloc((len*3)+1); if(searchkey==NULL) { ret=KEYSERVER_NO_MEMORY; diff -Nru gnupg-1.4.9/keyserver/gpgkeys_mailto.in gnupg-1.4.10/keyserver/gpgkeys_mailto.in --- gnupg-1.4.9/keyserver/gpgkeys_mailto.in 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/gpgkeys_mailto.in 2009-05-05 09:11:03.000000000 +0100 @@ -52,10 +52,6 @@ open(STDIN,$ARGV[0]) || die "Can't open input file $ARGV[0]\n"; } -($login,$name)=(getpwuid($<))[0,6]; - -$from="$name <$login>"; - while() { last if($_ eq "\n"); @@ -85,9 +81,24 @@ { $verbose--; } + elsif($1=~/^mail-from=(.+)$/i) + { + $from=$1; + } + elsif($1=~/^no-mail-from$/i) + { + undef $from; + } + } } +if(!defined($from)) +{ + ($login,$name)=(getpwuid($<))[0,6]; + $from="$name <$login>"; +} + $program="(unknown)" if(!defined($program)); if(!defined($address)) @@ -96,29 +107,6 @@ exit(1); } -# decode $address - -($address,$args)=split(/\?/,$address); - -if(defined($args)) -{ - @pairs = split(/&/, $args); - foreach $pair (@pairs) - { - ($hdr, $val) = split(/=/, $pair); - $hdr =~ tr/+/ /; - $hdr =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; - $val =~ tr/+/ /; - $val =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; -# we only handle "from" right now - if($hdr=~/^from$/i) - { - $from=$val; - last; - } - } -} - while() { last if($_ eq "\n"); diff -Nru gnupg-1.4.9/keyserver/ksmalloc.c gnupg-1.4.10/keyserver/ksmalloc.c --- gnupg-1.4.9/keyserver/ksmalloc.c 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/keyserver/ksmalloc.c 2009-08-25 19:38:04.000000000 +0100 @@ -0,0 +1,32 @@ +/* ksmalloc.c - Walloc wrapper + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * The origin of this code is GnuPG. + * + * 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. + */ + +#include + +/* A wrapper around malloc because libcompat requires it. */ +void * +xtrymalloc (size_t n) +{ + return malloc (n); +} + + +/* A wrapper around free becuase we are used to it. */ +void +xfree (void *p) +{ + if (p) + free (p); +} + diff -Nru gnupg-1.4.9/keyserver/ksutil.h gnupg-1.4.10/keyserver/ksutil.h --- gnupg-1.4.9/keyserver/ksutil.h 2007-10-23 10:59:12.000000000 +0100 +++ gnupg-1.4.10/keyserver/ksutil.h 2009-08-25 19:43:13.000000000 +0100 @@ -136,4 +136,9 @@ size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx); void curl_writer_finalize(struct curl_writer_ctx *ctx); + +/* -- From ksmalloc.c or ../include/memory.h -- */ +void *xtrymalloc (size_t n); +void xfree (void *p); + #endif /* !_KSUTIL_H_ */ diff -Nru gnupg-1.4.9/keyserver/Makefile.am gnupg-1.4.10/keyserver/Makefile.am --- gnupg-1.4.9/keyserver/Makefile.am 2007-12-20 07:52:41.000000000 +0000 +++ gnupg-1.4.10/keyserver/Makefile.am 2009-09-02 16:35:38.000000000 +0100 @@ -1,5 +1,5 @@ # Copyright (C) 2001, 2002, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -27,7 +27,7 @@ gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h +gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h ksmalloc.c gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h @@ -45,10 +45,12 @@ gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ else +gpgkeys_curl_SOURCES += ksmalloc.c gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ +gpgkeys_hkp_SOURCES += ksmalloc.c gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@ -gpgkeys_hkp_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ +gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@ gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@ gpgkeys_ldap_CPPFLAGS += @LIBCURL_CPPFLAGS@ endif diff -Nru gnupg-1.4.9/keyserver/Makefile.in gnupg-1.4.10/keyserver/Makefile.in --- gnupg-1.4.9/keyserver/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/keyserver/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -15,7 +15,7 @@ @SET_MAKE@ # Copyright (C) 2001, 2002, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -55,18 +55,20 @@ gpgkeys_finger$(EXEEXT) gpgkeys_curl$(EXEEXT) @FAKE_CURL_TRUE@am__append_1 = curl-shim.c curl-shim.h @FAKE_CURL_TRUE@am__append_2 = curl-shim.c curl-shim.h -@FAKE_CURL_FALSE@am__append_3 = @LIBCURL_CPPFLAGS@ +@FAKE_CURL_FALSE@am__append_3 = ksmalloc.c +@FAKE_CURL_FALSE@am__append_4 = ksmalloc.c +@FAKE_CURL_FALSE@am__append_5 = @LIBCURL_CPPFLAGS@ subdir = keyserver DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/gpgkeys_mailto.in $(srcdir)/gpgkeys_test.in \ ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -92,10 +94,12 @@ gpglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(gpglibexec_PROGRAMS) am__gpgkeys_curl_SOURCES_DIST = gpgkeys_curl.c ksutil.c ksutil.h \ - curl-shim.c curl-shim.h + curl-shim.c curl-shim.h ksmalloc.c @FAKE_CURL_TRUE@am__objects_1 = gpgkeys_curl-curl-shim.$(OBJEXT) +@FAKE_CURL_FALSE@am__objects_2 = gpgkeys_curl-ksmalloc.$(OBJEXT) am_gpgkeys_curl_OBJECTS = gpgkeys_curl-gpgkeys_curl.$(OBJEXT) \ - gpgkeys_curl-ksutil.$(OBJEXT) $(am__objects_1) + gpgkeys_curl-ksutil.$(OBJEXT) $(am__objects_1) \ + $(am__objects_2) gpgkeys_curl_OBJECTS = $(am_gpgkeys_curl_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -108,21 +112,22 @@ gpgkeys_finger_OBJECTS = $(am_gpgkeys_finger_OBJECTS) gpgkeys_finger_DEPENDENCIES = ../util/libutil.a $(am__DEPENDENCIES_2) am__gpgkeys_hkp_SOURCES_DIST = gpgkeys_hkp.c ksutil.c ksutil.h \ - curl-shim.c curl-shim.h -@FAKE_CURL_TRUE@am__objects_2 = gpgkeys_hkp-curl-shim.$(OBJEXT) + curl-shim.c curl-shim.h ksmalloc.c +@FAKE_CURL_TRUE@am__objects_3 = gpgkeys_hkp-curl-shim.$(OBJEXT) +@FAKE_CURL_FALSE@am__objects_4 = gpgkeys_hkp-ksmalloc.$(OBJEXT) am_gpgkeys_hkp_OBJECTS = gpgkeys_hkp-gpgkeys_hkp.$(OBJEXT) \ - gpgkeys_hkp-ksutil.$(OBJEXT) $(am__objects_2) + gpgkeys_hkp-ksutil.$(OBJEXT) $(am__objects_3) $(am__objects_4) gpgkeys_hkp_OBJECTS = $(am_gpgkeys_hkp_OBJECTS) @FAKE_CURL_FALSE@gpgkeys_hkp_DEPENDENCIES = ../util/libcompat.a @FAKE_CURL_TRUE@gpgkeys_hkp_DEPENDENCIES = ../util/libutil.a \ @FAKE_CURL_TRUE@ $(am__DEPENDENCIES_2) am_gpgkeys_ldap_OBJECTS = gpgkeys_ldap-gpgkeys_ldap.$(OBJEXT) \ - gpgkeys_ldap-ksutil.$(OBJEXT) + gpgkeys_ldap-ksutil.$(OBJEXT) gpgkeys_ldap-ksmalloc.$(OBJEXT) gpgkeys_ldap_OBJECTS = $(am_gpgkeys_ldap_OBJECTS) gpgkeys_ldap_DEPENDENCIES = ../util/libcompat.a $(am__DEPENDENCIES_2) gpglibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(gpglibexec_SCRIPTS) $(noinst_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -165,7 +170,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -316,18 +320,19 @@ gpglibexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_CURL@ gpglibexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h -gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h $(am__append_2) +gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h ksmalloc.c +gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h $(am__append_2) \ + $(am__append_4) gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h \ - $(am__append_1) + $(am__append_1) $(am__append_3) other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) -gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ $(am__append_3) +gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ $(am__append_5) gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ @FAKE_CURL_FALSE@gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ @FAKE_CURL_TRUE@gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ -@FAKE_CURL_FALSE@gpgkeys_hkp_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@ +@FAKE_CURL_FALSE@gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@ @FAKE_CURL_TRUE@gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ @FAKE_CURL_FALSE@gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@ @FAKE_CURL_FALSE@gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@ @@ -463,13 +468,16 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_curl-curl-shim.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_curl-gpgkeys_curl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_curl-ksmalloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_curl-ksutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_finger-gpgkeys_finger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_finger-ksutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_hkp-curl-shim.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_hkp-gpgkeys_hkp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_hkp-ksmalloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_hkp-ksutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_ldap-gpgkeys_ldap.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_ldap-ksmalloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgkeys_ldap-ksutil.Po@am__quote@ .c.o: @@ -528,6 +536,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_curl-curl-shim.obj `if test -f 'curl-shim.c'; then $(CYGPATH_W) 'curl-shim.c'; else $(CYGPATH_W) '$(srcdir)/curl-shim.c'; fi` +gpgkeys_curl-ksmalloc.o: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_curl-ksmalloc.o -MD -MP -MF $(DEPDIR)/gpgkeys_curl-ksmalloc.Tpo -c -o gpgkeys_curl-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_curl-ksmalloc.Tpo $(DEPDIR)/gpgkeys_curl-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_curl-ksmalloc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_curl-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c + +gpgkeys_curl-ksmalloc.obj: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_curl-ksmalloc.obj -MD -MP -MF $(DEPDIR)/gpgkeys_curl-ksmalloc.Tpo -c -o gpgkeys_curl-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_curl-ksmalloc.Tpo $(DEPDIR)/gpgkeys_curl-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_curl-ksmalloc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_curl-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` + gpgkeys_finger-gpgkeys_finger.o: gpgkeys_finger.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_finger_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_finger-gpgkeys_finger.o -MD -MP -MF $(DEPDIR)/gpgkeys_finger-gpgkeys_finger.Tpo -c -o gpgkeys_finger-gpgkeys_finger.o `test -f 'gpgkeys_finger.c' || echo '$(srcdir)/'`gpgkeys_finger.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_finger-gpgkeys_finger.Tpo $(DEPDIR)/gpgkeys_finger-gpgkeys_finger.Po @@ -598,6 +620,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_hkp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_hkp-curl-shim.obj `if test -f 'curl-shim.c'; then $(CYGPATH_W) 'curl-shim.c'; else $(CYGPATH_W) '$(srcdir)/curl-shim.c'; fi` +gpgkeys_hkp-ksmalloc.o: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_hkp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_hkp-ksmalloc.o -MD -MP -MF $(DEPDIR)/gpgkeys_hkp-ksmalloc.Tpo -c -o gpgkeys_hkp-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_hkp-ksmalloc.Tpo $(DEPDIR)/gpgkeys_hkp-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_hkp-ksmalloc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_hkp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_hkp-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c + +gpgkeys_hkp-ksmalloc.obj: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_hkp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_hkp-ksmalloc.obj -MD -MP -MF $(DEPDIR)/gpgkeys_hkp-ksmalloc.Tpo -c -o gpgkeys_hkp-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_hkp-ksmalloc.Tpo $(DEPDIR)/gpgkeys_hkp-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_hkp-ksmalloc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_hkp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_hkp-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` + gpgkeys_ldap-gpgkeys_ldap.o: gpgkeys_ldap.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_ldap-gpgkeys_ldap.o -MD -MP -MF $(DEPDIR)/gpgkeys_ldap-gpgkeys_ldap.Tpo -c -o gpgkeys_ldap-gpgkeys_ldap.o `test -f 'gpgkeys_ldap.c' || echo '$(srcdir)/'`gpgkeys_ldap.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_ldap-gpgkeys_ldap.Tpo $(DEPDIR)/gpgkeys_ldap-gpgkeys_ldap.Po @@ -626,13 +662,27 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_ldap-ksutil.obj `if test -f 'ksutil.c'; then $(CYGPATH_W) 'ksutil.c'; else $(CYGPATH_W) '$(srcdir)/ksutil.c'; fi` +gpgkeys_ldap-ksmalloc.o: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_ldap-ksmalloc.o -MD -MP -MF $(DEPDIR)/gpgkeys_ldap-ksmalloc.Tpo -c -o gpgkeys_ldap-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_ldap-ksmalloc.Tpo $(DEPDIR)/gpgkeys_ldap-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_ldap-ksmalloc.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_ldap-ksmalloc.o `test -f 'ksmalloc.c' || echo '$(srcdir)/'`ksmalloc.c + +gpgkeys_ldap-ksmalloc.obj: ksmalloc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gpgkeys_ldap-ksmalloc.obj -MD -MP -MF $(DEPDIR)/gpgkeys_ldap-ksmalloc.Tpo -c -o gpgkeys_ldap-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gpgkeys_ldap-ksmalloc.Tpo $(DEPDIR)/gpgkeys_ldap-ksmalloc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ksmalloc.c' object='gpgkeys_ldap-ksmalloc.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gpgkeys_ldap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gpgkeys_ldap-ksmalloc.obj `if test -f 'ksmalloc.c'; then $(CYGPATH_W) 'ksmalloc.c'; else $(CYGPATH_W) '$(srcdir)/ksmalloc.c'; fi` + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -644,8 +694,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -655,13 +705,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gnupg-1.4.9/m4/ChangeLog gnupg-1.4.10/m4/ChangeLog --- gnupg-1.4.9/m4/ChangeLog 2007-12-17 09:43:36.000000000 +0000 +++ gnupg-1.4.10/m4/ChangeLog 2009-07-21 13:42:26.000000000 +0100 @@ -1,3 +1,7 @@ +2009-07-21 Werner Koch + + * estream.m4: New. Taken from libestream. + 2007-12-17 Werner Koch * ldap.m4: Test for ldap_start_tls_sA. diff -Nru gnupg-1.4.9/m4/estream.m4 gnupg-1.4.10/m4/estream.m4 --- gnupg-1.4.9/m4/estream.m4 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/m4/estream.m4 2009-07-21 13:35:13.000000000 +0100 @@ -0,0 +1,48 @@ +dnl Autoconf macros for libestream +dnl Copyright (C) 2007 g10 Code GmbH +dnl +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +dnl estream_PRINTF_INIT +dnl Prepare build of source included estream-printf.c +dnl +AC_DEFUN([estream_PRINTF_INIT], +[ + AC_MSG_NOTICE([checking system features for estream-printf]) + AC_TYPE_LONG_LONG_INT + AC_TYPE_LONG_DOUBLE + AC_TYPE_INTMAX_T + AC_TYPE_UINTMAX_T + AC_CHECK_TYPES([ptrdiff_t]) + AC_CHECK_SIZEOF([unsigned long]) + AC_CHECK_SIZEOF([void *]) + AC_CACHE_CHECK([for nl_langinfo and THOUSANDS_SEP], + estream_cv_langinfo_thousands_sep, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(THOUSANDS_SEP); return !cs;], + estream_cv_langinfo_thousands_sep=yes, + estream_cv_langinfo_thousands_sep=no) + ]) + if test $estream_cv_langinfo_thousands_sep = yes; then + AC_DEFINE(HAVE_LANGINFO_THOUSANDS_SEP, 1, + [Define if you have and nl_langinfo(THOUSANDS_SEP).]) + fi +]) + + +dnl estream_INIT +dnl Prepare build of source included estream.c +dnl +AC_DEFUN([estream_INIT], +[ + AC_REQUIRE([estream_PRINTF_INIT]) + AC_MSG_NOTICE([checking system features for estream]) + +]) diff -Nru gnupg-1.4.9/m4/Makefile.am gnupg-1.4.10/m4/Makefile.am --- gnupg-1.4.9/m4/Makefile.am 2007-10-23 10:25:03.000000000 +0100 +++ gnupg-1.4.10/m4/Makefile.am 2009-07-21 13:42:47.000000000 +0100 @@ -6,6 +6,7 @@ po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 \ readline.m4 libcurl.m4 libusb.m4 tar-ustar.m4 \ ldap.m4 \ - noexecstack.m4 autobuild.m4 + noexecstack.m4 autobuild.m4 estream.m4 + diff -Nru gnupg-1.4.9/m4/Makefile.in gnupg-1.4.10/m4/Makefile.in --- gnupg-1.4.9/m4/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/m4/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -35,11 +35,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -91,7 +91,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -244,7 +243,7 @@ po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 \ readline.m4 libcurl.m4 libusb.m4 tar-ustar.m4 \ ldap.m4 \ - noexecstack.m4 autobuild.m4 + noexecstack.m4 autobuild.m4 estream.m4 all: all-am diff -Nru gnupg-1.4.9/Makefile.am gnupg-1.4.10/Makefile.am --- gnupg-1.4.9/Makefile.am 2007-12-14 10:01:58.000000000 +0000 +++ gnupg-1.4.10/Makefile.am 2009-08-13 15:23:30.000000000 +0100 @@ -17,8 +17,7 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support \ - --enable-camellia --enable-mailto +DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support --enable-mailto AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99 if CROSS_COMPILING @@ -31,6 +30,11 @@ EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in autogen.sh DISTCLEANFILES = +# We do not install README into the doc directory because that would +# conflict with GnuPG-2. +# dist_doc_DATA = README + + # Add all the files listed in "distfiles" files to the distribution, # apply version numbers to some files and create a VERSION file which # we need for the Prereq: patch file trick. diff -Nru gnupg-1.4.9/Makefile.in gnupg-1.4.10/Makefile.in --- gnupg-1.4.9/Makefile.in 2008-03-26 17:30:48.000000000 +0000 +++ gnupg-1.4.10/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -59,11 +59,11 @@ scripts/mkinstalldirs scripts/texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -140,7 +140,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -286,9 +285,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support \ - --enable-camellia --enable-mailto - +DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support --enable-mailto AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99 @CROSS_COMPILING_FALSE@checks = checks @CROSS_COMPILING_TRUE@checks = @@ -427,8 +424,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -453,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -464,13 +461,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -548,6 +544,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -575,6 +575,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -727,19 +729,23 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +# We do not install README into the doc directory because that would +# conflict with GnuPG-2. +# dist_doc_DATA = README + # Add all the files listed in "distfiles" files to the distribution, # apply version numbers to some files and create a VERSION file which # we need for the Prereq: patch file trick. diff -Nru gnupg-1.4.9/mpi/Makefile.in gnupg-1.4.10/mpi/Makefile.in --- gnupg-1.4.9/mpi/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/mpi/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -53,11 +53,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -88,7 +88,7 @@ mpicoder.$(OBJEXT) mpih-cmp.$(OBJEXT) mpih-div.$(OBJEXT) \ mpih-mul.$(OBJEXT) mpiutil.$(OBJEXT) libmpi_a_OBJECTS = $(am_libmpi_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -128,7 +128,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -405,8 +404,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -418,8 +417,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -429,13 +428,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gnupg-1.4.9/NEWS gnupg-1.4.10/NEWS --- gnupg-1.4.9/NEWS 2008-03-26 17:27:50.000000000 +0000 +++ gnupg-1.4.10/NEWS 2009-09-02 13:33:00.000000000 +0100 @@ -1,3 +1,27 @@ +Noteworthy changes in version 1.4.10 (2009-09-02) +------------------------------------------------- + + * 2048 bit RSA keys are now generated by default. The default + hash algorithm preferences has changed to prefer SHA-256 over + SHA-1. 2048 bit DSA keys are now generated to use a 256 bit + hash algorithm + + * Support v2 OpenPGP cards. + + * The algorithm to compute the SIG_ID status has been changed to + match the one from 2.0.10. + + * Improved file locking. Implemented it for W32. + + * Fixed a memory leak which made imports of many keys very slow. + + * Many smaller bug fixes. + + * Support for the Camellia cipher (RFC-5581). + + * Support for HKP keyservers over SSL ("HKPS"). + + Noteworthy changes in version 1.4.9 (2008-03-26) ------------------------------------------------ @@ -5,7 +29,7 @@ Decryption is also a bit faster. * Fixed possible memory corruption bug in 1.4.8 while importing - OpenPGP keys. + OpenPGP keys. [CVE-2008-1530] Noteworthy changes in version 1.4.8 (2007-12-20) Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/be.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/be.gmo differ diff -Nru gnupg-1.4.9/po/be.po gnupg-1.4.10/po/be.po --- gnupg-1.4.9/po/be.po 2008-03-25 08:53:05.000000000 +0000 +++ gnupg-1.4.10/po/be.po 2009-09-02 17:19:37.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -39,13 +39,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "" @@ -122,175 +122,218 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "Ñтварыць новую пару ключоў" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "Ñтварыць новую пару ключоў" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "Ñтварыць новую пару ключоў" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "" @@ -373,170 +416,230 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "" -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "непадтрымліваецца" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "" + +#: g10/card-util.c:1294 +#, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "" + +#: g10/card-util.c:1295 +#, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "" + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +msgid "NOTE: keys are already stored on the card!\n" +msgstr "" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -544,188 +647,197 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "ÐŸÐ¾Ð´Ð¿Ñ–Ñ Ñтвораны Ñž %.*s з выкарыÑтаньнем %s ID ключа %08lX\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr "" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "невÑдомы альгарытм ÑьціÑканьнÑ" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "збой падпіÑаньнÑ: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "паказаць гÑтую даведку" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Даведка адÑутнічае" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "Ñтварыць новую пару ключоў" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Загад> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "ÐерÑчаіÑны загад (паÑпрабуйце \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Паўтарыце пароль: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "немагчыма адкрыць \"%s\"\n" @@ -734,13 +846,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -837,7 +949,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "" @@ -1228,7 +1340,7 @@ msgid "Pubkey: " msgstr "" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "" @@ -1236,7 +1348,7 @@ msgid "Hash: " msgstr "" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "" @@ -1369,405 +1481,405 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s не дазвалÑецца разам з %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [назва_файла]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [назва_файла]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [назва_файла]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [назва_файла]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [назва_файла]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [назва_файла]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [назва_файла]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [загады]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" @@ -1811,17 +1923,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -1850,7 +1962,7 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" @@ -2541,12 +2653,12 @@ msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" @@ -2595,7 +2707,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2603,12 +2715,12 @@ "etc.)\n" msgstr "" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr "" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr "" @@ -2808,8 +2920,8 @@ msgid "Really sign? (y/N) " msgstr "" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" @@ -2818,20 +2930,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Ключ абаронены.\n" @@ -2848,7 +2960,7 @@ "УвÑдзіце новы пароль Ð´Ð»Ñ Ð³Ñтага ÑакрÑтнага ключа.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "" @@ -3165,47 +3277,47 @@ msgid "Really update the preferences? (y/N) " msgstr "" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Захаваць зьмены? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "ВыйÑьці не захаваўшы зьмены? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "" @@ -3213,422 +3325,427 @@ "Выбары:\n" " " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 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:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "ПеразапіÑаць (y/N)?" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr "" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "зашыфраваць даньні" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3641,109 +3758,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr "" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr "" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 #, c-format -msgid " (%d) DSA (sign only)\n" +msgid " (%d) DSA and Elgamal\n" msgstr "" -#: g10/keygen.c:1457 +#: g10/keygen.c:1496 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" +msgid " (%d) DSA (sign only)\n" msgstr "" -#: g10/keygen.c:1459 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) Elgamal (encrypt only)\n" +msgid " (%d) RSA (sign only)\n" msgstr "" -#: g10/keygen.c:1460 +#: g10/keygen.c:1501 #, c-format -msgid " (%d) RSA (sign only)\n" +msgid " (%d) Elgamal (encrypt only)\n" msgstr "" -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr "" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "" -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" +msgid "What keysize do you want? (%u) " msgstr "" -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3753,7 +3865,7 @@ " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3763,48 +3875,48 @@ " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "" -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "ÐŸÐ¾Ð´Ð¿Ñ–Ñ Ñтвораны Ñž %.*s з выкарыÑтаньнем %s ID ключа %08lX\n" -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "ÐŸÐ¾Ð´Ð¿Ñ–Ñ Ñтвораны Ñž %.*s з выкарыÑтаньнем %s ID ключа %08lX\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "" -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3814,44 +3926,44 @@ "\n" msgstr "" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "" -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "" -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "" -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3859,7 +3971,7 @@ "\n" msgstr "" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" @@ -3874,34 +3986,34 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "" -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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 +4021,7 @@ "\n" msgstr "" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -3917,91 +4029,91 @@ "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" msgstr "" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" @@ -4034,250 +4146,250 @@ msgid "Keyring" msgstr "" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr "" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "немагчыма адкрыць \"%s\"\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: Ñтвораны зьвÑзак ключоў\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "ÑкÑпартаваць ключы на паÑлужнік ключоў" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "імпартаваць ключы з паÑлужніка ключоў" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "імпартаваць ключы з паÑлужніка ключоў" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "немагчыма адкрыць %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "" @@ -4432,63 +4544,63 @@ msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr "" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 #, fuzzy msgid "unknown" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -4526,60 +4638,65 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "" "па больш падрабÑÐ·Ð½Ñ‹Ñ Ð·ÑŒÐ²ÐµÑткі шукайце на http://www.gnupg.org/faq.html\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "ÑакрÑтны ключ недаÑтупны" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" @@ -4632,11 +4749,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -4723,7 +4840,7 @@ msgid "Repeat passphrase: " msgstr "Паўтарыце пароль: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4732,58 +4849,58 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "немагчыма адкрыць %s: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "" -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "" @@ -4803,219 +4920,219 @@ msgid "No trust value assigned to:\n" msgstr "" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr "" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr "" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr "" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr "" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr "" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr "" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = quit [выйÑьці]\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "" -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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 "" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr "" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr "" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " msgstr "" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "" @@ -5082,7 +5199,7 @@ msgstr "" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, fuzzy, c-format msgid "build_packet failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" @@ -5104,11 +5221,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, fuzzy, c-format msgid "make_keysig_packet failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" @@ -5127,30 +5244,30 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "" -#: g10/revoke.c:533 +#: g10/revoke.c:531 #, fuzzy msgid "unknown protection algorithm\n" msgstr "невÑдомы альгарытм ÑьціÑканьнÑ" -#: g10/revoke.c:541 +#: g10/revoke.c:539 #, fuzzy msgid "NOTE: This key is not protected!\n" msgstr "Ключ абаронены.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5161,34 +5278,34 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "" @@ -5260,44 +5377,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5425,12 +5542,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5474,83 +5591,83 @@ msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgid "Error: The trustdb is corrupted.\n" msgstr "" #: g10/textfilter.c:147 @@ -5598,129 +5715,137 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5978,48 +6103,48 @@ msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 #, fuzzy msgid "yes" msgstr "yes [так]" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no [не]" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit [выйÑьці]" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "" @@ -6055,10 +6180,6 @@ #~ msgid "Unable to clean `%s'\n" #~ msgstr "немагчыма адкрыць %s: %s\n" -#, fuzzy -#~ msgid "error getting serial number: %s\n" -#~ msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" - #~ msgid "passphrase too long\n" #~ msgstr "пароль занадта доўгі\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/ca.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/ca.gmo differ diff -Nru gnupg-1.4.9/po/ca.po gnupg-1.4.10/po/ca.po --- gnupg-1.4.9/po/ca.po 2008-03-25 08:53:05.000000000 +0000 +++ gnupg-1.4.10/po/ca.po 2009-09-02 17:19:37.000000000 +0100 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -59,13 +59,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "s'està escrivint la clau secreta a «%s»\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "no s'ha pogut obrir «%s»: %s\n" @@ -98,9 +97,10 @@ msgid "note: random_seed file not updated\n" msgstr "nota: el fitxer random_seed no s'ha actualitzat\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "no s'ha pogut crear «%s»: %s\n" @@ -154,176 +154,222 @@ "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n" "sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, 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:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "Introduïu el nom d'usuari: " + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +# Parts? Peces? ivb +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "parts de la clau secreta no estan disponbles\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Seleccioneu la raó de la revocació:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "error en crear «%s»: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, 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:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "error: l'empremta digital és invàlida\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "«%s» ja està comprimida\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "genera un nou parell de claus" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "genera un nou parell de claus" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "La generació de claus ha fallat: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "La generació de claus ha fallat: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "signatura %s, algorisme de resum %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "" @@ -413,43 +459,48 @@ "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha " "utilitzat un MTA amb errors\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "la clau secreta no està disponible" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" # Destès? ivb # Desatès, sí. jm -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, 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:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "La vostra selecció? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[no establert]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "home" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "dóna" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "no especificat" @@ -457,134 +508,191 @@ # 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:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "no forçat" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forçat" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "no hi ha cap clau pública corresponent: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "error en crear l'anell «%s»: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "error en la lectura de «%s»: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "error en crear «%s»: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "preferències actualitzades" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, 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:814 +#: g10/card-util.c:1019 #, 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:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "error: l'empremta digital és invàlida\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "Empremta digital:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "error: l'empremta digital és invàlida\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "La generació de claus ha fallat: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "no s'han trobat dades OpenPGP vàlides.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Quina grandària voleu? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Quina grandària voleu? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Quina grandària voleu? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "arrodonida fins a %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "error en llegir el bloc de claus secretes «%s»: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "es descarta: la clau secreta ja és present\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -592,194 +700,203 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Seleccioneu quin tipus de clau voleu:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr "" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (només xifrar)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "La selecció és invàlida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Seleccioneu la raó de la revocació:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "l'algorisme de protecció és desconegut\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "es descarta: la clau secreta ja és present\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "error mentre s'escrivia l'anell «%s»: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ix del menú" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "les ordres entren en conflicte\n" # «pantalla» o «ajuda»? ivb # «ajuda», evidentment. jm -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "mostra aquesta ajuda" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "La clau és disponible en: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "canvia la data de caducitat" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "canvia la confiança" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra empremta" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "genera un nou parell de claus" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Ordre> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no és vàlida (proveu «help»)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "la clau secreta no està disponible" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Introduïu el nom d'usuari: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "Introduïu el nom d'usuari: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 #, fuzzy msgid "Enter PIN: " msgstr "Introduïu el nom d'usuari: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Repetiu la contrasenya: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "no s'ha pogut obrir «%s»\n" @@ -788,13 +905,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona per a aquesta ordre\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -902,7 +1019,7 @@ msgstr "" "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" @@ -1319,7 +1436,7 @@ msgid "Pubkey: " msgstr "Clau pública: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Xifratge: " @@ -1327,7 +1444,7 @@ msgid "Hash: " msgstr "Dispersió: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compressió: " @@ -1467,418 +1584,418 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "fitxer d'opcions «%s»: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "s'estan llegint opcions de «%s»\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no és per a ús normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s no és un joc de caràcters vàlid\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, 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/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d opcions d'exportació no vàlides\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcions d'exportació no vàlides\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcions d'importanció no vàlides\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opcions d'importació no vàlides\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d opcions d'exportació no vàlides\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opcions d'exportació no vàlides\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcions d'importanció no vàlides\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "opcions d'importació no vàlides\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s no és un joc de caràcters vàlid\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "la URL de política de signatura donada no és vàlida\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s no és un joc de caràcters vàlid\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s no és un joc de caràcters vàlid\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d opcions d'exportació no vàlides\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "opcions d'exportació no vàlides\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d opcions d'exportació no vàlides\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 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/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVÃS: %s té preferència sobre %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no és permés amb %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no té sentit amb %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent no està disponible en aquesta sessió\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "s'està escrivint la clau secreta a «%s»\n" # clares -> en clar? ivb -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no és vàlid\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "l'algorisme de resum seleccionat no és vàlid\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no és vàlid\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 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/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "les preferències per defecte són invàlides\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "les preferències personals de xifrat són invàlides\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "les preferències personals de digest són invàlides\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "les preferències personals de compressió són invàlides\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s encara no funciona amb %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, 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/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ha fallat el desxifratge: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la recepció des del servidor de claus ha fallat: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "l'exportació de la clau ha fallat: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "ha fallat la cerca al servidor de claus: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "ha fallat el refresc des del servidor de claus: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "l'algoritme de dispersió és invàlid «%s»\n" @@ -1926,18 +2043,18 @@ msgstr "" "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %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:2667 +#: g10/getkey.c:2703 #, 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" @@ -1964,8 +2081,9 @@ # Werner FIXME: should it use «Usage»? #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxi: gpg [opcions] [fitxers]\n" @@ -2782,12 +2900,12 @@ msgid "keyring `%s' created\n" msgstr "s'ha creat l'anell «%s»\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "error en crear «%s»: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, 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" @@ -2836,7 +2954,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2848,12 +2966,12 @@ "verificar les claus d'altres usuaris (mirant passaports,\n" "comprovant empremtes de diferents fonts...)?\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Hi confie marginalment\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Hi confie plenament\n" @@ -3093,8 +3211,8 @@ msgid "Really sign? (y/N) " msgstr "Signar realment? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "Ha fallat el procés de signatura: %s\n" @@ -3103,20 +3221,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Aquesta clau no està protegida.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Les parts secretes de la clau primària no estan disponibles.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Les parts secretes de la clau primària no estan disponibles.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "La clau està protegida.\n" @@ -3133,7 +3251,7 @@ "Introduïu la nova contrasenya per a la clau secreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" @@ -3490,121 +3608,121 @@ msgid "Really update the preferences? (y/N) " msgstr "Realment voleu actualitzar les preferències? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Voleu desar els canvis? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Voleu eixir sense desar? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "ha fallat l'actualització: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "ha fallat l'actualització de la clau secreta: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "La clau no ha canviat, per tant no cal actualització.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Resum: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Funcionalitats: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notació: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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" # Potser %s haja d'anar darrere de «clau». ivb # És cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Aquesta clau pot ser revocada per la clau %s " # Potser %s haja d'anar darrere de «clau». ivb # És cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "no s'ha pogut creat %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Aquesta clau ha estat desactivada" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3612,19 +3730,19 @@ "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n" "correcta a no ser que torneu a executar el programa.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[revocada]" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3634,7 +3752,7 @@ "assumida.\n" # Photo ID com abans. ivb -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3643,78 +3761,78 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "S'ha esborrat %d signatura.\n" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "S'han esborrat %d signatures.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "No s'hi ha eliminat res.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "invàlida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "L'ID d'usuari «%s» està revocat." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "L'ID d'usuari «%s» està revocat." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "L'ID d'usuari «%s» està revocat." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3723,273 +3841,278 @@ "AVÃS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n" "fer que algunes versions de PGP rebutjen aquesta clau.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Introduïu l'ID d'usuari del revocador designat: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "no podeu nominar una clau com el seu propi revocador designat\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Per favor, elimineu les seleccions de les claus secretes.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Per favor, seleccioneu com a molt una clau secundària.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "S'està canviant la data de caducitat per a una clau secundària.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 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:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "No hi ha cap signatura corresponent en l'anell secret\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "AVÃS: no es pot desfer la nominació d'una clau com a revocador designat!\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Heu de seleccionar exactament un ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notació de signatura: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Voleu sobreescriure? (s/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "No hi ha cap ID amb l'índex %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "No hi ha cap ID amb l'índex %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "No hi ha cap ID amb l'índex %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID d'usuari: «" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" "»\n" "signat amb la vostra clau %08lX el %s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (no-exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Aquesta signatura va caducar el %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (no-exportable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat per %08lX el %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Esteu a punt de revocar aquestes signatures:\n" # (s/N)? ivb -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Realment voleu crear els certificats de revocació? (s/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "ho hi ha clau secreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "la preferència %c%lu és duplicada\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "hi ha massa preferències «%c»\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "hi ha massa preferències «%c»\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "hi ha massa preferències «%c»\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "hi ha un caràcter invàlid en la cadena de preferència\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "s'està escrivint una signatura directa\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "s'està escrivint l'autosignatura\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "s'està escrivint la signatura de comprovació de la clau\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, 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:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "xifra dades" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -4002,109 +4125,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr "" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Seleccioneu quin tipus de clau voleu:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA i ElGamal (predeterminat)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA i ElGamal (predeterminat)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (només signar)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (només signar)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (només signar)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (només xifrar)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (només signar)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (només xifrar)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (només xifrar)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (només signar)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "La parella de claus DSA ha de tenir 1024 bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (només xifrar)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Quina grandària voleu? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Quina grandària voleu? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La grandària sol·licitada és %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "arrodonida fins a %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4120,7 +4238,7 @@ " m = la clau caduca als n mesos\n" " y = la clau caduca als n anys\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4136,42 +4254,42 @@ " m = la signatura caduca als n mesos\n" " y = la signatura caduca als n anys\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Indiqueu la validesa de la clau (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Indiqueu la validesa de la signatura (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "el valor no és vàlid\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s no caduca en absolut\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s no caduca en absolut\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s caduca el %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Aquesta signatura caduca el %s\n" # Amb «it» es refereix a les dates? ivb # Això vaig entendre jo. jm -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4179,12 +4297,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "És correcte? (s/n)" -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4201,44 +4319,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nom i cognoms: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Hi ha un caràcter invàlid en el camp *nom*\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "El nom no pot començar amb un dígit\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Adreça electrònica: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "No és una adreça vàlida\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentari: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Esteu usant el joc de caràcters `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4249,7 +4367,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4266,23 +4384,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoXx" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Corregiu l'error primer\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4290,12 +4408,12 @@ "Cal una contrasenya per a protegir la clau secreta.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4307,7 +4425,7 @@ "useu aquest programa amb l'opció \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4319,53 +4437,53 @@ "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n" "d'aconseguir prou entropia.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "La generació de claus ha estat cancel·lada.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "s'està escrivint la clau pública a «%s»\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "s'està escrivint la clau secreta a «%s»\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, 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:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, 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:3122 +#: g10/keygen.c:3308 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:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4374,13 +4492,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, 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:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4389,7 +4507,7 @@ "amb el rellotge)\n" # Werner FIXME: use ngettext. jm -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4397,26 +4515,26 @@ "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n" "amb el rellotge)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Crear realment? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, 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:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "no s'ha pogut crear «%s»: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" @@ -4449,258 +4567,258 @@ msgid "Keyring" msgstr "Anell" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Empremtes digital de la clau primària:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Empremta digital de la clau primària:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Empremta digital =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVÃS: hi ha 2 fitxers amb informació confidencial.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s és el que no ha canviat\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s és el nou\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Per favor, solucioneu aquest possible problema de seguretat\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "s'està comprovant l'anell «%s»\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "s'han comprovat %lu claus (%lu signatures)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "s'han comprovat %lu claus (%lu signatures)\n" # Fitxer indi fins final. Hau! ivb # Grrr. Com em tracten els esclaus ja... jm -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: s'ha creat l'anell\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "la URL de política de signatura donada no és vàlida\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "AVÃS: les opcions en «%s» encara no estan actives durant aquesta execució\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "no s'ha trobat la clau «%s»: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "no s'ha trobat la clau «%s»: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, 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:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n" # «del servidor», «en el servidor»? ivb -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "error de servidor de claus" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" # «del servidor», «en el servidor»? ivb -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "error de servidor de claus" # «del servidor», «en el servidor»? ivb -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "error de servidor de claus" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "la recepció des del servidor de claus ha fallat: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: no és un ID vàlid\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "AVÃS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "AVÃS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n" @@ -4861,63 +4979,63 @@ msgid "[uncertain]" msgstr "[incert]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Aquesta signatura va caducar el %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Aquesta signatura caduca el %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "signatura %s, algorisme de resum %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binari" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "mode text" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "desconeguda" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "No s'ha pogut comprovar la signatura: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "no és una signatura separada\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "AVÃS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "signatura autònoma de classe 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "signatura de l'estil antic (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n" @@ -4957,36 +5075,41 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "signatura %s, algorisme de resum %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "AVÃS: %s és una opció desaconsellada.\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "el mòdul de xifratge IDEA no està present\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = mostra més informació\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "AVÃS: %s és una opció desaconsellada.\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent no està disponible en aquesta sessió\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: l'opció «%s» està desaconsellada.\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVÃS: %s és una opció desaconsellada.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVÃS: %s és una opció desaconsellada.\n" @@ -4994,29 +5117,29 @@ # Gènere? Nombre? Passat, futur? ivb # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "No comprimit" # Gènere? Nombre? Passat, futur? ivb # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "No comprimit" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "aquest missatge pot no ser usable per %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "s'estan llegint opcions de «%s»\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "el destinatari predeterminat és desconegut «%s»\n" @@ -5071,12 +5194,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "no es pot treballar amb l'algoritme de clau pública %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "AVÃS: la clau de sessió pot estar xifrada simètricament de forma insegura\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquet de tipus %d té el bit crític activat\n" @@ -5175,7 +5298,7 @@ msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5190,59 +5313,59 @@ "molt gran!\n" "Es recomana una imatge amb una mida aproximada de 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Introduïu el nom del fitxer JPEG per al photo ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "No s'ha pogut obrir la foto «%s»: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "«%s» no és un fitxer JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "És aquesta foto correcta (s/N/x)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "no s'ha pogut mostrar el photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "No s'ha especificat cap raó" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "La clau ha estat substituïda" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "La clau ha estat compromesa" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "La clau ja no s'usa" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "L'ID d'usuari ja no és vàlid" @@ -5265,90 +5388,90 @@ "No hi ha cap valor de confiança assignat a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr "" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = No ho sé\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NO confie\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Hi confie absolutament\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = torna al menú principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " o = omet aquesta clau\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " x = ix\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "La vostra decisió? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Realment voleu assignar confiança absoluta a aquesta clau? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats que duen a una clau de confiança absoluta:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Aquesta clau pertany probablement al seu propietari\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Aquesta clau és nostra\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5360,112 +5483,112 @@ "«sí» a la següent pregunta\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Voleu usar de tota manera aquesta clau?" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVÃS: S'està usant una clau no fiable!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "AVÃS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està " "present.\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVÃS: Aquesta clau ha estat revocada pel propietari!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVÃS: Aquesta clau ha estat revocada pel propietari!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Açò podria significar que la signatura és falsificada.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVÃS: Aquesta subclau ha estat revocada pel propietari!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Nota: Aquesta clau ha estat desactivada.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: La clau ha caducat!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVÃS: Aquesta clau no ve certificada per una signatura de confiança!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " No hi ha res que indique que la signatura pertany al seu propietari.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVÃS: La clau NO és de confiança!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Probablement la signatura és FALSA.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "AVÃS: Aquesta clau no ve certificada per signatures prou fiables!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "No és segur que la signatura pertanya al seu propietari.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: es descarta: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: es descarta: la clau pública ja està present\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5473,33 +5596,33 @@ "\n" "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Usuari inexistent.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "La clau pública està desactivada.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "es descarta: la clau pública ja està establida\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "el destinatari predeterminat és desconegut «%s»\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: es descarta: la clau pública està desactivada\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "no hi ha adreces vàlides\n" @@ -5570,7 +5693,7 @@ msgstr "NOTA: aquesta clau ha estat revocada!" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "ha fallat build_packet: %s\n" @@ -5593,11 +5716,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Voleu crear un certificat de revocació per a aquesta clau? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "s'ha forçat l'eixida d'armadura ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "ha fallat make_keysig_packet: %s\n" @@ -5616,29 +5739,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "no s'ha trobat la clau secreta «%s»: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "no hi ha cap clau pública corresponent: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "la clau pública no coincideix amb la clau secreta!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Voleu crear un certificat de revocació per a aquesta clau? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "l'algorisme de protecció és desconegut\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTA: Aquesta clau no està protegida!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5657,34 +5780,34 @@ "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n" "disponibles a altres!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Seleccioneu la raó de la revocació:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancel·la" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Segurament voleu seleccionar %d ací)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Raó de la revocació: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(No es va donar una descripció)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "És açò correcte? " @@ -5764,18 +5887,18 @@ msgstr "" "AVÃS: no es pot desfer la nominació d'una clau com a revocador designat!\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n" # Werner FIXME: Use ngettext. jm -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5784,7 +5907,7 @@ "amb el rellotge)\n" # Werner FIXME: use ngettext. jm -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5792,25 +5915,25 @@ "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n" "amb el rellotge)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític " "desconegut\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5958,12 +6081,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -6010,86 +6133,85 @@ msgid "%s: trustdb created\n" msgstr "%s: s'ha creat la base de dades de confiança\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: no es pot escriure en la base de dades de confiança\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: la base de dades de confiança és invàlida\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error en actualitzar el registre de la versió: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error en llegir el registre de la versió: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error en escriure el registre de la versió: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de dades de confiança: ha fallat lseek: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s no és un fitxer de base de dades de confiança\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registre de versió amb número de registre %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: la versió de fitxer %d és invàlida\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error en llegir el registre lliure: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error en escriure el registre de directoris: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: no s'ha pogut posar a zero un registre: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: no s'ha pogut afegir un registre: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"la base de dades de confiança està corrompuda; per favor, executeu «gpg --fix-" -"trustdb».\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: s'ha creat la base de dades de confiança\n" #: g10/textfilter.c:147 #, c-format @@ -6138,137 +6260,145 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "el registre de confiança %lu no és del tipus demanat %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[revocada]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[caducada]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "desconeguda" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, 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:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "si us plau, feu un --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "s'està comprovant la base de dades de confiança\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "no s'han trobat claus amb confiança absoluta\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6549,48 +6679,48 @@ msgstr "heu trobat un bug... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "sí|si" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "ix" # «xX»? ivb -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "xX" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6614,6 +6744,15 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "La parella de claus DSA ha de tenir 1024 bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "la base de dades de confiança està corrompuda; per favor, executeu «gpg --" +#~ "fix-trustdb».\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n" diff -Nru gnupg-1.4.9/po/ChangeLog gnupg-1.4.10/po/ChangeLog --- gnupg-1.4.9/po/ChangeLog 2008-01-02 16:56:53.000000000 +0000 +++ gnupg-1.4.10/po/ChangeLog 2009-08-18 09:30:22.000000000 +0100 @@ -1,3 +1,51 @@ +2009-08-18 Werner Koch + + * fr.po: Fix regression. See bug#922. + + * it.po: Translation fix by Sythos. Fixes bug#920. + +2009-08-13 Werner Koch + + * de.po: Update. + +2009-07-14 Werner Koch + + * de.po: s/nicht-exportfähig/unwiderrufbar/. Reported by Simon + Richter. + +2009-07-13 Werner Koch + + * nl.po: Applied a small fix by Jeroen Leeuwestein. Fixes bug#1085. + +2009-06-17 Gaël Quéri (up) + + * fr.po: Updated. + +2009-06-02 Werner Koch + + * de.po: Applied a patch from Daniel Leidert to fix a bunch of + small typos. See also Debian bug report 314068. Fixes bug#1069. + +2008-09-30 David Ammouial (wk) + + * fr.po: Fix bug #922. + +2008-07-21 Daniel Nylander (wk) + + * sv.po: Update. + +2008-06-23 Ludwig Hügelschäfer (wk) + + * de.po: 3 typo fixes. + +2008-05-26 Werner Koch + + * de.po: Minor fixes submitted by Jan Seidel. Fixes bug#916. + +2008-03-27 Jedi (wk) + + * zh_TW.po: Minor update. + 2008-01-02 Jedi (wk) * zh_TW.po: Update. Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/cs.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/cs.gmo differ diff -Nru gnupg-1.4.9/po/cs.po gnupg-1.4.10/po/cs.po --- gnupg-1.4.9/po/cs.po 2008-03-25 08:53:05.000000000 +0000 +++ gnupg-1.4.10/po/cs.po 2009-09-02 17:19:37.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -39,13 +39,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "nemohu otevøít `%s': %s\n" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "poznámka: soubor random_seed není aktualizován\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "nemohu vytvoøit `%s': %s\n" @@ -132,174 +132,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "ulo¾ení fingerprintu se nezdaøilo: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "ulo¾ení datumu vytvoøení se nezdaøilo: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "ètení veøejného klíèe se nezdaøilo: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "odpovìï neobsahuje veøejný klíè\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "odpovìï neobsahuje RSA modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "odpovìï neobsahuje veøejný RSA exponent\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "funkce PIN callback zkonèila chybou: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN pro CHV%d je pøíli¹ krátký; minimální délka je %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "verifikace CHV%d se nezdaøila: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "pøístup k administrátorským pøíkazùm není nakonfigurován\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "chyba pøi získání CHV z karty\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "karta je trvale uzamèena!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, 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" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|PIN administrátora" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "pøístup k administrátorským pøíkazùm není nakonfigurován\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "tajné èásti klíèe nejsou dostupné\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Prosím vyberte dùvod revokace:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN pro CHV%d je pøíli¹ krátký; minimální délka je %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Nový PIN administrátora" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Nový PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "chyba pøi získání nového PINu: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "chyba pøi ètení aplikaèních dat\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "chyba pøi ètení fingerpritnu DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "klíè ji¾ existuje\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "existující klíè bude pøepsán\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generování nového klíèe\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "generování nového klíèe\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "chybí èasové razítko vytvoøení\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "schází RSA modulus nebo nemá velikost %d bitù\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "schází veøejný RSA exponent nebo je del¹í ne¾ %d bitù\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "schází RSA prime %s nebo nemá velikost %d bitù\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "nelze ulo¾it klíè: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "prosím poèkejte ne¾ bude klíè vygenerován ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "henerování klíèe se nezdaøilo\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "generování klíèe dokonèeno (%d sekund)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "neplatná struktura OpenPGP kraty (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "podpis %s, hashovací algoritmus %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "dosud vytvoøené podpisy: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Prosím vlo¾te PIN%%0A[podpis hotov: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "ovìøení administrátorského PIN je nyní prostøednictvím tohoto pøíkazu " "zakázáno\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "pøístup na %s se nezdaøil - vadná OpenPGP karta?\n" @@ -384,163 +430,225 @@ "neplatný znak (quoted-printable) v ASCII kódování - pravdìpodobnì byl pou¾it " "¹patný MTA\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGp karta není dostupná: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "Nalezena OpenPGP karta èíslo %s\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "nelze provést v dávkovém módu\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Tento pøíkaz není v módù %s dovolený.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Vá¹ výbìr? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[není nastaven]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "mu¾" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "¾ena" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "neuvedeno" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "není vy¾adováno" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "vy¾adováno" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Chyba: V souèasné verzi je povolenou pouze plain ASCII.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Chyba: Znak \"<\" nelze pou¾ít.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Chyba: Více mezer není povoleno.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Pøíjmení dr¾itele karty: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Jméno (køestní) dr¾itele karty: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Chyba: jméno a pøíjmení je pøíli¹ dlouhé (limit je %d znakù).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL pro získání veøejného klíèe: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Chyba: URL je pøíli¹ dlouhé (limit je %d znakù).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "chyba pøi vytváøení souboru klíèù (keyring)`%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pøi ètení `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "chyba pøi vytváøení `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Login (jménu úètu): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, 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:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Privátní DO data: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Chyba: Privátní DO je pøíli¹ dlouhé (limit je %d znakù).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Jazykové pøedvolby: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Chyba: neplatná délka øetezce s pøedvolbami.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Chyba: neplatný znak v øetìzci s pøedvolbami\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Zadejte pohlaví: M - mu¾ské, F - ¾enské nebo stisnìte mezerník: " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Chyba: neplatná odpovìï.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA fingerprint: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Chyba: nesprávnì naformátovaný fingerprint.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "operace s klíèem není mo¾ná: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "toto není OpenPGP karta" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "chyba pøi získání informací o aktuálním klíèi: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Pøepsat existující klíè? (a/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Jakou délku klíèe si pøejete? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Jakou délku klíèe si pøejete? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Jakou délku klíèe si pøejete? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "zaokrouhleno na %u bitù\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "velikost klíèe %s musí být v intervalu %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "chyba pøi ètení bloku tajného klíèe \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Vytvoøit zálohu ¹ifrovacího klíèe mimo kartu? (A/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "tajný klíè je na kartì ulo¾en\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Pøepsat existující klíèe? (a/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -551,138 +659,147 @@ " PIN = `%s' PIN administrátora = `%s'\n" "Toto nastavení mù¾ete zmìnit pøíkazem --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Prosím, vyberte druh klíèe, který chcete generovat:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Podepisovací klíè\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) ©ifrovací klíè\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Autentizaèní klíè\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Neplatný výbìr.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Prosím vyberte místo pro uchování klíèe:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "neznámý algoritmus pro ochranu klíèe\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "tajné èásti klèe nejsou dostupné\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "tajný klíè je na kartì ulo¾en\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "chyba pøi zápisu souboru klíèù (keyring) `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ukonèit toto menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "zobraz administrátorské pøíkazy" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "ukázat tuto pomoc" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "vypi¹ v¹echna dostupná data" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "zmìní jméno majitele karty" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "zmìní URL pro záskání klíèe" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "získá klíè specifikovaný v URL karty" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "zmìnit login name" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "zmìnit jazykové pøedvolby" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "zmìní pohlaví dr¾itele karty" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "vypsat fingerprint certifikaèní autority" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 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:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "vytvoøit nový pár klíèù" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "nabídka pro zmìnu anebo odblokování PINu" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "ovìø PIN a vypi¹ v¹echna data" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Pøíkaz> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "pouze administrátorské pøíkazy\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "administrátorské pøíkazy jsou povoleny\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "administrátorské pøíkazy nejsou povoleny\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný pøíkaz (zkuste \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "tajný klíè není dostupný" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Prosím vo¾te kartu a stisknìte enter. Operaci zru¹íte stisknutím 'z': " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "smazání bloku klíèe se nezdaøilo: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -691,38 +808,38 @@ "Prosím vyjmìte kartu a vlo¾te jinou se seriovým èíslem:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 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:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Vlo¾te nový PIN administrátora: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Vlo¾te nový PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Vlo¾te PIN administrátora: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Vlo¾te PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Opakujte tento PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN není zopakován správnì; zkuste to znovu" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "nelze otevøít `%s'\n" @@ -731,13 +848,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pro tento pøíkaz není platný\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "klíè \"%s\" nenalezen: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -838,7 +955,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "vy¾ádaná symetrická ¹ifra %s (%d) nevyhovuje pøedvolbám pøíjemce\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "pou¾ití %s není v módu %s dovoleno\n" @@ -1236,7 +1353,7 @@ msgid "Pubkey: " msgstr "Veøejný klíè: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "©ifra: " @@ -1244,7 +1361,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Komprese: " @@ -1400,410 +1517,410 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitní soubor s mo¾nostmi `%s ignorován'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "soubor s mo¾nostmi `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "ètu mo¾nosti z `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' není platná doba expirace podpisu\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' není platná znaková sada\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "nelze zpracovat URL serveru klíèù\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parametr pro server klíèù\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "neplatný parametr pro server klíèù\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parametr pro import\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "neplatný parametr pro import\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parametr pro export\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "neplatný parametr pro export\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parametr pro výpis\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "neplatný parametr pro výpis\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "`%s' není platná doba expirace podpisu\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "zadané URL preferovaného serveru klíèù je neplaté\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "`%s' není platná doba expirace podpisu\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "`%s' není platná doba expirace podpisu\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parametr pro ovìøení\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "neplatný parametr pro ovìøení\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: neplatný parametr pro ovìøení\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVÁNÍ: %s pøepí¹e %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "Není dovoleno pou¾ívat %s s %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedává s %s smysl!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "POZNÁMKA: %s není v této verzi dostupné\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "nelze spustit s nebezpeènou pamìtí vzhledem k %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "vybraný komprimovací algoritmus je neplatný\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 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/gpg.c:3136 +#: g10/gpg.c:3135 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/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "neplatné defaultní pøedvolby\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro komprimaci\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s dosud není funkèní s %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat databázi dùvìry: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [jméno souboru]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [jméno souboru]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symetrické ¹ifrování `%s' se nepovedlo: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [jméno souboru]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [jméno souboru]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 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/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [jméno souboru]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jméno souboru]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [jméno souboru]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 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/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jméno souboru]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [jméno souboru]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [jméno souboru]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id u¾ivatele" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ivatele" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ivatele [pøíkazy]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "odeslání na keyserver se nezdaøilo: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "získání dat z keyserveru se nezdaøilo: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "export klíèe se nepodaøil: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "hledání na keyserveru se nezdaøilo: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh dat na keyserveru se nezdaøil: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódování z ASCII formátu selhalo: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódování do ASCII formátu selhalo: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" @@ -1848,17 +1965,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Neplatný klíè %s zmìnìn na platný pomocí --always-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "neexistuje tajný podklíè pro veøejný klíè %s - ignorováno\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "pou¾ívám podklíè %s místo primárního klíèe %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "klíè %s: tajný klíè bez klíèe veøejného - pøeskoèeno\n" @@ -1884,8 +2001,9 @@ msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Syntaxe: gpg [volby] [souboru]\n" @@ -2687,12 +2805,12 @@ msgid "keyring `%s' created\n" msgstr "soubor klíèù (keyring) `%s' vytvoøen\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "zdroj bloku klíèe `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "selhalo obnovení vyrovnávací pamìti klíèù: %s\n" @@ -2741,7 +2859,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "objeveno %d identifikátorù u¾ivatele bez platného podpisu jím samým\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2753,12 +2871,12 @@ "kontrolou fingerprintù z rùzných zdrojù...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Dùvìøuji èásteènì\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Dùvìøuji úplnì\n" @@ -2978,8 +3096,8 @@ msgid "Really sign? (y/N) " msgstr "Skuteènì podepsat? (a/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "podepsání selhalo: %s\n" @@ -2990,19 +3108,19 @@ "K dispozici je jen kontrolní souèet klíèe nebo je klíè na kartì - passphrase " "nelze zmìnit.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Tento klíè není chránìný.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Tajné èásti primárního klíèe nejsou dostupné.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Tajná èást primárního klíèe jsou ulo¾eny na kartì.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Klíè je chránìný.\n" @@ -3019,7 +3137,7 @@ "Vlo¾te nové heslo (passphrase) pro tento tajný klíè.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "heslo není zopakováno správnì; zkuste to znovu" @@ -3332,45 +3450,45 @@ msgid "Really update the preferences? (y/N) " msgstr "Opravdu aktualizovat pøedvolby? (a/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Ulo¾it zmìny? (a/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Ukonèit bez ulo¾ení? (a/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "aktualizace selhala: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizace tajného klíèe selhala: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Hash: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Vlastnosti: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Keyserver bez modifikace" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Preferovaný keyserver: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "" @@ -3378,71 +3496,71 @@ "Mo¾nosti:\n" " " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "V %s tento klíè revokoval %s klíèem %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Tento klíè mù¾e být revokován %s klíèem %s " -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(citlivá informace)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "vytvoøen: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revokován: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "platnost skonèila: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "platnost skonèí: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "pou¾ití: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "dùvìra: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "platnost: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Tento klíè byl oznaèen za neplatný (disabled)" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "èíslo karty: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3450,17 +3568,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revokován" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "platnost skonèila" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3468,7 +3586,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3477,74 +3595,74 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Smazat tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Smazat tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Smazat tento neznámý podpis? (a/N/u)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Smazán %d podpis.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Smazáno %d podpisù.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nic nebylo smazáno.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "neplatný" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "U¾ivatelské ID \"%s\": je ji¾ odstranìno.\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "klíè %s: \"%s\" %d podpisù odstranìno\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "klíè %s: \"%s\" %d podpisù odstranìno\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "U¾ivatelské ID \"%s\": je ji¾ odstranìno.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "U¾ivatelské ID \"%s\": je ji¾ odstranìno.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3553,252 +3671,257 @@ "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:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "tento klíè ji¾ bykl povìøen revokací\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 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:3522 +#: g10/keyedit.c:3524 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:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Prosím, vyberte nejvý¹e jeden podklíè.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Mìním dobu expirace podklíèe.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Mìním dobu expirace primárního klíèe.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "V souboru tajných klíèù chybí odpovídající podpis\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "VAROVÁNÍ: podepisovací podklíè %s není køí¾ovì certifikován\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Vlo¾te URL preferovaného keyserveru: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 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:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete smazat? (a/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Podepisovací notace: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Pøepsat (a/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Neexistuje u¾ivatelské ID s hashem %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Neexistuje podklíè s indexem %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ivatele:\"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (neexportovatelné)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (nerevokovatelné)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, 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:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte se revokovat tyto podpisy:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "neexistuje tajný klíè\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Klíè %s je ji¾ revokován.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Podklíè %s je ji¾ revokován.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "duplicita pøedvolby `%s'\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "pøíli¹ mnoho pøedvoleb pro ¹ifrování\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "pøíli¹ mnoho pøedvoleb pro vzorkování\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "pøíli¹ mnoho pøedvoleb pro komprimaci\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "neplatná polo¾ka `%s' v øetìzci s pøedvolbami\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "zapisuji podpis klíèe jím samým (direct signature)\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "zapisuji podpis klíèe sebou samým\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "zapisuji \"key-binding\" podpis\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná délka klíèe; pou¾iji %u bitù\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "délka klíèe zaokrouhlena na %u bitù\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Podepisování" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "©ifrování" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autentizace" @@ -3811,109 +3934,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Pro klíè %s lze provést: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Aktuálnì povolené akce: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Zapnout/vypnout schopnost ¹ifrovat\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Konec\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Prosím, vyberte druh klíèe, který chcete:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA a ElGamal (implicitní)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA a ElGamal (implicitní)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (pouze pro podpis)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (nastavit si vlastní pou¾ití)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (pouze pro podpis)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (pouze pro ¹ifrování)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (pouze pro podpis)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (pouze pro ¹ifrování)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (nastavit si vlastní pou¾ití)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (nastavit si vlastní pou¾ití)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Pár DSA klíèù DSA dlouhý %u bitù.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (nastavit si vlastní pou¾ití)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "klíè %s mù¾e mít délku v intervalu %u a¾ %u bitù.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Jakou délku klíèe si pøejete? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "velikost klíèe %s musí být v intervalu %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "Jakou délku klíèe si pøejete? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná délka klíèe je %u bitù.\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "zaokrouhleno na %u bitù\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3929,7 +4047,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:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3945,38 +4063,38 @@ " m = doba platnosti podpisu skonèí za n mìsícù\n" " y = doba platnosti podpisu skonèí za n let\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Klíè je platný pro? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Podpis je platný pro? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Platnost klíèe nikdy neskonèí\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Platnost podpisu nikdy neskonèí\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Platnost klíèe skonèí v %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Platnost podpisu skonèí v %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3984,11 +4102,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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Je to správnì (a/N)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4004,44 +4122,44 @@ " \"Magda Prochazkova (student) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Jméno a pøíjmení: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Neplatný znak ve jménì\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Jméno nemù¾e zaèínat èíslicí\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Jméno musí být dlouhé alespoò 5 znakù\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Komentáø: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentáøi\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾íváte znakovou sadu `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4052,7 +4170,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4067,25 +4185,25 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "jJkKeEPpUu" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Nejdøív, prosím, opravte chybu\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4093,12 +4211,12 @@ "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4110,7 +4228,7 @@ "tohoto programu s parametrem \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4123,50 +4241,50 @@ "pou¾ívat disky); díky tomu má generátor lep¹í ¹anci získat dostatek " "entropie.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Vytváøení klíèe bylo zru¹eno.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisuji veøejný klíè do `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor veøejných klíèù (pubring): %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor tajných klíèù (secring): %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, 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:3122 +#: g10/keygen.c:3308 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:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4174,12 +4292,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4187,7 +4305,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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4195,25 +4313,25 @@ "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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Opravdu vytvoøit? (a/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "ulo¾ení klíèe na kartu se nezdaøilo: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "nemohu vytvoøit zálohu souboru `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "POZNÁMKA: záloha klíèe z karty ulo¾ena do `%s'\n" @@ -4246,246 +4364,246 @@ msgid "Keyring" msgstr "soubor klíèù (keyring)" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primární fingerprint klíèe:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Primární fingerprint klíèe:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Fingerprint klíèe =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Seriové èíslo karty =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "pøejmenování `%s' na `%s' se nezdaøilo: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VAROVÁNÍ: Existují dva soubory s tajnými informacemi.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s je beze zmìny\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s je nový\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Prosím, opravte tento mo¾ný bezpeènostní problém\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "cache souboru klíèù `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu klíèù ji¾ ulo¾eno v cache (%lu podpisù)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu klíèù ulo¾eno v cache (%lu podpisù)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: soubor klíèù (keyring) vytvoøen\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Vlo¾te URL preferovaného keyserveru: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "VAROVÁNÍ: volba `%s' pro server klíèù není na této platformì úèinná\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "disabled" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "klíè \"%s\" nebyl na serveru klíèù nalezen\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "klíè nebyl na serveru klíèù nalezen\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "po¾aduji klíè %s ze %s server %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "po¾aduji klíè %s z %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "vyhledávám \"%s\" na %s serveru %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "vyhledávám \"%s\" na serveru %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "posílám klíè %s na %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "vyhledávám \"%s\" na %s serveru %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "vyhledávám \"%s\" na serveru %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "¾ádná operace se serverem klíèù!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, 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:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "server klíèù neposlal VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 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:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "protokol serveru klíèù `%s' není podporován\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, 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:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s nepodporuje protokol verze %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "èasový limit pro server klíèù vypr¹el\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "interní chyba serveru klíèù\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "chyba komunikace se serverem klíèù: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" není ID klíèe: pøeskoèeno\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "aktualizuji 1 klíè z %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "aktualizuji %d klíèù z %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n" @@ -4646,62 +4764,62 @@ msgid "[uncertain]" msgstr "[nejistý]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " alias \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Platnost podpisu skonèila %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Platnost podpisu skonèí %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "podpis %s, hashovací algoritmus %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binární formát" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "textový formát" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "neznámý formát" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Nemohu ovìøit podpis: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "toto není podpis oddìlený od dokumentu\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "VAROVÁNÍ: detekováno více podpisù. Kontrolován bude pouze první.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "samostatný podpis tøídy 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starého typu (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "nalezen neplatný koøenový paket v proc_tree()\n" @@ -4740,59 +4858,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "VAROVÁNÍ: pou¾ívám experimentální hashovací algoritmus %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "VAROVÁNÍ: vy¾ádaný algoritmus %s není doporuèen\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA modul pro GnuPG nenalezen\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "Více informací naleznete na adrese http://www.gnupg.cz/faq.html\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "VAROVÁNÍ: vy¾ádaný algoritmus %s není doporuèen\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "POZNÁMKA: %s není v této verzi dostupné\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: pou¾ití parametru \"%s\" se nedoporuèuje\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VAROVÁNÍ: pou¾ívání parametru \"%s\" se nedoporuèuje\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "pou¾ijte místo nìj \"%s%s\" \n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "VAROVÁNÍ: pou¾ívání pøíkaz \"%s\" se nedoporuèuje - nepou¾ívejte jej\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Nezakomprimováno" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "nezakomprimováno|nic" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "tato zpráva nemusí být s %s pou¾itelná\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "nejednoznaèné volby `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "neznámá volba `%s'\n" @@ -4844,11 +4967,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "nemohu pracovat s algoritmem veøejného klíèe %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "VAROVÁNÍ: potencionálnì nebezpeènì symetricky za¹ifrován klíè sezení\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" @@ -4934,7 +5057,7 @@ msgid "Repeat passphrase: " msgstr "Opakujte heslo: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4948,58 +5071,58 @@ "klíèi - velký obrázek bude mít za následek velmi velký veøejný klíè !\n" "Vhodná velikost obrázku je asi 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Vlo¾te jméno JPEG souboru s fotografickým ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "nelze otevøít JPEG soubor `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Tento JPEG je opravdu velký (%d bajtù)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete pou¾ít? (a/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' není soubor ve formátu JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Je tato fotografie správná (a/N/u)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "nelze zobrazit photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Dùvod nebyl specifikován" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Klíè je nahrazen" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Klíè byl zkompromitován" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Klíè se ji¾ nepou¾ívá" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Identifikátor u¾ivatele ji¾ neplatí" @@ -5019,44 +5142,44 @@ msgid "No trust value assigned to:\n" msgstr "Není pøiøazena ¾ádná hodnota dùvìry:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " alias \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Nakolik dùvìøujete tvrzení, ¾e tento klíè patøí uvedenému u¾ivateli?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Nevím nebo neøeknu\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Nedùvìøuji\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Dùvìøuji absolutnì\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = zpìt do hlavního menu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = pøeskoèit tento klíè\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " u = ukonèit\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5065,37 +5188,37 @@ "Minimální úroveò dùvìry tohoto klíèe je: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Va¹e rozhodnutí? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 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? (a/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 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:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: Nic nenaznaèuje tomu, ¾e tento klíè patøí uvedenému u¾ivateli\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: Je zde èásteèná dùvìra, ¾e tento klíè patøí uvedenému uv¾ivateli\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Tento klíè pravdìpodobnì nále¾í uvedenému u¾ivateli\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 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:462 +#: g10/pkclist.c:463 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" @@ -5106,108 +5229,108 @@ "následující otázku odpovìdìt ano\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Pou¾ít pøesto tento klíè? (a/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "VAROVÁNÍ: Je pou¾it nedùvìryhodný klíè!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "VAROVÁNÍ: tento klíè mù¾e být revokován (revokaèní klíè nenalezen)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "VAROVÁNÍ: Tento klíè byl revokován klíèem s povìøením k revokaci!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "VAROVÁNÍ: Tento klíè byl revokován svým vlastníkem!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " To mù¾e znamenat, ¾e podpis je padìlaný.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "VAROVÁNÍ: Tento podklíè byl revokován svým vlastníkem!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Poznámka: Tento klíè byl oznaèen jako neplatný (disabled).\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Poznámka: Skonèila platnost tohoto klíèe!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "VAROVÁNÍ: Tento klíè není certifikován dùvìryhodným podpisem!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Nic nenaznaèuje tomu, ¾e tento podpis patøí vlastníkovi klíèe.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "VAROVÁNÍ: NEdùvìøujeme tomuto klíèi!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Tento podpis je pravdìpodobnì PADÌLANÝ.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "VAROVÁNÍ: Tento klíè není certifikován dostateènì dùvìryhodnými podpisy!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Není jisté, zda tento podpis patøí vlastníkovi.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pøeskoèeno: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: pøeskoèeno: veøejný klíè je ji¾ obsa¾en v databázi\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Nespecifikoval jste identifikátor u¾ivatele (user ID). Mù¾ete pou¾ít \"-r\"\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Aktuální pøíjemci:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5215,33 +5338,33 @@ "\n" "Napi¹te identifikátor u¾ivatele (user ID). Ukonèete prázdným øádkem: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Takový identifikátor u¾ivatele neexistuje.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "pøeskoèeno: veøejný klíè je u¾ nastaven podle implicitního adresáta\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Veøejný klíè je neplatný (disabled).\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "pøeskoèeno: veøejný klíè je ji¾ nastaven\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "neznámý implicitní adresát \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: pøeskoèeno: veøejný klíè je neplatný (disabled)\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "¾ádné platné adresy\n" @@ -5310,7 +5433,7 @@ msgstr "POZNÁMKA: klíè byl revokován" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "selhalo vytvoøení paketu (build_packet): %s\n" @@ -5332,11 +5455,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Vytvoøit pro tento klíè povìøený revokaèní certifikát? (a/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "naøízen výstup do formátu ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "vytvoøení podepisovacího paketu (make_keysig_packet) selhalo: %s\n" @@ -5355,28 +5478,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "tajný klíè \"%s\" nenalezen: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "neexistuje odpovídající veøejný klíè: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "veøejný klíè neodpovídá tajnému klíèi!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Vytvoøit pro tento klíè revokaèní certifikát? (a/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "neznámý kompresní algoritmus\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "POZNÁMKA: Tento klíè není chránìný!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5395,33 +5518,33 @@ "na Va¹em poèítaèi mù¾e ukládat data urèená k tisku a zpøístupnist je\n" "jiným u¾ivatelùm!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Prosím vyberte dùvod revokace:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Zru¹it" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Pravdìpodobnì zda chcete vybrat %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Mù¾ete vlo¾it dal¹í popis. Ukonèete prázdným øádkem:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Dùvod revokace: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Nebyl zadán ®ádný popis)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Je dùvod revokace vybrán správnì? (a/N) " @@ -5497,17 +5620,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "VAROVÁNÍ: podepisovací podklíè %s má neplatnou køí¾ovou certifikaci\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "veøejný klíè %s je o %lu sekund novìj¹í ne¾ podpis\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "veøejný klíè %s je o %lu sekund novìj¹í ne¾ podpis\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5515,7 +5638,7 @@ "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:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5523,24 +5646,24 @@ "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:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "POZNÁMKA: podpisovému klíèi %s skonèila platnost %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, 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 %s, proto¾e je nastaven neznámý kritický " "bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "klíè %s: neexistuje podklíè pro revokaci podklíèe\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "klíè %s: podklíè který je svázán s podpisem neexistuje\n" @@ -5683,12 +5806,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "databáze dùvìry: synchronizace selhala %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "záznam v databázi dùvìry %lu: lseek() se nepodaøil: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "záznam v databázi dùvìry %lu: zápis se nepodaøil (n=%d): %s\n" @@ -5732,84 +5855,85 @@ msgid "%s: trustdb created\n" msgstr "%s: databáze dùvìry vytvoøena\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "POZNÁMKA: do trustedb nezle zapisovat\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: neplatná databáze dùvìry\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nepodaøilo se vytvoøit hashovací tabulku: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: chyba pøi aktualizaci záznamu verze: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: chyba pøi ètení záznamu verze: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: chyba pøi zápisu záznamu verze: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "databáze dùvìry: procedura lseek() selhala: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "databáze dùvìry: procedura read() (n=%d) selhala: %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: není soubor databáze dùvìry\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: záznam verze s èíslem %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: neplatná verze souboru %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: chyba pøi ètení volného záznamu: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: chyba pøi zápisu adresáøového záznamu: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: vynulování záznamu selhalo: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: pøidání záznamu selhalo: %s\n" #: g10/tdbio.c:1502 -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" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: databáze dùvìry vytvoøena\n" #: g10/textfilter.c:147 #, c-format @@ -5856,122 +5980,130 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "záznam dùvìry %lu není po¾adovaného typu %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, 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:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "poui¾ití modelu dùvìry %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" "14 fixní délka na kterou se pøekládá see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revokován ]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ expirován ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ neznámá ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[nedefinovaná]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ èásteèná ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ plná ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ absolutní ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "nedefinována" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "¾ádná" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "èásteèná" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "plná" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "absolutní" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "veøejný klíè %s nebyl nalezen: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "prosím proveïte --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "kontroluji databázi dùvìry\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "zpracováno %d klíèù (%d validit vymazáno)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "¾ádný absolutnì dùvìryhodný klíè nebyl nalezen\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, 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:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5979,7 +6111,7 @@ "hloubka: %d platných: %3d podepsaných: %3d dùvìra: %d-, %dq, %dn, %dm, %" "df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6239,47 +6371,47 @@ msgstr "nalezena chyba v programu ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ano" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "aAyY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "ne" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "ukonèit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "uUqQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okey|okey" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "zru¹it|zru¹it" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "zZ" @@ -6299,6 +6431,16 @@ 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 "DSA keypair will have %u bits.\n" +#~ msgstr "Pár DSA klíèù DSA dlouhý %u bitù.\n" + +#~ 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" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|PIN administrátora" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "notaci (notation) nelze ulo¾it ve formátu v3 podpisu (formát PGP 2.x)\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/da.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/da.gmo differ diff -Nru gnupg-1.4.9/po/da.po gnupg-1.4.10/po/da.po --- gnupg-1.4.9/po/da.po 2008-03-25 08:53:06.000000000 +0000 +++ gnupg-1.4.10/po/da.po 2009-09-02 17:19:37.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -40,13 +40,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" @@ -78,9 +77,10 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "kan ikke oprette %s: %s\n" @@ -132,177 +132,222 @@ "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:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "ingen standard offentlig nøglering\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "Indtast bruger-id: " + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "hemmelig nøgle ikke tilgængelig" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "rev- forkert nøgletilbagekald\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "fejl ved oprettelse af kodesætning: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "fejl i trailerlinie\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "fjern nøgle fra den hemmelige nøglering" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "generér et nyt nøglepar" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "generér et nyt nøglepar" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" # er det klogt at oversætte TrustDB? -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Nøgleoprettelse annulleret.\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s signatur fra: %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "ingen gyldig OpenPGP data fundet.\n" @@ -387,176 +432,237 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "quoted printable-tegn i panser - måske pga. en fejlbehæftet MTA\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Dit valg? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "slåtil" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "slåtil" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "ikke bearbejdet" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "fejl ved skrivning af nøglering `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "fejl ved læsning af '%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "vis præferencer" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "fejl i trailerlinie\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "Fingeraftryk:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "fejl i trailerlinie\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "ingen gyldig OpenPGP data fundet.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Vil du gerne signere? " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Hvilken nøglestørrelse ønsker du? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Hvilken nøglestørrelse ønsker du? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Hvilken nøglestørrelse ønsker du? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rundet op til %u bit\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "fejl ved læsning af '%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "udelod: hemmelig nøgle er allerede tilstede\n" + +#: g10/card-util.c:1378 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Vil du gerne signere? " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -564,195 +670,204 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ugyldigt valg.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "ukendt kompressionsalgoritme" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "udelod: hemmelig nøgle er allerede tilstede\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "fejl ved skrivning af nøglering `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "afslut denne menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "vis denne hjælp" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Ingen hjælp tilgængelig" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "ændr udløbsdatoen" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "vis præferencer" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "vis fingeraftryk" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "generér et nyt nøglepar" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "" -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Indtast bruger-id: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "Indtast bruger-id: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 #, fuzzy msgid "Enter PIN: " msgstr "Indtast bruger-id: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Gentag kodesætning: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "kan ikke åbne `%s'\n" @@ -761,13 +876,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -864,7 +979,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "" @@ -1258,7 +1373,7 @@ msgid "Pubkey: " msgstr "" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "" @@ -1266,7 +1381,7 @@ msgid "Hash: " msgstr "" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 #, fuzzy msgid "Compression: " msgstr "Kommentar: " @@ -1402,419 +1517,419 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "alternativfil`%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "ugyldig nøglering" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig nøglering" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "ugyldig rustning" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "den givne politik-URL er ugyldig\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "ugyldig nøglering" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "RSA nøgle kan ikke bruges i denne version\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 #, fuzzy msgid "invalid default preferences\n" msgstr "vis præferencer" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis præferencer" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis præferencer" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis præferencer" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [nøglering]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" @@ -1862,17 +1977,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" @@ -1902,7 +2017,7 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" @@ -2600,12 +2715,12 @@ msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "ingen standard offentlig nøglering\n" @@ -2654,7 +2769,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2662,12 +2777,12 @@ "etc.)\n" msgstr "" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " (%d) ElGamal (kryptér kun)\n" @@ -2873,8 +2988,8 @@ msgid "Really sign? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "signering fejlede: %s\n" @@ -2883,21 +2998,21 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 #, fuzzy msgid "Secret parts of primary key are not available.\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Nøglen er beskyttet.\n" @@ -2912,7 +3027,7 @@ "\n" msgstr "" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" @@ -3253,47 +3368,47 @@ msgid "Really update the preferences? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gem ændringer? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Afslut uden at gemme? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "" @@ -3301,438 +3416,443 @@ "Indstillinger:\n" " " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "kan ikke oprette %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "tilføj nøgle" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr "betro" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr "betro" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "tilføj nøgle" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "udløb" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 #, 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:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettede %d signatur.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "ugyldig rustning" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 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:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Indtast nøglens størrelse" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, 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:4139 +#: g10/keyedit.c:4147 #, 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:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Overskriv (j/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "bruger-id: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 #, 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:4651 +#: g10/keyedit.c:4659 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr "signér en nøgle lokalt" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, 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:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "vis præferencer" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "vis præferencer" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "vis præferencer" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "vis præferencer" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 #, fuzzy msgid "writing direct signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "rundet op til %u bit\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "signér" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "kryptér data" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3745,109 +3865,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA og ElGamal (standard)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA og ElGamal (standard)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (signér kun)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) ElGamal (kryptér kun)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) DSA (signér kun)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1460 -#, fuzzy, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) DSA (signér kun)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA nøglepar vil have 1024 bit.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Hvilken nøglestørrelse ønsker du? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Hvilken nøglestørrelse ønsker du? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rundet op til %u bit\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3857,7 +3972,7 @@ " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3867,52 +3982,52 @@ " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "ugyldig værdi\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "Nøglen udløber aldrig\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "Nøglen udløber aldrig\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "Nøgle udløber d. %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Er dette korrekt (j/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3922,44 +4037,44 @@ "\n" msgstr "" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Rigtige navn: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Navn må ikke starte med et tal\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Navn skal være mindst 5 bogstaver langt\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Epostadresse: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ikke en gyldig epostadresse\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ugyldigt tegn i kommentar\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du bruger '%s' tegnsættet.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3970,7 +4085,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" @@ -3985,24 +4100,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 #, 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4010,12 +4125,12 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4023,7 +4138,7 @@ "\n" msgstr "" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4031,92 +4146,92 @@ "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Nøgleoprettelse annulleret.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" msgstr "" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan ikke oprette %s: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "hemmelige nøgler import: %lu\n" @@ -4151,256 +4266,256 @@ msgid "Keyring" msgstr "" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 #, fuzzy msgid "Primary key fingerprint:" msgstr "vis nøgle og fingeraftryk" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 #, fuzzy msgid " Primary key fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Fingeraftryk:" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "vis nøgler og signaturer" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "vis nøgler og signaturer" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "den givne politik-URL er ugyldig\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "slåfra" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ugyldig nøglering" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "eksportér nøgler til en nøgletjener" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "eksportér nøgler til en nøgletjener" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "ugyldig nøglering" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "generel fejl" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "generel fejl" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "kan ikke åbne %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "" @@ -4557,64 +4672,64 @@ msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signatur fra: %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 #, fuzzy msgid "unknown" msgstr "ukendt version" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan ikke tjekke signatur: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 #, fuzzy msgid "not a detached signature\n" msgstr "opret en separat signatur" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "gammeldags (PGP 2.x) signatur\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -4653,61 +4768,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s signatur fra: %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "ADVARSEL: '%s' er en tom fil\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "ADVARSEL: '%s' er en tom fil\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "RSA nøgle kan ikke bruges i denne version\n" + +#: g10/misc.c:748 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/misc.c:719 +#: g10/misc.c:774 #, fuzzy msgid "Uncompressed" msgstr "ikke bearbejdet" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "ikke bearbejdet" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "ukendt standard modtager '%s'\n" @@ -4760,11 +4880,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -4849,7 +4969,7 @@ msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4858,63 +4978,63 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "kan ikke åbne %s: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "%s er ikke et gyldigt tegnsæt\n" # virker j automatisk istedetfor y? -#: g10/photoid.c:163 +#: g10/photoid.c:164 #, fuzzy msgid "Is this photo correct (y/N/q)? " msgstr "Er dette korrekt (j/n)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 #, fuzzy msgid "unable to display photo ID!\n" msgstr "kan ikke åbne %s: %s\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 #, fuzzy msgid "Key is superseded" msgstr "Nøglen er beskyttet.\n" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "" @@ -4938,233 +5058,233 @@ "Ingen tillidsværdi tildelt til %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alias \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Denne nøgle tilhører sikkert ejeren\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr "" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr "%08lX: Vi stoler IKKE på denne nøgle\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = tilbage til hovedmenu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr "%s: udelod: %s\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = afslut\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Dit valg? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr " Intet tyder på at denne signatur tilhører ejeren.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr " Intet tyder på at denne signatur tilhører ejeren.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Denne nøgle tilhører sikkert ejeren\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Denne nøgle tilhører os\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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 "" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Brug denne nøgle alligevel? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ADVARSEL: Bruger nøgle uden tillid!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Dette kan betyde at signaturen er forfalsket.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ADVARSEL: Denne undernøgle er blevet tilbagekaldt af dens ejer!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 #, fuzzy msgid "Note: This key has been disabled.\n" msgstr "Bemærk: Denne nøgle er forældet!\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Bemærk: Denne nøgle er forældet!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Intet tyder på at denne signatur tilhører ejeren.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Signaturen er formentlig FORFALSKET.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Det er ikke sikkert at signaturen tilhører ejeren.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: udelod: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 #, fuzzy msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n" "\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " msgstr "" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Ingen sådan bruger-id.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "udeladt: offentlig nøgle er allerede valgt som standard modtager\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Offentlig nøgle er slået fra.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 #, fuzzy msgid "skipped: public key already set\n" msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "ukendt standard modtager '%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: udelod: offentlignøgle er slået fra\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "ingen gyldige adresser\n" @@ -5232,7 +5352,7 @@ msgstr "nøgle %08lX: nøgle er blevet annulleret!\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, fuzzy, c-format msgid "build_packet failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" @@ -5255,11 +5375,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, fuzzy, c-format msgid "make_keysig_packet failed: %s\n" msgstr "signering fejlede: %s\n" @@ -5279,31 +5399,31 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, fuzzy, c-format msgid "no corresponding public key: %s\n" msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/revoke.c:533 +#: g10/revoke.c:531 #, fuzzy msgid "unknown protection algorithm\n" msgstr "ukendt kompressionsalgoritme" -#: g10/revoke.c:541 +#: g10/revoke.c:539 #, fuzzy msgid "NOTE: This key is not protected!\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5314,34 +5434,34 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Brug denne nøgle alligevel? " @@ -5416,44 +5536,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" @@ -5582,12 +5702,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5631,83 +5751,83 @@ msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgid "Error: The trustdb is corrupted.\n" msgstr "" #: g10/textfilter.c:147 @@ -5755,130 +5875,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "tilføj nøgle" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "udløb" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "ukendt version" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "offentlig nøgle ikke fundet" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 #, fuzzy msgid "checking the trustdb\n" msgstr "|[NAMES]|tjek tillidsdatabasen" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6139,47 +6267,47 @@ msgstr "du fandt en fejl ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ja" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "n" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "afslut" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "aA" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6202,6 +6330,10 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n" #, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA nøglepar vil have 1024 bit.\n" + +#, fuzzy #~ msgid "a user notation name must contain the '@' character\n" #~ msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/de.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/de.gmo differ diff -Nru gnupg-1.4.9/po/de.po gnupg-1.4.10/po/de.po --- gnupg-1.4.9/po/de.po 2008-03-25 08:53:06.000000000 +0000 +++ gnupg-1.4.10/po/de.po 2009-09-02 17:19:37.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gnupg-1.4.8\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2007-12-19 17:35+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2009-09-02 15:45+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -41,13 +41,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "es wird auf die Sperre `%s' gewartet...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" @@ -80,9 +79,10 @@ msgid "note: random_seed file not updated\n" msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "'%s' kann nicht erzeugt werden: %s\n" @@ -137,173 +137,216 @@ "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "Die Antwort enthält das RSA-Modulus nicht\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "Die Standard-PIN wird für %s benutzt\n" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" +"Die Standard-PIN konnte für %s nicht benutzt werden: %s - sie wird vorläufig " +"ausgeschaltet\n" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "||Bitte die PIN eingeben" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN-Callback meldete Fehler: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "Fehler beim Holen des CHV-Status' von der Karte\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "Karte ist dauerhaft gesperrt!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" -msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n" +msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n" + +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "|A|Bitte die Admin PIN eingeben%%0A[verbleibende Versuche: %d]" + +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "|A|Bitte die Admin PIN eingeben" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin-PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "Der Rückstellcode ist nicht oder nicht mehr vorhanden\n" + +#: g10/app-openpgp.c:2028 +msgid "||Please enter the Reset Code for the card" +msgstr "||Bitte geben Sie den Rückstellcode der karte ein" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "|RN|Neuer Rückstellcode" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Neue Admin-PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Neue PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "Fehler beim Abfragen einer neuen PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "Fehler beim Lesen der Anwendungsdaten\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "Fehler beim Lesen des Fingerabdrucks DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "Schlüssel existiert bereits\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "Existierender Schlüssel wird ersetzt werden\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "neue Schlüssel werden erzeugt\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +msgid "writing new key\n" +msgstr "der neue Schlüssel wird geschrieben\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "Erzeugungsdatum fehlt\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" -msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n" +msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "Schlüsselerzeugung fehlgeschlagen\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" -msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n" +msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n" + +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "Anzahl bereits erzeugter Signaturen: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -"Die Ãœberprüfung der Admin PIN is momentan durch einen Befehl verboten " +"Die Ãœberprüfung der Admin PIN ist momentan durch einen Befehl verboten " "worden\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n" @@ -387,165 +430,230 @@ "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n" " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP Karte ist nicht vorhanden: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP Karte Nr. %s erkannt\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "Dieser Befehl ist nur für Karten der Version 2 verfügbar.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Ihre Auswahl? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[nicht gesetzt]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "männlich" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "weiblich" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "unbestimmt" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "nicht zwingend" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "zwingend" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Familienname des Kartenbesitzers:" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Vorname des Kartenbesitzers:" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL um den öffentlichen Schlüssel zu holen: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, c-format +msgid "error allocating enough memory: %s\n" +msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, c-format +msgid "error writing `%s': %s\n" +msgstr "Fehler beim Schreiben von `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Logindaten (Kontenname): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Geheime DO-Daten: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Spracheinstellungen" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Fehler: ungültige Antwort.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA-Fingerabdruck: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Fehler: ungültig geformter Fingerabdruck.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "Schlüsseloperation nicht möglich: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "Keine gültige OpenPGP-Karte" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Vorhandenen Schlüssel ersetzen? (j/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" +"Hinweis: Es kann nicht sichergestellt werden, daß die Karte die\n" +" angeforderte Schlüssellange unterstützt. Falls die \n" +" Schlüsselerzeugung fehlschlägt, sollten Sie in den Unterlagen\n" +" zu Ihrer Karte nachsehen, welche Längen möglich sind.\n" + +#: g10/card-util.c:1292 +#, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Welche Länge wünschen Sie für den Signaturschlüssel? (%u) " + +#: g10/card-util.c:1294 +#, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Welche Länge wünschen Sie für den Verschlüsselungsschlüssel? (%u) " + +#: g10/card-util.c:1295 +#, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Welche Länge wünschen Sie für den Authentifizierungsschlüssel? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "aufgerundet auf %u Bit\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" +"Die Karten wird nun umkonfiguriert um Schlüssel von %u Bit zu erzeugen\n" + +#: g10/card-util.c:1339 +#, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "Fehler bem Ändern der Länge des Schlüssels %d auf %u Bits: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ACHTUNG: Auf der Karte sind bereits Schlüssel gespeichert!\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Vorhandene Schlüssel ersetzen? (j/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -556,139 +664,148 @@ " PIN = `%s' Admin-PIN = `%s'\n" "Sie sollten sie mittels des Befehls --change-pin ändern\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Unterschriften-Schlüssel\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Verschlüsselungs-Schlüssel\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Authentisierungs-Schlüssel\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ungültige Auswahl.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Wählen Sie den Speicherort für den Schlüssel:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "Unbekanntes Schlüssel-Schutzverfahren\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" -msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n" +msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, c-format +msgid "error writing key to card: %s\n" +msgstr "Fehler beim Schreiben des Schlüssels auf die Karte: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "Menü verlassen" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "Zeige Admin-Befehle" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "Alle vorhandenen Daten auflisten" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "Kartenbesitzernamen ändern" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "Schlüssel-holen-URL ändern" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "Holen des Schlüssels mittels der URL auf der Karte" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "Ändern der Logindaten" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "Ändern der Spracheinstellungen" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "Ändern des Geschlechts des Kartenbesitzers" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "Ändern des CA-Fingerabdrucks" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" -msgstr "Umschalte des \"Signature-force-PIN\"-Schalters" +msgstr "Umschalten des \"Signature-force-PIN\"-Schalters" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "neue Schlüssel erzeugen" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "Menü für Ändern oder Entsperren der PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "überprüfe die PIN und liste alle Daten auf" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "Blockierung der PIN mittels des Rückstellcodes aufheben" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Befehl> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "nur-Admin Befehl\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Admin-Befehle sind erlaubt\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Admin-Befehle sind nicht erlaubt\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "Kartenleser ist nicht vorhanden\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Legen Sie die Karte ein und drücken Sie 'Eingabe'; drücken Sie 'c' um " "abzubrechen: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "Auswahl der OpenPGP-Card-Anwendung fehlgeschlagen: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -698,37 +815,37 @@ "Seriennummer ein:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" "Drücken Sie 'Eingabe' wenn fertig; oder drücken Sie 'c' um abzubrechen: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Geben Sie die neue Admin-PIN ein: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Geben Sie die neue PIN ein: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Geben Sie die Admin-PIN ein: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Geben Sie die PIN ein: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Geben Sie die PIN nochmal ein: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" @@ -737,13 +854,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output funktioniert nicht bei diesem Befehl\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "Schlüssel \"%s\" nicht gefunden: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -854,7 +971,7 @@ "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) " "verletzt die Empfängervoreinstellungen\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" @@ -882,7 +999,7 @@ #: g10/encr-data.c:126 msgid "problem handling encrypted packet\n" -msgstr "Problem beim Bearbeiten des verschlüsselten Packets\n" +msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n" #: g10/exec.c:47 msgid "no remote program execution supported\n" @@ -1248,9 +1365,9 @@ #: g10/gpg.c:803 msgid "Pubkey: " -msgstr "Öff.Schlüssel: " +msgstr "Öff. Schlüssel: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Verschlü.: " @@ -1258,7 +1375,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Komprimierung: " @@ -1402,418 +1519,418 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht " "geladen\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' ist kein gültiger Zeichensatz\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ungültige Schlüsselserver-Option\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "Ungültige Schlüsselserver-Option\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungültige Import-Option\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "Ungültige Import-Option\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungültige Export-Option.\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "Ungültige Export-Option\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ungültige Listen-Option.\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "Ungültige Listen-Option\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "Zeige die Foto-ID während der Unterschriftenprüfung" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" -msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen" +msgstr "Alle Notationen während der Signaturprüfung anzeigen" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" -msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung" +msgstr "Zeige anwenderseitige Notationen während der Unterschriftenprüfung" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "" "Die URL für den bevorzugten Schlüsselserver während der " "Unterschriftenprüfung anzeigen" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s:%d: ungültige Ãœberprüfuns-Option.\n" +msgstr "%s:%d: ungültige Ãœberprüfungs-Option.\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "Ungültige Ãœberprüfungs-Option\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "ungültige \"auto-key-locate\"-Liste\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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üsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-" "Verschlüsselung\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 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/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "ungültige Standard-Voreinstellungen\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "ungültige private Verschlüsselungsvoreinstellungen\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "ungültige private Hashvoreinstellungen\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "ungültige private Komprimierungsvoreinstellungen\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s arbeitet noch nicht mit %s zusammen\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [Dateiname]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [Dateiname]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet " "werden\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "Schlüsselexport fehlgeschlagen: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" @@ -1858,18 +1975,18 @@ msgstr "" "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "Kein privater Unterschlüssel zum öffentlichen Unterschlüssel %s - ignoriert\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -1893,13 +2010,15 @@ #: g10/gpgv.c:99 msgid "Usage: gpgv [options] [files] (-h for help)" -msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" +msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h für Hilfe)" #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" -msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n" +msgstr "" +"Aufruf: gpgv [Optionen] [Dateien]\n" +"Ãœberprüft Signaturen gegen bekannte vertrauenswürdige Schlüssel\n" #: g10/helptext.c:47 msgid "" @@ -1921,7 +2040,7 @@ msgstr "" "Um das Web-of-Trust aufzubauen muß GnuPG wissen, welchen Schlüsseln\n" "uneingeschränkt vertraut wird. Das sind üblicherweise die Schlüssel\n" -"auf deren geheimen Schlüssel Sie Zugruff haben.\n" +"auf deren geheimen Schlüssel Sie Zugriff haben.\n" "Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu vertrauen\n" #: g10/helptext.c:60 @@ -1949,7 +2068,7 @@ "\n" "The first (primary) key must always be a key which is capable of signing." msgstr "" -"Wählen Sie das zu verwendene Verfahren.\n" +"Wählen Sie das zu verwendende Verfahren.\n" "\n" "DSA (alias DSS) ist der \"Digital Signature Algorithm\" und kann nur für\n" "Unterschriften genutzt werden.\n" @@ -1970,8 +2089,8 @@ msgstr "" "Normalerweise ist es nicht gut, denselben Schlüssel zum unterschreiben\n" "und verschlüsseln zu nutzen. Dieses Verfahren sollte in speziellen\n" -"Anwendungsgebiten benutzt werden. Bitte lassen Sie sich zuerst von \n" -"einem Sicherheistexperten beraten." +"Anwendungsgebieten benutzt werden. Bitte lassen Sie sich zuerst von \n" +"einem Sicherheitsexperten beraten." #: g10/helptext.c:89 msgid "Enter the size of the key" @@ -2223,7 +2342,7 @@ msgstr "" "Sie sollten einen Grund für die Zertifizierung angeben. Je nach\n" "Zusammenhang können Sie aus dieser Liste auswählen:\n" -" \"Schlüssel wurde kompromitiert\"\n" +" \"Schlüssel wurde kompromittiert\"\n" " Falls Sie Grund zu der Annahme haben, daß nicht berechtigte Personen\n" " Zugriff zu Ihrem geheimen Schlüssel hatten\n" " \"Schlüssel ist überholt\"\n" @@ -2350,7 +2469,7 @@ #: g10/import.c:318 #, c-format msgid " secret keys unchanged: %lu\n" -msgstr " unveränderte geh.Schl.: %lu\n" +msgstr " unveränderte geh. Schl.: %lu\n" #: g10/import.c:320 #, c-format @@ -2370,7 +2489,7 @@ #: g10/import.c:565 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "WARNING: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n" +msgstr "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n" #. TRANSLATORS: This string is belongs to the previous one. They are #. only split up to allow printing of a common prefix. @@ -2400,7 +2519,7 @@ #: g10/import.c:645 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -"diesen Schüssel wieder zu verteilen, um mögliche Probleme durch unpassende " +"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende " "Verfahrenskombinationen zu vermeiden\n" #: g10/import.c:669 @@ -2724,12 +2843,12 @@ msgid "keyring `%s' created\n" msgstr "Schlüsselbund `%s' erstellt\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "Schlüsselblockhilfsmittel`%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n" @@ -2778,7 +2897,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2791,12 +2910,12 @@ "unterschiedlichen Quellen ...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Ich vertraue ihm marginal\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Ich vertraue ihm vollständig\n" @@ -3002,7 +3121,7 @@ #: g10/keyedit.c:987 msgid "The signature will be marked as non-revocable.\n" -msgstr "Die Unterschrift wird als nicht-exportfähig markiert werden.\n" +msgstr "Die Unterschrift wird als unwiderrufbar markiert werden.\n" #: g10/keyedit.c:994 msgid "I have not checked this key at all.\n" @@ -3020,8 +3139,8 @@ msgid "Really sign? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" @@ -3029,22 +3148,22 @@ #: g10/keyedit.c:1124 msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schüsselelemente- keine " -"Passphrase ist zu ändern.\n" +"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- " +"keine Passphrase ist zu ändern.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Dieser Schlüssel ist nicht geschützt.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" -msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n" +msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" -msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n" +msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Schlüssel ist geschützt.\n" @@ -3061,7 +3180,7 @@ "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" @@ -3139,15 +3258,15 @@ #: g10/keyedit.c:1390 msgid "add a key to a smartcard" -msgstr "der Smartcard einen Schlssel hinzufgen" +msgstr "der Smartcard einen Schlüssel hinzufügen" #: g10/keyedit.c:1392 msgid "move a key to a smartcard" -msgstr "einen Schlssel auf die Smartcard schieben" +msgstr "einen Schlüssel auf die Smartcard schieben" #: g10/keyedit.c:1394 msgid "move a backup key to a smartcard" -msgstr "eine Sicherungskopie des Schlssels auf die Smartcard schieben" +msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben" #: g10/keyedit.c:1398 msgid "delete selected subkeys" @@ -3230,13 +3349,13 @@ #: g10/keyedit.c:1442 msgid "compact unusable user IDs and remove unusable signatures from key" msgstr "" -"unbrauchbare User-IDs verkleinern und unbrauchbare Unterschrifen aus dem " +"unbrauchbare User-IDs verkleinern und unbrauchbare Unterschriften aus dem " "Schlüssel entfernen" #: g10/keyedit.c:1444 msgid "compact unusable user IDs and remove all signatures from key" msgstr "" -"unbrauchbare User-IDs verkleinern und alle Unterschrifen aus dem Schlüssel " +"unbrauchbare User-IDs verkleinern und alle Unterschriften aus dem Schlüssel " "entfernen" #: g10/keyedit.c:1566 @@ -3275,7 +3394,7 @@ #: g10/keyedit.c:1751 msgid "Really sign all user IDs? (y/N) " -msgstr "Wirklich alle User-IDs beglaubigen? " +msgstr "Wirklich alle User-IDs beglaubigen? (j/N) " #: g10/keyedit.c:1758 msgid "Hint: Select the user IDs to sign\n" @@ -3351,15 +3470,16 @@ #: g10/keyedit.c:2020 msgid "Do you really want to revoke the entire key? (y/N) " -msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? " +msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) " #: g10/keyedit.c:2031 msgid "Do you really want to revoke the selected subkeys? (y/N) " -msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? " +msgstr "" +"Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) " #: g10/keyedit.c:2033 msgid "Do you really want to revoke this subkey? (y/N) " -msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? " +msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) " #: g10/keyedit.c:2083 msgid "Owner trust may not be set while using a user provided trust database\n" @@ -3381,114 +3501,114 @@ msgid "Really update the preferences? (y/N) " msgstr "Die Voreinstellungen wirklich ändern? (j/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " -msgstr "Änderungen speichern? " +msgstr "Änderungen speichern? (j/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " -msgstr "Beenden ohne zu speichern? " +msgstr "Beenden ohne zu speichern? (j/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "Änderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Eigenschaften: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Bevorzugter Schlüsselserver:" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "\"Notationen\": " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" "Dieser Schlüssel könnte durch %s mit Schlüssel %s widerrufen worden sein" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(empfindlich)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "erzeugt: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "widerrufen: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "verfallen: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "verfällt: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "Aufruf: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "Vertrauen: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "Gültigkeit: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "Kartennummer:" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3496,26 +3616,26 @@ "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n" "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "widerrufen" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "verfallen" # translated by wk -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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 "" "WARNUNG: Keine User-ID ist als primär markiert. Dieser Befehl kann\n" -"dazu führen, daß eine andere User-ID as primär angesehen wird.\n" +"dazu führen, daß eine andere User-ID als primär angesehen wird.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3525,74 +3645,74 @@ "könnte\n" " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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" +msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "ungültig" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "User-ID \"%s\" bereits verkleinert: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "User-ID \"%s\": %d Signatur entfernt\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "User-ID \"%s\": %d Signaturen entfernt\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "User-ID \"%s\": bereits minimiert\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "User-ID \"%s\": bereits sauber\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3602,260 +3722,265 @@ " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n" " des Schlüssels führen.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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 " +"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer " "hinzufügen.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Geben sie die User-ID des designierten Widerrufers ein: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? " "(j/N): " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" "Unterschlüssel %s ist des Unterschreibens nicht mächtig und braucht deshalb " "keine Rücksignatur\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Bitte genau eine User-ID auswählen.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Wollen Sie ihn wirklich löschen? (j/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Geben Sie die \"Notation\" ein: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "Fortfahren (j/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Keine User-ID mit Hash %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Kein Unterschlüssel mit Index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "User-ID: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " beglaubigt durch Ihren Schlüssel %s am %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "Nicht von Ihnen signiert.\n" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (unwiderrufbar)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "widerrufen durch Ihren Schlüssel %s um %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Schlüssel %s ist bereits widerrufen\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Unterschlüssel %s ist bereits widerrufen\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "Voreinstellung `%s' ist doppelt\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "zu viele Verschlüsselungeinstellungen\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "zu viele Hashvoreinstellungen\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "zu viele Komprimierungsvoreinstellungen\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "Die \"Direct Key Signature\" wird geschrieben\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "Die Eigenbeglaubigung wird geschrieben\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "Schreiben der \"key-binding\" Signatur\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Schlüssellänge auf %u Bit aufgerundet\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Unterschr." -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Zertif." -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Verschl." -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authentisierung" @@ -3868,109 +3993,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "UuVvAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Mögliche Vorgänge eines %s-Schlüssels: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Derzeit erlaubte Vorgänge: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Umschalten der Unterschreibfähigkeit\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Umschalten der Verschlüsselungsfähigkeit\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Umschalten der Authentisierungsfähigkeit\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Beenden\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, c-format -msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA und Elgamal (voreingestellt)\n" +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) RSA und RSA (voreingestellt)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA und Elgamal\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (nur unterschreiben/beglaubigen)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (nur signieren/beglaubigen)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (nur verschlüsseln)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (nur signieren/beglaubigen)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur verschlüsseln)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, c-format -msgid "What keysize do you want? (%u) " -msgstr "Welche Schlüssellänge wünschen Sie? (%u) " +msgid "What keysize do you want for the subkey? (%u) " +msgstr "Welche Länge wünschen Sie für den Unterschlüssel? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n" +msgid "What keysize do you want? (%u) " +msgstr "Welche Schlüssellänge wünschen Sie? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "aufgerundet auf %u Bit\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3986,7 +4106,7 @@ " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4002,38 +4122,38 @@ " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Wie lange bleibt der Schlüssel gültig? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "Ungültiger Wert.\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Schlüssel verfällt nie\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Signature verfällt nie\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Key verfällt am %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Unterschrift verfällt am %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4041,11 +4161,11 @@ "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n" "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Ist dies richtig? (j/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4061,44 +4181,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ungültiges Zeichen im Namen\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Der Name muß min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Email-Adresse: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Diese Email-Adresse ist ungültig\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ungültiges Zeichen im Kommentar.\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Sie benutzen den Zeichensatz `%s'\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4109,7 +4229,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n" @@ -4124,23 +4244,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKkEeFfBb" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Bitte beseitigen Sie zuerst den Fehler\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4148,12 +4268,12 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4166,7 +4286,7 @@ "aufrufen.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4177,50 +4297,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Schlüsselerzeugung abgebrochen.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4229,12 +4349,12 @@ "werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n" "Unterschlüssel für diesem Zweck erzeugen.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4242,7 +4362,7 @@ "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht überein)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4250,25 +4370,25 @@ "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht überein)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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" +msgstr "HINWEIS: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Wirklich erzeugen? (j/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n" @@ -4301,253 +4421,253 @@ msgid "Keyring" msgstr "Schlüsselbund" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Haupt-Fingerabdruck =" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "Unter-Fingerabdruck =" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Haupt-Fingerabdruck =" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Unter-Fingerabdruck =" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Schl.-Fingerabdruck =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Kartenseriennr. =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s ist der Unveränderte\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s ist der Neue\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "Puffern des Schlüsselbundes `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: Schlüsselbund erstellt\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" "verwende temporäre Dateien, um Daten an die Schlüsselserverhilfsprogramme zu " "geben" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "Temporäre Dateien nach Nutzung nicht löschen" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "Schlüssel für die Unterschriftenprüfung automatisch holen" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "" "Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "WARNUNG: Schlüsselserver-Option `%s' wird auf dieser Plattform nicht " "verwendet\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "abgeschaltet" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "fordere Schlüssel %s von %s-Server %s an\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "fordere Schlüssel %s von %s an\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "suche Namen auf %s-Server %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "suche Namen auf %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "sende Schlüssel %s auf den %s-Server %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "sende Schlüssel %s auf %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "suche nach \"%s\" auf %s-Server %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "suche nach \"%s\" auf %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "Kein Schlüsselserver-Vorgang\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen " "GnuPG-Version (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "Schlüsselserver sendete VERSION nicht\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" "Externe Schlüsselserveraufrufe werden in diesem \"Build\" nicht unterstützt\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "Schlüsselserver-Zeitüberschreitung\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "interner Fehler Schlüsselserver\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "ein Schlüssel wird per %s aktualisiert\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d Schlüssel werden per %s aktualisiert\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n" @@ -4652,7 +4772,7 @@ #: g10/mainproc.c:850 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -"Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n" +"Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n" #: g10/mainproc.c:1198 msgid "no signature found\n" @@ -4705,63 +4825,63 @@ msgid "[uncertain]" msgstr "[ungewiß] " -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " alias \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Diese Unterschrift verfällt am %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s Unterschrift, Hashmethode \"%s\"\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "Binäre" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "Textmodus" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "unbekannt" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht geprüft werden: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "keine abgetrennte Unterschrift\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "WARNUNG: Mehrfache Signaturen erkannt. Es wird nur die erste geprüft.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "Einzelne Unterschrift der Klasse 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "ungültiges root-Paket in proc_tree() entdeckt\n" @@ -4801,60 +4921,65 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "Siehe %s für weitere Infos\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n" + +#: g10/misc.c:491 +#, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "HINWEIS: Diese Funktion ist in %s nicht vorhanden\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: mißbilligte Option \"%s\".\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "nicht komprimiert" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "unkomprimiert|kein|keine" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "Mehrdeutige Option '%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "Unbekannte Option '%s'\n" @@ -4907,13 +5032,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter " "Sitzungsschlüssel\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" @@ -5001,7 +5126,7 @@ msgstr "Geben Sie die Passphrase nochmal ein: " # translated by wk -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5013,61 +5138,61 @@ "Wählen Sie ein Bild für Ihre Foto-ID aus. Das Bild muß eine JPEG-Datei\n" "sein. Bitte beachten Sie, daß das Bild in Ihrem öffentlichen\n" "Schlüssel gespeichert wird. Wenn Sie ein sehr großes Bild benutzen,\n" -"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der GröÂße\n" +"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n" "240x288 Pixel ist eine gute Wahl.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Dateiname mit JPEG für die Foto-ID eingeben: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "JPEG-Datei `%s' kann nicht geöffnet werden: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Diese JPEG-Datei ist echt groß (%d Byte)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' ist keine JPEG-Datei\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Ist dieses Bild richtig? (j/N) " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "Es ist kein Bildbetrachter gesetzt\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "Die Foto-ID kann nicht angezeigt werden!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Kein Grund angegeben" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Schlüssel ist überholt" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Schlüssel wird nicht mehr benutzt" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "User-ID ist nicht mehr gültig" @@ -5087,89 +5212,89 @@ msgid "No trust value assigned to:\n" msgstr "Es ist kein \"trust value\" zugewiesen für:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "Wie sicher sind Sie, daß dieser Schlüssel wirklich dem angegebenen Besitzer " "gehört?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Weiß nicht so recht\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Nein, ihm traue ich NICHT\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Ich vertraue ihm absolut\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = Zurück zum Menü\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = diesen Schlüssel überspringen\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = verlassen\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Ihre Auswahl? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Wollen Sie diesem Schlüssel wirklich uneingeschränkt vertrauen? (j/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Es gibt keine Garantie, daß dieser Schlüssel wirklich dem angegebenen " "Besitzer gehört.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Es gibt nur eine beschränkte Garantie, daß dieser Schlüssel wirklich dem " "angegebenen Besitzer gehört.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "" "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu " "haben)\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5179,116 +5304,116 @@ "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n" "können Sie die nächste Frage mit ja beantworten\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" -"WARNUNG: Dieser schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht " +"WARNUNG: Dieser Schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht " "vorhanden\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 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:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Hinweis: Ãœberprüfte Adresse des Unterzeichners ist `%s'\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" "Hinweise: Adresse des Unterzeichners `%s' passt nicht zum DNS-Eintrag\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "\"Trust\"-Ebene auf VOLLSTÄNDIG geändert (wg. gültiger PKA-Info)\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "\"Trust\"-Ebene auf NIEMALS geändert (wg. falscher PKA-Info)\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen " "Besitzer gehört.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige " "Signaturen zertifiziert!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen " "Besitzer gehört.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: übersprungen: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Derzeitige Empfänger:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5296,34 +5421,34 @@ "\n" "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "Keine gültigen Adressaten\n" @@ -5374,7 +5499,7 @@ #: g10/pubkey-enc.c:242 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n" +msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n" #: g10/pubkey-enc.c:280 #, c-format @@ -5393,7 +5518,7 @@ msgstr "Hinweis: Schlüssel wurde widerrufen" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "\"build_packet\" fehlgeschlagen: %s\n" @@ -5416,11 +5541,11 @@ msgstr "" "Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Ausgabe mit ASCII Hülle erzwungen\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n" @@ -5439,29 +5564,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "kein zugehöriger öffentlicher Schlüssel: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" -msgstr "Öffentliche Schlüssel paßt nicht zum geheimen Schlüssel!\n" +msgstr "Öffentlicher Schlüssel paßt nicht zum geheimen Schlüssel!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "Unbekanntes Schutzverfahren\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "Dieser Schlüssel ist nicht geschützt.\n" # translated by wk -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5473,7 +5598,7 @@ msgstr "" "Widerrufszertifikat wurde erzeugt.\n" "\n" -"Bitte speichern Sie es auf einem Medium welches sie wegschliessen\n" +"Bitte speichern Sie es auf einem Medium welches sie wegschließen\n" "können; falls Mallory (ein Angreifer) Zugang zu diesem Zertifikat\n" "erhält, kann erIhren Schlüssel unbrauchbar machen. Es wäre klug,\n" "dieses Widerrufszertifikat auch auszudrucken und sicher aufzubewahren,\n" @@ -5481,34 +5606,34 @@ "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n" "machen.\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Grund für den Widerruf:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Abbruch" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Grund für Widerruf: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Keine Beschreibung angegeben)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Ist das OK? (j/N) " @@ -5555,8 +5680,8 @@ #, c-format msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -"Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für " -"sym.Verschlüsselung nicht vermieden werden!\n" +"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels " +"für sym. Verschlüsselung nicht vermieden werden!\n" #: g10/seskey.c:218 msgid "DSA requires the hash length to be a multiple of 8 bits\n" @@ -5586,19 +5711,19 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "" "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Unterschrift\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "" "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Unterschrift\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5606,7 +5731,7 @@ "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhrenproblem)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5614,26 +5739,26 @@ "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhrenproblem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "Vermutlich eine FALSCHE Unterschrift von Schlüssel %s, wegen unbekanntem " "\"critical bit\"\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-" "Beglaubigung\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5740,7 +5865,7 @@ "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# Liste de zugewiesenden Trustwerte, erzeugt am %s\n" +"# Liste der zugewiesenen Trustwerte, erzeugt am %s\n" "# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n" #: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176 @@ -5779,12 +5904,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n" @@ -5828,86 +5953,84 @@ msgid "%s: trustdb created\n" msgstr "%s: trust-db erzeugt\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ungültige 'Trust'-Datenbank\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: hashtable kann nicht erzeugt werden: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek fehlgeschlagen: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: keine trustdb Datei\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: version record with recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: invalid file version %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: konnte einen Satz nicht Nullen: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: konnte Satz nicht anhängen: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" -"\".\n" +msgid "Error: The trustdb is corrupted.\n" +msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n" #: g10/textfilter.c:147 #, c-format @@ -5956,124 +6079,134 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" +"Sie können versuchen die Vertrauensdatenbank durch folgende Befehle " +"wiederherzustellen:\n" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "Falls dies nicht funktioniert, sehen Sie bitte im Handbuch nach\n" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende " "Vertrauensmodell %s\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "verwende Vertrauensmodell %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[widerrufen]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[verfall.]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ unbek.]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ undef.]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginal]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ vollst.]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ uneing.]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "unbestimmt" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "niemals" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "vollständig" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "uneingeschränkt" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "\"Trust-DB\"-Ãœberprüfung nicht nötig\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "Bitte ein --check-trustdb durchführen\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "\"Trust-DB\" wird überprüft\n" # translated by wk -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" -msgstr "keine uneingeschränkt vertrauenswürdige Schlüssel gefunden\n" +msgstr "keine uneingeschränkt vertrauenswürdigen Schlüssel gefunden\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -"öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n" +"öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -6081,7 +6214,7 @@ "Tiefe: %d gültig: %3d unterschrieben: %3d Vertrauen: %d-, %dq, %dn, %dm, %" "df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6096,7 +6229,7 @@ msgstr "" "Die Unterschrift konnte nicht überprüft werden.\n" "Denken Sie daran, daß die Datei mit der Unterschrift (.sig oder .asc)\n" -"als erster in der Kommandozeile stehen sollte.\n" +"als erste in der Kommandozeile stehen sollte.\n" #: g10/verify.c:192 #, c-format @@ -6125,7 +6258,7 @@ #: util/errors.c:58 msgid "bad public key" -msgstr "Falscher öffentlicher Schüssel" +msgstr "Falscher öffentlicher Schlüssel" #: util/errors.c:59 msgid "bad secret key" @@ -6301,7 +6434,7 @@ #: util/errors.c:104 msgid "unusable public key" -msgstr "unbrauchbarer öffentlicher Schüssel" +msgstr "unbrauchbarer öffentlicher Schlüssel" #: util/errors.c:105 msgid "unusable secret key" @@ -6339,50 +6472,50 @@ #: util/logger.c:228 #, c-format msgid "you found a bug ... (%s:%d)\n" -msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n" +msgstr "Sie haben einen Bug (Programmfehler) gefunden ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ja" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJyY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nein" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "abbrechen|abbrechen" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6405,6 +6538,17 @@ msgstr "" "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" +#~ "\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Admin-PIN" + #~ msgid "failed to acquire the pinentry lock: %s\n" #~ msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n" @@ -6470,9 +6614,6 @@ #~ msgid "shadowing the key failed: %s\n" #~ msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n" -#~ msgid "error writing key: %s\n" -#~ msgstr "Fehler beim Schreiben des Schlüssels: %s\n" - #~ msgid "Please enter the passphrase for the ssh key%0A %c" #~ msgstr "Bitte geben Sie die Passphrase für den SSH-Schlüssel %0A %c ein" @@ -6498,9 +6639,6 @@ #~ msgid "Repeat this PIN" #~ msgstr "PIN bitte wiederholen" -#~ msgid "Please enter the PIN%s%s%s to unlock the card" -#~ msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren" - #~ msgid "error creating temporary file: %s\n" #~ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n" @@ -6673,9 +6811,6 @@ #~ msgid "error getting nonce for the socket\n" #~ msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n" -#~ msgid "error binding socket to `%s': %s\n" -#~ msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n" - #~ msgid "listen() failed: %s\n" #~ msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n" @@ -7134,10 +7269,6 @@ #~ "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs " #~ "erzeugt: %lu]" -#~ msgid "fingerprint on card does not match requested one\n" -#~ msgstr "" -#~ "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n" - #~ msgid "run in multi server mode (foreground)" #~ msgstr "Im Multiserver Modus ausführen" @@ -8024,9 +8155,6 @@ #~ msgid "No argument allowed" #~ msgstr "Argumente sind nicht erlaubt" -#~ msgid "error allocating enough memory: %s\n" -#~ msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n" - #~ msgid "" #~ "@\n" #~ "Commands:\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/el.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/el.gmo differ diff -Nru gnupg-1.4.9/po/el.po gnupg-1.4.10/po/el.po --- gnupg-1.4.9/po/el.po 2008-03-25 08:53:06.000000000 +0000 +++ gnupg-1.4.10/po/el.po 2009-09-02 17:19:38.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n" @@ -78,9 +77,10 @@ msgid "note: random_seed file not updated\n" msgstr "óçìåßùóç: äåí Ý÷åé áíáíåùèåß ôï áñ÷åßï random_seed\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n" @@ -133,176 +133,220 @@ "íá áðáó÷ïëåßôå ôï ëåéôïõñãéêü óýóôçìá ìÝ÷ñé áõôü íá óõãêåíôñþóåé\n" "ðåñéóóüôåñç åíôñïðßá! (×ñåéÜæïíôáé %d ðåñéóóüôåñá bytes)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "áðïôõ÷ßá åðáíáäüìçóçò ôçò cache êëåéäïèÞêçò: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "ôìÞìáôá ôïõ ìõóôéêïý êëåéäéïý äåí åßíáé äéáèÝóéìá\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Ðáñáêáëþ åðéëÝîôå ôçí áéôßá ãéá ôçí áíÜêëçóç:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò free : %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' Þäç óõìðéÝóôçêå\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "äå âñÝèçêáí Ýãêõñá OpenPGP äåäïìÝíá.\n" @@ -389,176 +433,238 @@ "åêôõðþóéìïò, óå åéóáãùãéêÜ, ÷áñáêôÞñáò óôç èùñÜêéóç - ßóùò Ýãéíå ÷ñÞóç " "ðñïâëçìáôéêïý MTA\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "ôï ìõóôéêü êëåéäß äåí åßíáé äéáèÝóéìï" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Ç åðéëïãÞ óáò; " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Äåí Ý÷åé ïñéóôåß áéôßá" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "ìç åðåîåñãáóìÝíï" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "êáíÝíá áíôßóôé÷ï äçìüóéï êëåéäß: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "áäõíáìßá äçìéïõñãßáò ôçò êëåéäïèÞêçò `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "áíáùåùìÝíåò åðéëïãÝò" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "äå âñÝèçêáí Ýãêõñá OpenPGP äåäïìÝíá.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "óôñïããõëïðïéÞèçêå Ýùò ôá %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -566,192 +672,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "ÕðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ìç Ýãêõñç åðéëïãÞ.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôçí áéôßá ãéá ôçí áíÜêëçóç:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "Üãíùóôïò áëãüñéèìïò ðñïóôáóßáò\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Êëåéäß äéáèÝóéìï óôï: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "ÅíôïëÞ> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Ìç Ýãêõñç åíôïëÞ (äïêéìÜóôå \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "ôï ìõóôéêü êëåéäß äåí åßíáé äéáèÝóéìï" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n" @@ -760,13 +875,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -876,7 +991,7 @@ "ï åîáíáãêáóìüò óõììåôñéêïý áëãüñéèìïõ %s (%d) ðáñáâéÜæåé ôéò\n" "åðéëïãÝò ôïõ ðáñáëÞðôç\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" @@ -1278,7 +1393,7 @@ msgid "Pubkey: " msgstr "ÄçìïóÊëåéäß:" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Êñõðôáëãüñéèìïò: " @@ -1286,7 +1401,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Óõìðßåóç: " @@ -1426,421 +1541,421 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "ÓÇÌÅÉÙÓÇ: áãíïÞèçêå ôï ðáëéü áñ÷åßï ðñïêáèïñéóìÝíùí åðéëïãþí `%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "áñ÷åßï åðéëïãþí `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n" "áíáóöáëåßò Üäåéåò\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 " "êáôÜóôáóç\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "" "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n" "äåí åßíáé Ýãêõñïò\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ìç Ýãêõñï default-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ìç Ýãêõñï min-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "ôï %s áêüìá äå ëåéôïõñãåß ìáæß ìå ôï %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ êñõðôáëãüñéèìïõ \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ óõìðßåóçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n" "äçìïóßïõ êëåéäéïý\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [üíïìá áñ÷åßïõ]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [åíôïëÝò]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "åîáãùãÞ êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver áíáæÞôçóç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver áíáíÝùóç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ìç Ýãêõñïò áëãüñéèìïò hash `%s'\n" @@ -1887,17 +2002,17 @@ msgstr "" "Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "êáíÝíá ìõóôéêü õðïêëåéäß ãéá ôï äçìüóéï õðïêëåéäß %08lX - áãíüçóç\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ÷ùñßò äçìüóéï - ðáñáëåßöèçêå\n" @@ -1923,8 +2038,9 @@ msgstr "×ñÞóç: gpgv [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Óýíôáîç: gpg [åðéëïãÝò] [áñ÷åßá]\n" @@ -2731,12 +2847,12 @@ msgid "keyring `%s' created\n" msgstr "êëåéäïèÞêç `%s' äçìéïõñãÞèçêå\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "áðïôõ÷ßá åðáíáäüìçóçò ôçò cache êëåéäïèÞêçò: %s\n" @@ -2785,7 +2901,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d user ID áíé÷íåýèçêáí ÷ùñßò Ýãêõñåò éäéï-õðïãñáöÝò\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2798,12 +2914,12 @@ "íá êïéôÜæåé passports êáé fingerprints áðü äéÜöïñåò ðçãÝò...);\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = ¸÷ù ìåñéêÞ åìðéóôïóýíç\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = ¸÷ù ðëÞñç åìðéóôïóýíç\n" @@ -3045,8 +3161,8 @@ msgid "Really sign? (y/N) " msgstr "Óßãïõñá íá õðïãñáöåß; " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "ç õðïãñáöÞ áðÝôõ÷å: %s\n" @@ -3055,20 +3171,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Áõôü ôï êëåéäß äåí ðñïóôáôåýåôáé.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Ôï êëåéäß ðñïóôáôåýåôáé.\n" @@ -3085,7 +3201,7 @@ "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" @@ -3429,117 +3545,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Ðåñßëçøç: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Äõíáôüôçôå: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Óçìåßùóç: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (åõáßóèçôï)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3547,19 +3663,19 @@ "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n" "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3567,7 +3683,7 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß ID ÷ñÞóôç óáí ðñùôåýùí. ÁõôÞ ç åíôïëÞ\n" " ìðïñåß íá êÜíåé Ýíá Üëëï ID ÷ñÞóôç íá ãßíåé ôï ðñùôåýùí.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3576,75 +3692,75 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n" " ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "ìç Ýãêõñç èùñÜêéóç" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Ôï user ID \"%s\" áíáêáëåßôå." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Ôï user ID \"%s\" áíáêáëåßôå." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Ôï user ID \"%s\" áíáêáëåßôå." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3654,38 +3770,38 @@ " êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n" " íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åÜí ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ äåí ìðïñåß íá " "åðáíÝëèåé!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3693,235 +3809,241 @@ "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/" "N): " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï õðïãñÜöùí õðïêëåéäß %08lX äåí Ý÷åé êáô' áíôéðáñÜóôáóç " "ðéóôïðïéçèåß\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Óçìåßùóç õðïãñáöÞò: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "ÅðéêÜëõøç (y/N); " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s\n" + +#: g10/keyedit.c:4716 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " áíáêëÞèçêå áðü %08lX óôéò %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "êáíÝíá ìõóôéêü êëåéäß\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "ç ðñïåðéëïãÞ %c%lu áíôéãñÜöôçêå\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "ðÜñá ðïëëÝò `%c' ðñïåðéëïãÝò\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "ðÜñá ðïëëÝò `%c' ðñïåðéëïãÝò\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "ðÜñá ðïëëÝò `%c' ðñïåðéëïãÝò\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "åããñáöÞ Üìåóçò õðïãñáöÞò\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "åããñáöÞ éäéï-õðïãñáöÞò\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "åããñáöÞ õðïãñáöÞò \"äÝóéìïõ\" êëåéäéïý\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ìç Ýãêõñï ìÝãåèïò êëåéäéïý, ÷ñÞóç %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "óôñïããõëïðïßçóç ôïõ ìÝãåèïò êëåéäéïý Ýùò %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "êñõðôïãñÜöçóç äåäïìÝíùí" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3934,109 +4056,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA êáé ElGamal (ðñïêáèïñéóìÝíï)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA êáé ElGamal (ðñïêáèïñéóìÝíï)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (ãéá õðïãñáöÞ ìüíï)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (ãéá õðïãñáöÞ ìüíï)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (ãéá õðïãñáöÞ ìüíï)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ôï ìÝãåèïò êëåéäéïý ðïõ æçôÞèçêå åßíáé %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "óôñïããõëïðïéÞèçêå Ýùò ôá %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4052,7 +4169,7 @@ " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4068,40 +4185,40 @@ " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Ôï êëåéäß åßíáé Ýãêõñï ãéá; (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Ç õðïãñáöÞ Ýéíáé Ýãêõñç ãéá; (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "ìç Ýãêõñç ôéìÞ\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "ôï %s äåí ëÞãåé ðïôÝ\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "ôï %s äåí ëÞãåé ðïôÝ\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "ôï %s ëÞãåé óôéò %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "ÕðïãñáöÞ ëÞãåé óôéò %s.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4109,12 +4226,12 @@ "Ôï óýóôçìá óáò äåí ìðïñåß íá áðåéêïíßóåé çìåñïìçíßåò ðÝñá ôïõ 2038.\n" "¼ìùò, èá ÷åéñßæïíôáé óùóôÜ Ýùò ôï 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Åßíáé áõôü óùóôü (y/n); " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4131,44 +4248,44 @@ " \"Nikolaoy Nikos (toy Ioanni) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Áëçèéíü ¼íïìá: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï üíïìá\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Ôï üíïìá äåí åðéôñÝðåôáé íá îåêéíÜ ìå áñéèìçôéêü øçößï\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Ôï üíïìá ðñÝðåé íá Ý÷åé ôïõëÜ÷éóôïí 5 ÷áñáêôÞñåò\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Äéåýèõíóç Email: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ìç Ýãêõñç äéåýèõíóç Email\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Ó÷üëéï: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï ó÷üëéï\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "×ñçóéìïðïéåßôå ôï `%s' óåô ÷áñáêôÞñùí.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4179,7 +4296,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ðáñáêáëþ ìçí ôïðïèåôåßôå ôçí äéåýèõíóç email óôï üíïìá Þ óôï ó÷üëéï\n" @@ -4194,23 +4311,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (O)åíôÜîåé/(Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Ðáñáêáëþ, äéïñèþóôå ðñþôá ôï óöÜëìá\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4218,12 +4335,12 @@ "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4235,7 +4352,7 @@ "üðïôå èÝëåôå, ìå ôçí åðéëïãÞ \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4247,50 +4364,50 @@ "ôïõò äßóêïõò) êáôá ôç äéÜñêåéá õðïëïãéóìïý ðñþôùí áñéèìþí. Áõôü äßíåé\n" "óôç ãåííÞôñéá ôõ÷áßùí áñéèìþí ìéá åõêáéñßá íá ìáæÝøåé áñêåôÞ åíôñïðßá.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áíáâëÞèçêå.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "åããñáöÞ ôïõ äçìïóßïõ êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç äçìüóéá êëåéäïèÞêç: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç ìõóôéêÞ êëåéäïèÞêç: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò äçìüóéáò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "ôï äçìüóéï êáé ôï ìõóôéêü êëåéäß äçìéïõñãÞèçêáí êáé õðïãñÜöçêáí.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4301,12 +4418,12 @@ "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ \"--edit-key\" ãéá íá äçìéïõñãçèåß\n" "Ýíá äåõôåñåýïí êëåéäß ãéá áõôü ôï ëüãï.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4314,7 +4431,7 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4322,28 +4439,28 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "ÓÇÌÅÉÙÓÇ: ç äçìéïõñãßá õðïêëåéäéþí ãéá êëåéäéÜ v3 äåí åßíáé óýìöùíï\n" "ìå ôï OpenPGP\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèåß; " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï ìõóôéêü êëåéäß %08lX Ýëçîå óôéò %s\n" @@ -4376,255 +4493,255 @@ msgid "Keyring" msgstr "ÊëåéäïèÞêç" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Áðïôýðùìá êëåéäéïý =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: 2 áñ÷åßá ìå åìðéóôåõôéêÝò ðëçñïöïñßåò õðÜñ÷ïõí.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s åßíáé ôï áìåôÜâëçôï\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s åßíáé ôï íÝï\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Ðáñáêáëþ äéïñèþóôå áõôÞ ôçí ðéèáíÞ \"ôñýðá\" áóöáëåßáò\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "Ýëåã÷ïò êëåéäïèÞêçò `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: êëåéäïèÞêç äçìéïõñãÞèçêå\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ïé åðéëïãåò óôï `%s' äåí åßíáé åíåñãÝò óå áõôÞ ôçí åêôÝëåóç\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n" @@ -4780,63 +4897,63 @@ msgid "[uncertain]" msgstr "[áâÝâáéï]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " ãíùóôü óáí \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "ÕðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "ÕðïãñáöÞ ëÞãåé óôéò %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "äõáäéêü" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "êáôÜóôáóç-êåéìÝíïõ" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "Üãíùóôï" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "äåí åßíáé áðïêïììÝíç õðïãñáöÞ\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åíôïðéóìüò ðïëëáðëþí õðïãñáöþí. Ìüíï ç ðñþôç èá åëåã÷èåß.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "áíåîÜñôçôç õðïãñáöÞ êëÜóçò 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "õðïãñáöÞ ðáëéïý óôõë (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "ìç Ýãêõñï ñéæéêü(root) ðáêÝôï áíé÷íåýôçêå óôï proc_tree()\n" @@ -4877,62 +4994,67 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n" -#: g10/misc.c:353 +#: g10/misc.c:458 +msgid "the IDEA cipher plugin is not present\n" +msgstr "ôï âýóìá ôïõ êñõðôáëãüñéèìïõ IDEA äåí õðÜñ÷åé\n" + +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 +#, fuzzy, c-format +msgid "please see %s for more information\n" +msgstr " i = áðåéêüíéóç ðåñéóóüôåñùí ðëçñïöïñéþí\n" + +#: g10/misc.c:475 #, fuzzy, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" "ï åîáíáãêáóìüò ôïõ áëãüñéèìïõ ðåñßëçøçò %s (%d) ðáñáâéÜæåé ôéò\n" "ðñïåðéëïãÝò ôïõ ðáñáëÞðôç\n" -#: g10/misc.c:459 -msgid "the IDEA cipher plugin is not present\n" -msgstr "ôï âýóìá ôïõ êñõðôáëãüñéèìïõ IDEA äåí õðÜñ÷åé\n" - -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:491 #, fuzzy, c-format -msgid "please see %s for more information\n" -msgstr " i = áðåéêüíéóç ðåñéóóüôåñùí ðëçñïöïñéþí\n" +msgid "NOTE: This feature is not available in %s\n" +msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n" -#: g10/misc.c:693 +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ìç óõíåéóôþìåíç åðéëïãÞ \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: \"%s\" åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "ðáñáêáëþ ÷ñçóéìïðïéÞóôå ôï \"%s%s\" êáëýôåñá\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: \"%s\" åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Áóõìðßåóôï" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Áóõìðßåóôï" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "áõôü ôï ìÞíõìá ßóùò äåí ìðïñåß íá ÷ñçóéìïðïéçèåß áðü %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n" @@ -4986,11 +5108,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "áäõíáìßá ÷åéñéóìïý ôïõ áëãüñéèìïõ äçìïóßïõ êëåéäéïý %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ðéèáíüí ìç áóöáëÝò êñõðôïãñáöçìÝíï óõììåôñéêÜ êëåéäß\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n" @@ -5079,7 +5201,7 @@ msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5093,59 +5215,59 @@ "÷ñçóéìïðïéåßôå ìéá ìåãÜëç åéêüíá ôï êëåéäß óáò áíôßóôïé÷á èá ãßíåé ìåãÜëï!\n" "Éäáíßêü ìÝãåèïò ãéá ìéá åéêüíá åßíáé áõôü êïíôÜ óôï 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "ÐëçêôñïëïãÞóôå Ýíá üíïìá áñ÷åßïõ ãéá ôï photo ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "áäõíáìßá ðñüóâáóçò ôïõ áñ÷åßïõ: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" äåí åßíáé JPEG áñ÷åßï\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Åßíáé áõôÞ ç öùôïãñáößá óùóôÞ (y/N/q); " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "áäõíáìßá áðåéêüíéóçò ôïõ photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Äåí Ý÷åé ïñéóôåß áéôßá" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Ôï êëåéäß Ý÷åé ðáñáêáìèåß" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Ôï êëåéäß Ý÷åé åêôåèåß" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Ôï êëåéäß äå ÷ñçóéìïðïéåßôáé ðëÝïí" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Ôï User ID äåí åßíáé ðëÝïí Ýãêõñï" @@ -5168,89 +5290,89 @@ "Äåí äüèçêå áîßá åìðéóôïóýíçò óôï:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " ãíùóôü óáí \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Áõôü ôï êëåéäß ðéèáíþò áíÞêåé óôïí éäéïêôÞôç\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Äåí îÝñù\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = ÄÅÍ Ý÷ù åìðéóôïóýíç\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Åìðéóôåýïìáé áðüëõôá\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = ðßóù óôï êõñßùò ìåíïý\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = ðáñÜëåéøç áõôïý ôïõ êëåéäéïý\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = ôåñìáôéóìüò\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Ç áðüöáóç óáò; " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Óßãïõñá èÝëåôå áõôü ôï êëåéäß íá ïñéóôåß óáí áðüëõôçò åìðéóôïóýíçò; " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "ÐéóôïðïéçôéêÜ ðïõ ïäçãïýí óå Ýíá êëåéäß áðüëõôçò åìðéóôïóýíçò:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Äåí õðÜñ÷åé Ýíäåéîç üôé ç õðïãñáöÞ áõôÞ áíÞêåé óôïí éäéïêôÞôç.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Äåí õðÜñ÷åé Ýíäåéîç üôé ç õðïãñáöÞ áõôÞ áíÞêåé óôïí éäéïêôÞôç.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Áõôü ôï êëåéäß ðéèáíþò áíÞêåé óôïí éäéïêôÞôç\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Áõôü ôï êëåéäß áíÞêåé óå åìÜò\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5262,115 +5384,115 @@ "íá áðáíôÞóåôå óôçí åðüìåíç åñþôçóç êáôáöáôéêÜ\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "×ñÞóç ïðùóäÞðïôå áõôïý ôïõ êëåéäéïý; " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ×ñÞóç êëåéäéïý ÷ùñßò åìðéóôïóýíç!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß (ëåßðåé ôï êëåéäß " "áíÜêëçóçò)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí éäéïêôÞôç ôïõ!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Áõôü ìðïñåß íá óçìáßíåé üôé ç õðïãñáöÞ åßíáé ðëáóôïãñáößá.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï õðïêëåéäß Ý÷åé áíáêëçèåß áðü ôïí éäéïêôÞôç ôïõ!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Óçìåßùóç: Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Óçìåßùóç: Áõôü ôï êëåéäß Ý÷åé ëÞîåé!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß äåí Ý÷åé ðéóôïðïéçèåß ìå åìðéóôåýóéìç " "õðïãñáöÞ!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Äåí õðÜñ÷åé Ýíäåéîç üôé ç õðïãñáöÞ áíÞêåé óôïí éäéïêôÞôç.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ÄÅÍ åìðéóôåõüìáóôå áõôü ôï êëåéäß!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Ç õðïãñáöÞ ìÜëëïí åßíáé ðëáóôïãñáößá.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß äåí Ý÷åé ðéóôïðïéçèåß ìå õðïãñáöÝò\n" "áñêåôÞò åìðéóôïóýíçò!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Äåí åßíáé âÝâáéï üôé ç õðïãñáöÞ áíÞêåé óôïí éäéïêôÞôç.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ðáñáëåßöèçêå: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ðáñáëåßöèçêå: äçìüóéï êëåéäß åßíáé Þäç ðáñüí\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Äåí ïñßóôçêå Ýíá user ID. (÷ñçóéìïðïéåßóôå ôï \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5378,34 +5500,34 @@ "\n" "ÐëçêôñïëïãÞóôå ôï user ID. ÔÝëïò ìå ìéá Üäåéá ãñáììÞ: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Äåí õðÜñ÷åé áõôü ôï user ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" "ðáñáëåßöèçêå: äçìüóéï êëåéäß Ý÷åé Þäç ïñéóôåß óáí åî ïñéóìïý ðáñáëÞðôçò\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Ôï äçìüóéï êëåéäß Ý÷åé áðåíåñãïðïéçèåß.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "ðáñáëåßöèçêå: äçìüóéï êëåéäß Ý÷åé Þäç ïñéóôåß\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ðáñáëåßöèçêå: ôï äçìüóéï êëåéäß Ý÷åé áðåíåñãïðïéçèåß.\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "êáììßá Ýãêõñç äéåýèõíóç\n" @@ -5472,7 +5594,7 @@ msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß Ý÷åé áíáêëçèåß" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet áðÝôõ÷å: %s\n" @@ -5495,11 +5617,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôü ôï êëåéäß; " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Åîáíáãêáóìüò åîüäïõ óå èùñáêéóìÝíï ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet áðÝôõ÷å: %s\n" @@ -5518,29 +5640,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "ôï ìõóôéêü êëåéäß `%s' äå âñÝèçêå: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "êáíÝíá áíôßóôé÷ï äçìüóéï êëåéäß: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "ôï äçìïóßï êëåéäß äåí ôáéñéÜæåé ìå ôï ìõóôéêü!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôü ôï êëåéäß; " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "Üãíùóôïò áëãüñéèìïò ðñïóôáóßáò\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "ÓÇÌÅÉÙÓÇ: Áõôü ôï êëåéäß äåí ðñïóôáôåýåôáé!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5559,33 +5681,33 @@ "ðñïóï÷Þ ôï óýóôçìá åêôýðùóçò óôï ìç÷áíçìÜ óáò ìðïñåß íá áðïèçêåýóåé ôçí\n" "åêôýðùóç êáé íá ôçí êÜíåé äéáèÝóéìç óå Üëëïõò!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôçí áéôßá ãéá ôçí áíÜêëçóç:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Áêýñùóç" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Ðéèáíþí íá èÝëåôå íá åðéëÝîåôå ôï %d åäþ)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "ÐëçêôñïëïãÞóôå ìéá ðñïáéñåôéêÞ ðåñéãñáöÞ· ôÝëïò ìå ìéá Üäåéá ãñáììÞ:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Áéôßá ãéá áíÜêëçóç: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Äåí äþèçêå ðåñéãñáöÞ)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Åßíáé áõôü åíôÜîåé; " @@ -5666,19 +5788,19 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï õðïãñÜöùí õðïêëåéäß %08lX Ý÷åé Üêõñç êáô' áíôéðáñÜóôáóç " "ðéóôïðïßçóç\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "" "ôï äçìüóéï êëåéäß %08lX åßíáé %lu äåõôåñüëåðôï íåüôåñï áðü ôçí õðïãñáöÞ\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "" "ôï äçìüóéï êëåéäß %08lX åßíáé %lu äåõôåñüëåðôá íåüôåñï áðü ôçí õðïãñáöÞ\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5686,7 +5808,7 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5694,22 +5816,22 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß õðïãñáöÞò %08lX Ýëçîå óôéò %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "õðüèåóç êáêÞò õðïãñáöÞò áðü êëåéäß %08lX ëüãù Üãíùóôïõ êñßóéìïõ bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "êëåéäß %08lX: êáíÝíá õðïêëåéäß ãéá ôï ðáêÝôï áíÜêëçóçò õðïêëåéäéïý\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç õðïêëåéäéïý\n" @@ -5856,12 +5978,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync áðÝôõ÷å: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: áðïôõ÷ßá lseek: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: áðïôõ÷ßá write (n=%d): %s\n" @@ -5905,84 +6027,85 @@ msgid "%s: trustdb created\n" msgstr "%s: äçìéïõñãÞèçêå ç trustdb\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "ÓÇÌÅÉÙÓÇ: ç trustdb äåí åßíáé åããñÜøéìç\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ìç Ýãêõñç trustdb\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: áäõíáìßá äçìéïõñãßáò hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: óöÜëìá óôçí åíçìÝñùóç ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: óöÜëìá óôçí åããñáöÞ ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: áðÝôõ÷å lseek: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read áðÝôõ÷å (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: äåí åßíáé trustdb áñ÷åßï\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: åããñáöÞ Ýêäïóçò ìå recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ìç Ýãêõñç Ýêäïóç áñ÷åßïõ %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò free : %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: óöÜëìá óôçí åããñáöÞ ôçò åããñáöÞò dir : %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: áðïôõ÷ßá óôïí ìçäåíéóìü ìéáò åããñáöÞò: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: áðïôõ÷ßá óôçí ðñïóèÞêç ìéáò åããñáöÞò: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: äçìéïõñãÞèçêå ç trustdb\n" #: g10/textfilter.c:147 #, c-format @@ -6031,131 +6154,139 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "ç åããñáöÞ trust %lu äåí åßíáé ôïõ æçôïýìåíïõ ôýðïõ %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[áíáêëçìÝíï]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[ëçãìÝíï]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "Üãíùóôï" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "ðïôÝ " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, 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:626 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "ðáñáêáëþ êÜíôå Ýíá --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "Ýëåã÷ïò ôçò trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d êëåéäéÜ åðåîåñãÜóôçêáí (%d ìåôñÞóåéò åããõñüôçôáò ðÝñáóáí)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "äå âñÝèçêáí áðüëõôá åìðéóôåýóéìá êëåéäéÜ\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n" @@ -6417,47 +6548,47 @@ msgstr "âñÞêáôå Ýíá bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "íáé|íáß" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "ü÷é|ï÷é" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "ôåñìáôéóìüò" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6478,6 +6609,14 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(ßóùò ÷ñçóéìïðïéÞóáôå ëÜèïò ðñüãñáììá ãéá áõôÞ ôçí åñãáóßá)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "áäõíáìßá ôïðïèÝôçóçò äåäïìÝíùí óÞìáíóçò óå õðïãñáöÝò v3 (PGP 2.x óôõë)\n" @@ -6914,10 +7053,6 @@ #~ "\"\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" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/en@boldquot.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/en@boldquot.gmo differ diff -Nru gnupg-1.4.9/po/en@boldquot.po gnupg-1.4.10/po/en@boldquot.po --- gnupg-1.4.9/po/en@boldquot.po 2008-03-26 17:34:04.000000000 +0000 +++ gnupg-1.4.10/po/en@boldquot.po 2009-09-02 17:19:36.000000000 +0100 @@ -1,7 +1,7 @@ # English translations for gnupg package. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the gnupg package. -# Automatically generated, 2008. +# Automatically generated, 2009. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.4.9\n" +"Project-Id-Version: gnupg 1.4.10\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2009-09-02 18:19+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -65,13 +65,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "waiting for lock on ‘%s’...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "can't open ‘%s’: %s\n" @@ -103,9 +102,10 @@ msgid "note: random_seed file not updated\n" msgstr "note: random_seed file not updated\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "can't create ‘%s’: %s\n" @@ -159,172 +159,213 @@ "Not enough random bytes available. Please do some other work to give\n" "the OS a chance to collect more entropy! (Need %d more bytes)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "failed to store the fingerprint: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "failed to store the creation date: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "reading public key failed: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "response does not contain the public key data\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "response does not contain the RSA modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "response does not contain the RSA public exponent\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "using default PIN as %s\n" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "failed to use default PIN as %s: %s - disabling further default use\n" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Please enter the PIN%%0A[sigs done: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "||Please enter the PIN" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN callback returned error: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN for CHV%d is too short; minimum length is %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "verify CHV%d failed: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "access to admin commands is not configured\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "error retrieving CHV status from card\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "card is permanently locked!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d Admin PIN attempts remaining before card is permanently locked\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" + +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "|A|Please enter the Admin PIN" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "access to admin commands is not configured\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "Reset Code not or not anymore available\n" + +#: g10/app-openpgp.c:2028 +msgid "||Please enter the Reset Code for the card" +msgstr "||Please enter the Reset Code for the card" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "Reset Code is too short; minimum length is %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "|RN|New Reset Code" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|New Admin PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|New PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "error getting new PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "error reading application data\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "error reading fingerprint DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "key already exists\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "existing key will be replaced\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generating new key\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +msgid "writing new key\n" +msgstr "writing new key\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "creation timestamp missing\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA modulus missing or not of size %d bits\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA public exponent missing or larger than %d bits\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA prime %s missing or not of size %d bits\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "failed to store the key: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "please wait while key is being generated ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "generating key failed\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "key generation completed (%d seconds)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "invalid structure of OpenPGP card (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "fingerprint on card does not match requested one\n" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "card does not support digest algorithm %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "signatures created so far: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Please enter the PIN%%0A[sigs done: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "verification of Admin PIN is currently prohibited through this command\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "can't access %s - invalid OpenPGP card?\n" @@ -407,163 +448,226 @@ msgstr "" "quoted printable character in armor - probably a buggy MTA has been used\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP card not available: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP card no. %s detected\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "can't do this in batch mode\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "This command is only available for version 2 cards\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Your selection? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[not set]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "male" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "female" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "unspecified" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "not forced" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forced" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Error: Only plain ASCII is currently allowed.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Error: The “<†character may not be used.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Error: Double spaces are not allowed.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Cardholder's surname: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Cardholder's given name: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Error: Combined name too long (limit is %d characters).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL to retrieve public key: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Error: URL too long (limit is %d characters).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, c-format +msgid "error allocating enough memory: %s\n" +msgstr "error allocating enough memory: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "error reading ‘%s’: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, c-format +msgid "error writing `%s': %s\n" +msgstr "error writing ‘%s’: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Login data (account name): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Error: Login data too long (limit is %d characters).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Private DO data: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Error: Private DO too long (limit is %d characters).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Language preferences: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Error: invalid length of preference string.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Error: invalid characters in preference string.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Sex ((M)ale, (F)emale or space): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Error: invalid response.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA fingerprint: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Error: invalid formatted fingerprint.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "key operation not possible: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "not an OpenPGP card" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "error getting current key info: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Replace existing key? (y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" + +#: g10/card-util.c:1292 +#, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "What keysize do you want for the Signature key? (%u) " + +#: g10/card-util.c:1294 +#, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "What keysize do you want for the Encryption key? (%u) " + +#: g10/card-util.c:1295 +#, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "What keysize do you want for the Authentication key? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rounded up to %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s keysizes must be in the range %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "The card will now be re-configured to generate a key of %u bits\n" + +#: g10/card-util.c:1339 +#, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "error changing size of key %d to %u bits: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Make off-card backup of encryption key? (Y/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +msgid "NOTE: keys are already stored on the card!\n" +msgstr "NOTE: keys are already stored on the card!\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Replace existing keys? (y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -574,137 +678,146 @@ " PIN = ‘%s’ Admin PIN = ‘%s’\n" "You should change them using the command --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Please select the type of key to generate:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Signature key\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Encryption key\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Authentication key\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Invalid selection.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Please select where to store the key:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "unknown key protection algorithm\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "secret parts of key are not available\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "secret key already stored on a card\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, c-format +msgid "error writing key to card: %s\n" +msgstr "error writing key to card: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "quit this menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "show admin commands" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "show this help" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "list all available data" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "change card holder's name" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "change URL to retrieve key" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "fetch the key specified in the card URL" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "change the login name" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "change the language preferences" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "change card holder's sex" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "change a CA fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "toggle the signature force PIN flag" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "generate new keys" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "menu to change or unblock the PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "verify the PIN and list all data" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "unblock the PIN using a Reset Code" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Command> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Admin-only command\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Admin commands are allowed\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Admin commands are not allowed\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Invalid command (try “helpâ€)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "card reader not available\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Please insert the card and hit return or enter ‘c’ to cancel: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "selecting openpgp failed: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -713,36 +826,36 @@ "Please remove the current card and insert the one with serial number:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Hit return when ready or enter ‘c’ to cancel: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Enter New Admin PIN: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Enter New PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Enter Admin PIN: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Enter PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Repeat this PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN not correctly repeated; try again" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "can't open ‘%s’\n" @@ -751,13 +864,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output doesn't work for this command\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "key “%s†not found: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -857,7 +970,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "you may not use %s while in %s mode\n" @@ -1246,7 +1359,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cipher: " @@ -1254,7 +1367,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compression: " @@ -1394,398 +1507,398 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: old default options file ‘%s’ ignored\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: no default option file ‘%s’\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "option file ‘%s’: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "reading options from ‘%s’\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s is not for normal use!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "cipher extension ‘%s’ not loaded due to unsafe permissions\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’ is not a valid signature expiration\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ is not a valid character set\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "could not parse keyserver URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: invalid keyserver options\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "invalid keyserver options\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: invalid import options\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "invalid import options\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: invalid export options\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "invalid export options\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: invalid list options\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "invalid list options\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "display photo IDs during signature verification" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "show policy URLs during signature verification" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "show all notations during signature verification" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "show IETF standard notations during signature verification" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "show user-supplied notations during signature verification" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "show preferred keyserver URLs during signature verification" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "show user ID validity during signature verification" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "show revoked and expired user IDs in signature verification" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "show only the primary user ID in signature verification" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "validate signatures with PKA data" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "elevate the trust of signatures with valid PKA data" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: invalid verify options\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "invalid verify options\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "unable to set exec-path to %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: invalid auto-key-locate list\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "invalid auto-key-locate list\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "WARNING: program may create a core file!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNING: %s overrides %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s not allowed with %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s makes no sense with %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "NOTE: %s is not available in this version\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "will not run with insecure memory due to %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "you can only make detached or clear signatures while in --pgp2 mode\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "selected cipher algorithm is invalid\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "selected digest algorithm is invalid\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "selected compression algorithm is invalid\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "selected certification digest algorithm is invalid\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed must be greater than 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed must be greater than 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth must be in the range from 1 to 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "invalid min-cert-level; must be 1, 2, or 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "invalid S2K mode; must be 0, 1 or 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "invalid default preferences\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "invalid personal cipher preferences\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "invalid personal digest preferences\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "invalid personal compress preferences\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s does not yet work with %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "failed to initialize the TrustDB: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "WARNING: recipients (-r) given without using public key encryption\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symmetric encryption of ‘%s’ failed: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filename]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "you cannot use --symmetric --encrypt while in %s mode\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filename]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send failed: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive failed: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "key export failed: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search failed: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh failed: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "invalid hash algorithm ‘%s’\n" @@ -1829,17 +1942,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "no secret subkey for public subkey %s - ignoring\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "using subkey %s instead of primary key %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "key %s: secret key without public key - skipped\n" @@ -1866,10 +1979,10 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" #: g10/helptext.c:47 @@ -2664,12 +2777,12 @@ msgid "keyring `%s' created\n" msgstr "keyring ‘%s’ created\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "keyblock resource ‘%s’: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "failed to rebuild keyring cache: %s\n" @@ -2718,7 +2831,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d user IDs without valid self-signatures detected\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2730,12 +2843,12 @@ "(by looking at passports, checking fingerprints from different sources, " "etc.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = I trust marginally\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = I trust fully\n" @@ -2952,8 +3065,8 @@ msgid "Really sign? (y/N) " msgstr "Really sign? (y/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "signing failed: %s\n" @@ -2962,19 +3075,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "Key has only stub or on-card key items - no passphrase to change.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "This key is not protected.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Secret parts of primary key are not available.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Secret parts of primary key are stored on-card.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Key is protected.\n" @@ -2991,7 +3104,7 @@ "Enter the new passphrase for this secret key.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "passphrase not correctly repeated; try again" @@ -3302,113 +3415,113 @@ msgid "Really update the preferences? (y/N) " msgstr "Really update the preferences? (y/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Save changes? (y/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Quit without saving? (y/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "update failed: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "update secret failed: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Key not changed so no update needed.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Features: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Preferred keyserver: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Notations: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "There are no preferences on a PGP 2.x-style user ID.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "This key was revoked on %s by %s key %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "This key may be revoked by %s key %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(sensitive)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "created: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revoked: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "expired: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "expires: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "usage: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "trust: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "validity: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "This key has been disabled" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "card-no: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3416,17 +3529,17 @@ "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revoked" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "expired" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3434,7 +3547,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3444,74 +3557,74 @@ "versions\n" " of PGP to reject this key.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Are you sure you still want to add it? (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "You may not add a photo ID to a PGP2-style key.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Delete this good signature? (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Delete this invalid signature? (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Delete this unknown signature? (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Really delete this self-signature? (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Deleted %d signature.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Deleted %d signatures.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nothing deleted.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "invalid" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "User ID “%s†compacted: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "User ID “%sâ€: %d signature removed\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "User ID “%sâ€: %d signatures removed\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "User ID “%sâ€: already minimized\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "User ID “%sâ€: already clean\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3521,250 +3634,255 @@ "cause\n" " some versions of PGP to reject this key.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Enter the user ID of the designated revoker: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "you cannot appoint a key as its own designated revoker\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "this key has already been designated as a revoker\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Please remove selections from the secret keys.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Please select at most one subkey.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Changing expiration time for a subkey.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Changing expiration time for the primary key.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "You can't change the expiration date of a v3 key\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "No corresponding signature in secret ring\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "signing subkey %s is already cross-certified\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "subkey %s does not sign and so does not need to be cross-certified\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Please select exactly one user ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "skipping v3 self-signature on user ID “%sâ€\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Enter your preferred keyserver URL: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Are you sure you want to replace it? (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Are you sure you want to delete it? (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Enter the notation: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "Proceed? (y/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "No user ID with index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "No user ID with hash %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "No subkey with index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: “%sâ€\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "signed by your key %s on %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "This signature expired on %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Are you sure you still want to revoke it? (y/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Create a revocation certificate for this signature? (y/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "Not signed by you.\n" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "You have signed these user IDs on key %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (non-revocable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revoked by your key %s on %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "You are about to revoke these signatures:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Really create the revocation certificates? (y/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "no secret key\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "user ID “%s†is already revoked\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "WARNING: a user ID signature is dated %d seconds in the future\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Key %s is already revoked.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Subkey %s is already revoked.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "preference ‘%s’ duplicated\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "too many cipher preferences\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "too many digest preferences\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "too many compression preferences\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "invalid item ‘%s’ in preference string\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "writing direct signature\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "writing self signature\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "writing key binding signature\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize invalid; using %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize rounded up to %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Certify" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Encrypt" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authenticate" @@ -3777,109 +3895,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Possible actions for a %s key: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Current allowed actions: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Toggle the sign capability\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Toggle the encrypt capability\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Toggle the authenticate capability\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Finished\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Please select what kind of key you want:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) RSA and RSA (default)\n" + +#: g10/keygen.c:1494 #, c-format -msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA and Elgamal\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sign only)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (set your own capabilities)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (sign only)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (encrypt only)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (sign only)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (encrypt only)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (set your own capabilities)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA keypair will have %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (set your own capabilities)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s keys may be between %u and %u bits long.\n" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, c-format -msgid "What keysize do you want? (%u) " -msgstr "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " +msgstr "What keysize do you want for the subkey? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s keysizes must be in the range %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "What keysize do you want? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Requested keysize is %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rounded up to %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3895,7 +4008,7 @@ " m = key expires in n months\n" " y = key expires in n years\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3911,38 +4024,38 @@ " m = signature expires in n months\n" " y = signature expires in n years\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Key is valid for? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Signature is valid for? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "invalid value\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Key does not expire at all\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Signature does not expire at all\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Key expires at %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Signature expires at %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3950,11 +4063,11 @@ "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Is this correct? (y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3970,44 +4083,44 @@ " “Heinrich Heine (Der Dichter) â€\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Real name: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Invalid character in name\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Name may not start with a digit\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Name must be at least 5 characters long\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Email address: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Not a valid email address\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comment: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Invalid character in comment\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "You are using the ‘%s’ character set.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4018,7 +4131,7 @@ " “%sâ€\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Please don't put the email address into the real name or the comment\n" @@ -4033,23 +4146,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Please correct the error first\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4057,12 +4170,12 @@ "You need a Passphrase to protect your secret key.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4074,7 +4187,7 @@ "using this program with the option “--edit-keyâ€.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4086,50 +4199,50 @@ "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Key generation canceled.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "writing public key to ‘%s’\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "writing secret key stub to ‘%s’\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "writing secret key to ‘%s’\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "no writable public keyring found: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "no writable secret keyring found: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error writing public keyring ‘%s’: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error writing secret keyring ‘%s’: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "public and secret key created and signed.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4137,44 +4250,44 @@ "Note that this key cannot be used for encryption. You may want to use\n" "the command “--edit-key†to generate a subkey for this purpose.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Key generation failed: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "key has been created %lu second in future (time warp or clock problem)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "key has been created %lu seconds in future (time warp or clock problem)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Really create? (y/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "storing key onto card failed: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "can't create backup file ‘%s’: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTE: backup of card key saved to ‘%s’\n" @@ -4207,245 +4320,245 @@ msgid "Keyring" msgstr "Keyring" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primary key fingerprint:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Primary key fingerprint:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Key fingerprint =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Card serial no. =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "WARNING: 2 files with confidential information exists.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s is the unchanged one\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s is the new one\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Please fix this possible security flaw\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "caching keyring ‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu keys cached so far (%lu signatures)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu keys cached (%lu signatures)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: keyring created\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "include revoked keys in search results" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "include subkeys when searching by key ID" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "use temporary files to pass data to keyserver helpers" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "do not delete temporary files after using them" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "automatically retrieve keys when verifying signatures" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "honor the preferred keyserver URL set on the key" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "honor the PKA record set on a key when retrieving keys" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "WARNING: keyserver option ‘%s’ is not used on this platform\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "disabled" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Enter number(s), N)ext, or Q)uit > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "invalid keyserver protocol (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "key “%s†not found on keyserver\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "key not found on keyserver\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "requesting key %s from %s server %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "requesting key %s from %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "searching for names from %s server %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "searching for names from %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "sending key %s to %s server %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "sending key %s to %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "searching for “%s†from %s server %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "searching for “%s†from %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "no keyserver action!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "WARNING: keyserver handler from a different version of GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "keyserver did not send VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "no keyserver known (use option --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "external keyserver calls are not supported in this build\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "no handler for keyserver scheme ‘%s’\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "action ‘%s’ not supported with keyserver scheme ‘%s’\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s does not support handler version %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "keyserver timed out\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "keyserver internal error\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "keyserver communications error: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s†not a key ID: skipping\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "WARNING: unable to refresh key %s via %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "refreshing 1 key from %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "refreshing %d keys from %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "WARNING: unable to fetch URI %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "WARNING: unable to parse URI %s\n" @@ -4597,63 +4710,63 @@ msgid "[uncertain]" msgstr "[uncertain]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " aka “%sâ€" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Signature expired %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Signature expires %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signature, digest algorithm %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binary" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "textmode" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "unknown" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Can't check signature: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "not a detached signature\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "WARNING: multiple signatures detected. Only the first will be checked.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "standalone signature of class 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "old style (PGP 2.x) signature\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "invalid root packet detected in proc_tree()\n" @@ -4691,59 +4804,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "WARNING: using experimental digest algorithm %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "WARNING: digest algorithm %s is deprecated\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "the IDEA cipher plugin is not present\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "please see %s for more information\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "WARNING: digest algorithm %s is deprecated\n" + +#: g10/misc.c:491 +#, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "NOTE: This feature is not available in %s\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: deprecated option “%sâ€\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNING: “%s†is a deprecated option\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "please use “%s%s†instead\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "WARNING: “%s†is a deprecated command - do not use it\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Uncompressed" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "uncompressed|none" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "this message may not be usable by %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "ambiguous option ‘%s’\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "unknown option ‘%s’\n" @@ -4795,11 +4913,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "can't handle public key algorithm %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "WARNING: potentially insecure symmetrically encrypted session key\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacket of type %d has critical bit set\n" @@ -4885,7 +5003,7 @@ msgid "Repeat passphrase: " msgstr "Repeat passphrase: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4899,58 +5017,58 @@ "very large picture, your key will become very large as well!\n" "Keeping the image close to 240x288 is a good size to use.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Enter JPEG filename for photo ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "unable to open JPEG file ‘%s’: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "This JPEG is really large (%d bytes) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Are you sure you want to use it? (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "‘%s’ is not a JPEG file\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Is this photo correct (y/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "no photo viewer set\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "unable to display photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "No reason specified" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Key is superseded" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Key has been compromised" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Key is no longer used" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "User ID is no longer valid" @@ -4970,45 +5088,45 @@ msgid "No trust value assigned to:\n" msgstr "No trust value assigned to:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " aka “%sâ€\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "How much do you trust that this key actually belongs to the named user?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = I don't know or won't say\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = I do NOT trust\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = I trust ultimately\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = back to the main menu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = skip this key\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = quit\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5017,37 +5135,37 @@ "The minimum trust level for this key is: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Your decision? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Do you really want to set this key to ultimate trust? (y/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificates leading to an ultimately trusted key:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: There is no assurance this key belongs to the named user\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: There is limited assurance this key belongs to the named user\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "This key probably belongs to the named user\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "This key belongs to us\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5057,107 +5175,107 @@ "in the user ID. If you *really* know what you are doing,\n" "you may answer the next question with yes.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Use this key anyway? (y/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "WARNING: Using untrusted key!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "WARNING: this key might be revoked (revocation key not present)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "WARNING: This key has been revoked by its designated revoker!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNING: This key has been revoked by its owner!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " This could mean that the signature is forged.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "WARNING: This subkey has been revoked by its owner!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Note: This key has been disabled.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Note: Verified signer's address is ‘%s’\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "trustlevel adjusted to FULL due to valid PKA info\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "trustlevel adjusted to NEVER due to bad PKA info\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Note: This key has expired!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNING: This key is not certified with a trusted signature!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " There is no indication that the signature belongs to the owner.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNING: We do NOT trust this key!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " The signature is probably a FORGERY.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " It is not certain that the signature belongs to the owner.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: skipped: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: skipped: public key already present\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "You did not specify a user ID. (you may use “-râ€)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Current recipients:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5165,33 +5283,33 @@ "\n" "Enter the user ID. End with an empty line: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "No such user ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "skipped: public key already set as default recipient\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Public key is disabled.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "skipped: public key already set\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "unknown default recipient “%sâ€\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: skipped: public key is disabled\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "no valid addressees\n" @@ -5258,7 +5376,7 @@ msgstr "NOTE: key has been revoked" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet failed: %s\n" @@ -5280,11 +5398,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Create a designated revocation certificate for this key? (y/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII armored output forced.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet failed: %s\n" @@ -5303,28 +5421,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "secret key “%s†not found: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "no corresponding public key: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "public key does not match secret key!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Create a revocation certificate for this key? (y/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "unknown protection algorithm\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTE: This key is not protected!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5342,33 +5460,33 @@ "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" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Please select the reason for the revocation:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancel" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probably you want to select %d here)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Enter an optional description; end it with an empty line:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Reason for revocation: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(No description given)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Is this okay? (y/N) " @@ -5440,46 +5558,46 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "WARNING: signing subkey %s has an invalid cross-certification\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "public key %s is %lu second newer than the signature\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "public key %s is %lu seconds newer than the signature\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu second in the future (time warp or clock problem)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTE: signature key %s expired %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "assuming bad signature from key %s due to an unknown critical bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "key %s: no subkey for subkey revocation signature\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "key %s: no subkey for subkey binding signature\n" @@ -5614,12 +5732,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync failed: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek failed: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -5663,84 +5781,84 @@ msgid "%s: trustdb created\n" msgstr "%s: trustdb created\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTE: trustdb not writable\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: invalid trustdb\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: failed to create hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error updating version record: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error reading version record: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error writing version record: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek failed: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: not a trustdb file\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: version record with recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: invalid file version %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error reading free record: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error writing dir record: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: failed to zero a record: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: failed to append a record: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "the trustdb is corrupted; please run “gpg --fix-trustdbâ€.\n" +msgid "Error: The trustdb is corrupted.\n" +msgstr "Error: The trustdb is corrupted.\n" #: g10/textfilter.c:147 #, c-format @@ -5787,127 +5905,135 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "trust record %lu is not of requested type %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "You may try to re-create the trustdb using the commands:\n" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "If that does not work, please consult the manual\n" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "using %s trust model\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revoked]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ expired]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ unknown]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ undef ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginal]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ full ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ultimate]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "undefined" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "never" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "full" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ultimate" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "no need for a trustdb check\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "next trustdb check due at %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no need for a trustdb check with ‘%s’ trust model\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no need for a trustdb update with ‘%s’ trust model\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "public key %s not found: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "please do a --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "checking the trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d keys processed (%d validity counts cleared)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "no ultimately trusted keys found\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "public key of ultimately trusted key %s not found\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "unable to update trustdb version record: write failed: %s\n" @@ -6166,47 +6292,47 @@ msgstr "you found a bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/en@quot.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/en@quot.gmo differ diff -Nru gnupg-1.4.9/po/en@quot.po gnupg-1.4.10/po/en@quot.po --- gnupg-1.4.9/po/en@quot.po 2008-03-26 17:33:59.000000000 +0000 +++ gnupg-1.4.10/po/en@quot.po 2009-09-02 17:19:35.000000000 +0100 @@ -1,7 +1,7 @@ # English translations for gnupg package. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the gnupg package. -# Automatically generated, 2008. +# Automatically generated, 2009. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.4.9\n" +"Project-Id-Version: gnupg 1.4.10\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2009-09-02 18:19+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -62,13 +62,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "waiting for lock on ‘%s’...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "can't open ‘%s’: %s\n" @@ -100,9 +99,10 @@ msgid "note: random_seed file not updated\n" msgstr "note: random_seed file not updated\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "can't create ‘%s’: %s\n" @@ -156,172 +156,213 @@ "Not enough random bytes available. Please do some other work to give\n" "the OS a chance to collect more entropy! (Need %d more bytes)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "failed to store the fingerprint: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "failed to store the creation date: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "reading public key failed: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "response does not contain the public key data\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "response does not contain the RSA modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "response does not contain the RSA public exponent\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "using default PIN as %s\n" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "failed to use default PIN as %s: %s - disabling further default use\n" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Please enter the PIN%%0A[sigs done: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "||Please enter the PIN" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN callback returned error: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN for CHV%d is too short; minimum length is %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "verify CHV%d failed: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "access to admin commands is not configured\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "error retrieving CHV status from card\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "card is permanently locked!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d Admin PIN attempts remaining before card is permanently locked\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" + +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "|A|Please enter the Admin PIN" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "access to admin commands is not configured\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "Reset Code not or not anymore available\n" + +#: g10/app-openpgp.c:2028 +msgid "||Please enter the Reset Code for the card" +msgstr "||Please enter the Reset Code for the card" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "Reset Code is too short; minimum length is %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "|RN|New Reset Code" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|New Admin PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|New PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "error getting new PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "error reading application data\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "error reading fingerprint DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "key already exists\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "existing key will be replaced\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generating new key\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +msgid "writing new key\n" +msgstr "writing new key\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "creation timestamp missing\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA modulus missing or not of size %d bits\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA public exponent missing or larger than %d bits\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA prime %s missing or not of size %d bits\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "failed to store the key: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "please wait while key is being generated ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "generating key failed\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "key generation completed (%d seconds)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "invalid structure of OpenPGP card (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "fingerprint on card does not match requested one\n" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "card does not support digest algorithm %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "signatures created so far: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Please enter the PIN%%0A[sigs done: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "verification of Admin PIN is currently prohibited through this command\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "can't access %s - invalid OpenPGP card?\n" @@ -404,163 +445,226 @@ msgstr "" "quoted printable character in armor - probably a buggy MTA has been used\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP card not available: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP card no. %s detected\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "can't do this in batch mode\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "This command is only available for version 2 cards\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Your selection? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[not set]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "male" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "female" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "unspecified" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "not forced" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forced" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Error: Only plain ASCII is currently allowed.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Error: The “<†character may not be used.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Error: Double spaces are not allowed.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Cardholder's surname: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Cardholder's given name: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Error: Combined name too long (limit is %d characters).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL to retrieve public key: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Error: URL too long (limit is %d characters).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, c-format +msgid "error allocating enough memory: %s\n" +msgstr "error allocating enough memory: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "error reading ‘%s’: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, c-format +msgid "error writing `%s': %s\n" +msgstr "error writing ‘%s’: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Login data (account name): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Error: Login data too long (limit is %d characters).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Private DO data: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Error: Private DO too long (limit is %d characters).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Language preferences: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Error: invalid length of preference string.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Error: invalid characters in preference string.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Sex ((M)ale, (F)emale or space): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Error: invalid response.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA fingerprint: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Error: invalid formatted fingerprint.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "key operation not possible: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "not an OpenPGP card" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "error getting current key info: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Replace existing key? (y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" + +#: g10/card-util.c:1292 +#, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "What keysize do you want for the Signature key? (%u) " + +#: g10/card-util.c:1294 +#, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "What keysize do you want for the Encryption key? (%u) " + +#: g10/card-util.c:1295 +#, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "What keysize do you want for the Authentication key? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rounded up to %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s keysizes must be in the range %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "The card will now be re-configured to generate a key of %u bits\n" + +#: g10/card-util.c:1339 +#, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "error changing size of key %d to %u bits: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Make off-card backup of encryption key? (Y/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +msgid "NOTE: keys are already stored on the card!\n" +msgstr "NOTE: keys are already stored on the card!\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Replace existing keys? (y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -571,137 +675,146 @@ " PIN = ‘%s’ Admin PIN = ‘%s’\n" "You should change them using the command --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Please select the type of key to generate:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Signature key\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Encryption key\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Authentication key\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Invalid selection.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Please select where to store the key:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "unknown key protection algorithm\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "secret parts of key are not available\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "secret key already stored on a card\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, c-format +msgid "error writing key to card: %s\n" +msgstr "error writing key to card: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "quit this menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "show admin commands" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "show this help" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "list all available data" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "change card holder's name" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "change URL to retrieve key" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "fetch the key specified in the card URL" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "change the login name" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "change the language preferences" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "change card holder's sex" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "change a CA fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "toggle the signature force PIN flag" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "generate new keys" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "menu to change or unblock the PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "verify the PIN and list all data" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "unblock the PIN using a Reset Code" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Command> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Admin-only command\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Admin commands are allowed\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Admin commands are not allowed\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Invalid command (try “helpâ€)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "card reader not available\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Please insert the card and hit return or enter ‘c’ to cancel: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "selecting openpgp failed: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -710,36 +823,36 @@ "Please remove the current card and insert the one with serial number:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Hit return when ready or enter ‘c’ to cancel: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Enter New Admin PIN: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Enter New PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Enter Admin PIN: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Enter PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Repeat this PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN not correctly repeated; try again" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "can't open ‘%s’\n" @@ -748,13 +861,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output doesn't work for this command\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "key “%s†not found: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -854,7 +967,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "you may not use %s while in %s mode\n" @@ -1243,7 +1356,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cipher: " @@ -1251,7 +1364,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compression: " @@ -1386,398 +1499,398 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: old default options file ‘%s’ ignored\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: no default option file ‘%s’\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "option file ‘%s’: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "reading options from ‘%s’\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s is not for normal use!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "cipher extension ‘%s’ not loaded due to unsafe permissions\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’ is not a valid signature expiration\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ is not a valid character set\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "could not parse keyserver URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: invalid keyserver options\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "invalid keyserver options\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: invalid import options\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "invalid import options\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: invalid export options\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "invalid export options\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: invalid list options\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "invalid list options\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "display photo IDs during signature verification" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "show policy URLs during signature verification" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "show all notations during signature verification" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "show IETF standard notations during signature verification" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "show user-supplied notations during signature verification" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "show preferred keyserver URLs during signature verification" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "show user ID validity during signature verification" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "show revoked and expired user IDs in signature verification" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "show only the primary user ID in signature verification" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "validate signatures with PKA data" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "elevate the trust of signatures with valid PKA data" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: invalid verify options\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "invalid verify options\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "unable to set exec-path to %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: invalid auto-key-locate list\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "invalid auto-key-locate list\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "WARNING: program may create a core file!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNING: %s overrides %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s not allowed with %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s makes no sense with %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "NOTE: %s is not available in this version\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "will not run with insecure memory due to %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "you can only make detached or clear signatures while in --pgp2 mode\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "selected cipher algorithm is invalid\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "selected digest algorithm is invalid\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "selected compression algorithm is invalid\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "selected certification digest algorithm is invalid\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed must be greater than 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed must be greater than 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth must be in the range from 1 to 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "invalid min-cert-level; must be 1, 2, or 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "invalid S2K mode; must be 0, 1 or 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "invalid default preferences\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "invalid personal cipher preferences\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "invalid personal digest preferences\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "invalid personal compress preferences\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s does not yet work with %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "failed to initialize the TrustDB: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "WARNING: recipients (-r) given without using public key encryption\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symmetric encryption of ‘%s’ failed: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filename]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "you cannot use --symmetric --encrypt while in %s mode\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filename]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send failed: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive failed: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "key export failed: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search failed: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh failed: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "invalid hash algorithm ‘%s’\n" @@ -1821,17 +1934,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "no secret subkey for public subkey %s - ignoring\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "using subkey %s instead of primary key %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "key %s: secret key without public key - skipped\n" @@ -1858,10 +1971,10 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" #: g10/helptext.c:47 @@ -2651,12 +2764,12 @@ msgid "keyring `%s' created\n" msgstr "keyring ‘%s’ created\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "keyblock resource ‘%s’: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "failed to rebuild keyring cache: %s\n" @@ -2705,7 +2818,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d user IDs without valid self-signatures detected\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2717,12 +2830,12 @@ "(by looking at passports, checking fingerprints from different sources, " "etc.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = I trust marginally\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = I trust fully\n" @@ -2938,8 +3051,8 @@ msgid "Really sign? (y/N) " msgstr "Really sign? (y/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "signing failed: %s\n" @@ -2948,19 +3061,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "Key has only stub or on-card key items - no passphrase to change.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "This key is not protected.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Secret parts of primary key are not available.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Secret parts of primary key are stored on-card.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Key is protected.\n" @@ -2977,7 +3090,7 @@ "Enter the new passphrase for this secret key.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "passphrase not correctly repeated; try again" @@ -3287,113 +3400,113 @@ msgid "Really update the preferences? (y/N) " msgstr "Really update the preferences? (y/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Save changes? (y/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Quit without saving? (y/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "update failed: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "update secret failed: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Key not changed so no update needed.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Features: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Preferred keyserver: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Notations: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "There are no preferences on a PGP 2.x-style user ID.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "This key was revoked on %s by %s key %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "This key may be revoked by %s key %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(sensitive)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "created: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revoked: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "expired: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "expires: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "usage: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "trust: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "validity: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "This key has been disabled" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "card-no: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3401,17 +3514,17 @@ "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revoked" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "expired" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3419,7 +3532,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3429,74 +3542,74 @@ "versions\n" " of PGP to reject this key.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Are you sure you still want to add it? (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "You may not add a photo ID to a PGP2-style key.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Delete this good signature? (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Delete this invalid signature? (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Delete this unknown signature? (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Really delete this self-signature? (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Deleted %d signature.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Deleted %d signatures.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nothing deleted.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "invalid" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "User ID “%s†compacted: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "User ID “%sâ€: %d signature removed\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "User ID “%sâ€: %d signatures removed\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "User ID “%sâ€: already minimized\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "User ID “%sâ€: already clean\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3506,250 +3619,255 @@ "cause\n" " some versions of PGP to reject this key.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Enter the user ID of the designated revoker: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "you cannot appoint a key as its own designated revoker\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "this key has already been designated as a revoker\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Please remove selections from the secret keys.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Please select at most one subkey.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Changing expiration time for a subkey.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Changing expiration time for the primary key.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "You can't change the expiration date of a v3 key\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "No corresponding signature in secret ring\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "signing subkey %s is already cross-certified\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "subkey %s does not sign and so does not need to be cross-certified\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Please select exactly one user ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "skipping v3 self-signature on user ID “%sâ€\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Enter your preferred keyserver URL: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Are you sure you want to replace it? (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Are you sure you want to delete it? (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Enter the notation: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "Proceed? (y/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "No user ID with index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "No user ID with hash %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "No subkey with index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: “%sâ€\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "signed by your key %s on %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "This signature expired on %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Are you sure you still want to revoke it? (y/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Create a revocation certificate for this signature? (y/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "Not signed by you.\n" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "You have signed these user IDs on key %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (non-revocable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revoked by your key %s on %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "You are about to revoke these signatures:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Really create the revocation certificates? (y/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "no secret key\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "user ID “%s†is already revoked\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "WARNING: a user ID signature is dated %d seconds in the future\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Key %s is already revoked.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Subkey %s is already revoked.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "preference ‘%s’ duplicated\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "too many cipher preferences\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "too many digest preferences\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "too many compression preferences\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "invalid item ‘%s’ in preference string\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "writing direct signature\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "writing self signature\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "writing key binding signature\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize invalid; using %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize rounded up to %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Certify" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Encrypt" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authenticate" @@ -3762,109 +3880,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Possible actions for a %s key: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Current allowed actions: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Toggle the sign capability\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Toggle the encrypt capability\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Toggle the authenticate capability\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Finished\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Please select what kind of key you want:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) RSA and RSA (default)\n" + +#: g10/keygen.c:1494 #, c-format -msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA and Elgamal\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sign only)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (set your own capabilities)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (sign only)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (encrypt only)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (sign only)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (encrypt only)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (set your own capabilities)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA keypair will have %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (set your own capabilities)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s keys may be between %u and %u bits long.\n" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, c-format -msgid "What keysize do you want? (%u) " -msgstr "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " +msgstr "What keysize do you want for the subkey? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s keysizes must be in the range %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "What keysize do you want? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Requested keysize is %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rounded up to %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3880,7 +3993,7 @@ " m = key expires in n months\n" " y = key expires in n years\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3896,38 +4009,38 @@ " m = signature expires in n months\n" " y = signature expires in n years\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Key is valid for? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Signature is valid for? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "invalid value\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Key does not expire at all\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Signature does not expire at all\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Key expires at %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Signature expires at %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3935,11 +4048,11 @@ "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Is this correct? (y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3955,44 +4068,44 @@ " “Heinrich Heine (Der Dichter) â€\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Real name: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Invalid character in name\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Name may not start with a digit\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Name must be at least 5 characters long\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Email address: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Not a valid email address\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comment: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Invalid character in comment\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "You are using the ‘%s’ character set.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4003,7 +4116,7 @@ " “%sâ€\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Please don't put the email address into the real name or the comment\n" @@ -4018,23 +4131,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Please correct the error first\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4042,12 +4155,12 @@ "You need a Passphrase to protect your secret key.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4059,7 +4172,7 @@ "using this program with the option “--edit-keyâ€.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4071,50 +4184,50 @@ "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Key generation canceled.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "writing public key to ‘%s’\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "writing secret key stub to ‘%s’\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "writing secret key to ‘%s’\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "no writable public keyring found: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "no writable secret keyring found: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error writing public keyring ‘%s’: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error writing secret keyring ‘%s’: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "public and secret key created and signed.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4122,44 +4235,44 @@ "Note that this key cannot be used for encryption. You may want to use\n" "the command “--edit-key†to generate a subkey for this purpose.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Key generation failed: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "key has been created %lu second in future (time warp or clock problem)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "key has been created %lu seconds in future (time warp or clock problem)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Really create? (y/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "storing key onto card failed: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "can't create backup file ‘%s’: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTE: backup of card key saved to ‘%s’\n" @@ -4192,245 +4305,245 @@ msgid "Keyring" msgstr "Keyring" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primary key fingerprint:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Primary key fingerprint:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Key fingerprint =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Card serial no. =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "WARNING: 2 files with confidential information exists.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s is the unchanged one\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s is the new one\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Please fix this possible security flaw\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "caching keyring ‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu keys cached so far (%lu signatures)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu keys cached (%lu signatures)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: keyring created\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "include revoked keys in search results" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "include subkeys when searching by key ID" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "use temporary files to pass data to keyserver helpers" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "do not delete temporary files after using them" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "automatically retrieve keys when verifying signatures" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "honor the preferred keyserver URL set on the key" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "honor the PKA record set on a key when retrieving keys" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "WARNING: keyserver option ‘%s’ is not used on this platform\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "disabled" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Enter number(s), N)ext, or Q)uit > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "invalid keyserver protocol (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "key “%s†not found on keyserver\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "key not found on keyserver\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "requesting key %s from %s server %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "requesting key %s from %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "searching for names from %s server %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "searching for names from %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "sending key %s to %s server %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "sending key %s to %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "searching for “%s†from %s server %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "searching for “%s†from %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "no keyserver action!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "WARNING: keyserver handler from a different version of GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "keyserver did not send VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "no keyserver known (use option --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "external keyserver calls are not supported in this build\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "no handler for keyserver scheme ‘%s’\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "action ‘%s’ not supported with keyserver scheme ‘%s’\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s does not support handler version %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "keyserver timed out\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "keyserver internal error\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "keyserver communications error: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s†not a key ID: skipping\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "WARNING: unable to refresh key %s via %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "refreshing 1 key from %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "refreshing %d keys from %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "WARNING: unable to fetch URI %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "WARNING: unable to parse URI %s\n" @@ -4582,63 +4695,63 @@ msgid "[uncertain]" msgstr "[uncertain]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " aka “%sâ€" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Signature expired %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Signature expires %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signature, digest algorithm %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binary" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "textmode" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "unknown" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Can't check signature: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "not a detached signature\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "WARNING: multiple signatures detected. Only the first will be checked.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "standalone signature of class 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "old style (PGP 2.x) signature\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "invalid root packet detected in proc_tree()\n" @@ -4676,59 +4789,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "WARNING: using experimental digest algorithm %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "WARNING: digest algorithm %s is deprecated\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "the IDEA cipher plugin is not present\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "please see %s for more information\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "WARNING: digest algorithm %s is deprecated\n" + +#: g10/misc.c:491 +#, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "NOTE: This feature is not available in %s\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: deprecated option “%sâ€\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNING: “%s†is a deprecated option\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "please use “%s%s†instead\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "WARNING: “%s†is a deprecated command - do not use it\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Uncompressed" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "uncompressed|none" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "this message may not be usable by %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "ambiguous option ‘%s’\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "unknown option ‘%s’\n" @@ -4780,11 +4898,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "can't handle public key algorithm %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "WARNING: potentially insecure symmetrically encrypted session key\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacket of type %d has critical bit set\n" @@ -4870,7 +4988,7 @@ msgid "Repeat passphrase: " msgstr "Repeat passphrase: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4884,58 +5002,58 @@ "very large picture, your key will become very large as well!\n" "Keeping the image close to 240x288 is a good size to use.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Enter JPEG filename for photo ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "unable to open JPEG file ‘%s’: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "This JPEG is really large (%d bytes) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Are you sure you want to use it? (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "‘%s’ is not a JPEG file\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Is this photo correct (y/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "no photo viewer set\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "unable to display photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "No reason specified" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Key is superseded" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Key has been compromised" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Key is no longer used" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "User ID is no longer valid" @@ -4955,45 +5073,45 @@ msgid "No trust value assigned to:\n" msgstr "No trust value assigned to:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " aka “%sâ€\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "How much do you trust that this key actually belongs to the named user?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = I don't know or won't say\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = I do NOT trust\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = I trust ultimately\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = back to the main menu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = skip this key\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = quit\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5002,37 +5120,37 @@ "The minimum trust level for this key is: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Your decision? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Do you really want to set this key to ultimate trust? (y/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificates leading to an ultimately trusted key:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: There is no assurance this key belongs to the named user\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: There is limited assurance this key belongs to the named user\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "This key probably belongs to the named user\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "This key belongs to us\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5042,107 +5160,107 @@ "in the user ID. If you *really* know what you are doing,\n" "you may answer the next question with yes.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Use this key anyway? (y/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "WARNING: Using untrusted key!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "WARNING: this key might be revoked (revocation key not present)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "WARNING: This key has been revoked by its designated revoker!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNING: This key has been revoked by its owner!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " This could mean that the signature is forged.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "WARNING: This subkey has been revoked by its owner!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Note: This key has been disabled.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Note: Verified signer's address is ‘%s’\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "trustlevel adjusted to FULL due to valid PKA info\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "trustlevel adjusted to NEVER due to bad PKA info\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Note: This key has expired!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNING: This key is not certified with a trusted signature!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " There is no indication that the signature belongs to the owner.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNING: We do NOT trust this key!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " The signature is probably a FORGERY.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " It is not certain that the signature belongs to the owner.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: skipped: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: skipped: public key already present\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "You did not specify a user ID. (you may use “-râ€)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Current recipients:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5150,33 +5268,33 @@ "\n" "Enter the user ID. End with an empty line: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "No such user ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "skipped: public key already set as default recipient\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Public key is disabled.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "skipped: public key already set\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "unknown default recipient “%sâ€\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: skipped: public key is disabled\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "no valid addressees\n" @@ -5243,7 +5361,7 @@ msgstr "NOTE: key has been revoked" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet failed: %s\n" @@ -5265,11 +5383,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Create a designated revocation certificate for this key? (y/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII armored output forced.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet failed: %s\n" @@ -5288,28 +5406,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "secret key “%s†not found: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "no corresponding public key: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "public key does not match secret key!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Create a revocation certificate for this key? (y/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "unknown protection algorithm\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTE: This key is not protected!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5327,33 +5445,33 @@ "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" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Please select the reason for the revocation:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancel" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probably you want to select %d here)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Enter an optional description; end it with an empty line:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Reason for revocation: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(No description given)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Is this okay? (y/N) " @@ -5425,46 +5543,46 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "WARNING: signing subkey %s has an invalid cross-certification\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "public key %s is %lu second newer than the signature\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "public key %s is %lu seconds newer than the signature\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu second in the future (time warp or clock problem)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTE: signature key %s expired %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "assuming bad signature from key %s due to an unknown critical bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "key %s: no subkey for subkey revocation signature\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "key %s: no subkey for subkey binding signature\n" @@ -5599,12 +5717,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync failed: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek failed: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -5648,84 +5766,84 @@ msgid "%s: trustdb created\n" msgstr "%s: trustdb created\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTE: trustdb not writable\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: invalid trustdb\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: failed to create hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error updating version record: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error reading version record: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error writing version record: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek failed: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: not a trustdb file\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: version record with recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: invalid file version %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error reading free record: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error writing dir record: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: failed to zero a record: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: failed to append a record: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "the trustdb is corrupted; please run “gpg --fix-trustdbâ€.\n" +msgid "Error: The trustdb is corrupted.\n" +msgstr "Error: The trustdb is corrupted.\n" #: g10/textfilter.c:147 #, c-format @@ -5772,127 +5890,135 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "trust record %lu is not of requested type %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "You may try to re-create the trustdb using the commands:\n" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "If that does not work, please consult the manual\n" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "using %s trust model\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revoked]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ expired]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ unknown]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ undef ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginal]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ full ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ultimate]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "undefined" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "never" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "full" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ultimate" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "no need for a trustdb check\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "next trustdb check due at %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no need for a trustdb check with ‘%s’ trust model\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no need for a trustdb update with ‘%s’ trust model\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "public key %s not found: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "please do a --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "checking the trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d keys processed (%d validity counts cleared)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "no ultimately trusted keys found\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "public key of ultimately trusted key %s not found\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "unable to update trustdb version record: write failed: %s\n" @@ -6151,47 +6277,47 @@ msgstr "you found a bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/eo.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/eo.gmo differ diff -Nru gnupg-1.4.9/po/eo.po gnupg-1.4.10/po/eo.po --- gnupg-1.4.9/po/eo.po 2008-03-25 08:53:06.000000000 +0000 +++ gnupg-1.4.10/po/eo.po 2009-09-02 17:19:38.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "ne povas malfermi '%s': %s\n" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "noto: dosiero random_seed ne aktualigita\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "ne povas krei '%s': %s\n" @@ -130,176 +130,221 @@ "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:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "malsukcesis rekonstrui þlosilaran staplon: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "Donu la uzantidentigilon: " + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "sekretaj þlosilpartoj ne estas disponataj\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Kialo por revoko: " + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "eraro dum kreado de pasfrazo: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "eraro dum legado de þlosilbloko: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: eraro dum legado de libera registro: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "'%s' jam densigita\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "krei novan þlosilparon" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "krei novan þlosilparon" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "validaj OpenPGP-datenoj ne trovitaj.\n" @@ -386,176 +431,238 @@ "quoted-printable-signo en kiraso - verþajne cima poþtotransendilo estis " "uzata\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "sekreta þlosilo ne havebla" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "ne povas fari tion en neinteraga reøimo\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Tiu komando ne eblas en la reøimo %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Via elekto? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "en" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "en" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Nenia kialo specifita" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "ne traktita" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "eraro dum kreado de þlosilaro '%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "eraro dum legado de '%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "eraro dum kreado de '%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "aktualigitaj preferoj" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "nevalida signo en signoæeno\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "nevalida signo en signoæeno\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "Fingrospuro:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "validaj OpenPGP-datenoj ne trovitaj.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Kiun þlosilgrandon vi deziras? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Kiun þlosilgrandon vi deziras? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Kiun þlosilgrandon vi deziras? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rondigita øis %u bitoj\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ignorita: sekreta þlosilo jam æeestas\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -563,195 +670,204 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Nevalida elekto.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Kialo por revoko: " -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "nekonata densig-metodo" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorita: sekreta þlosilo jam æeestas\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "eraro dum skribado de þlosilaro '%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "forlasi æi tiun menuon" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "montri æi tiun helpon" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Nenia helpo disponata" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "þanøi la daton de eksvalidiøo" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "þanøi la posedantofidon" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "montri fingrospuron" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "krei novan þlosilparon" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Komando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "sekreta þlosilo ne havebla" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Donu la uzantidentigilon: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "Donu la uzantidentigilon: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 #, fuzzy msgid "Enter PIN: " msgstr "Donu la uzantidentigilon: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Ripetu pasfrazon: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "ne povas malfermi '%s'\n" @@ -760,13 +876,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ne funkcias por æi tiu komando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -865,7 +981,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, fuzzy, c-format msgid "you may not use %s while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" @@ -1260,7 +1376,7 @@ msgid "Pubkey: " msgstr "" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "" @@ -1268,7 +1384,7 @@ msgid "Hash: " msgstr "" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 #, fuzzy msgid "Compression: " msgstr "Komento: " @@ -1406,418 +1522,418 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "opcio-dosiero '%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s ne estas valida signaro\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "nevalida þlosilaro" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 #, fuzzy msgid "invalid export options\n" msgstr "nevalida þlosilaro" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "nevalida kiraso" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s ne estas valida signaro\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s ne estas valida signaro\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s ne estas valida signaro\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "nevalida þlosilaro" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent ne estas disponata en æi tiu sesio\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "malæifrado malsukcesis: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record malsukcesis: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" @@ -1863,17 +1979,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" @@ -1903,7 +2019,7 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" @@ -2686,12 +2802,12 @@ msgid "keyring `%s' created\n" msgstr "þlosilaro '%s' kreita\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "eraro dum kreado de '%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "malsukcesis rekonstrui þlosilaran staplon: %s\n" @@ -2740,7 +2856,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2753,12 +2869,12 @@ "kontrolante fingrospurojn el diversaj fontoj ...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Mi fidas iomete\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Mi plene fidas\n" @@ -3013,8 +3129,8 @@ msgid "Really sign? (y/N) " msgstr "Æu vere subskribi? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "subskribado malsukcesis: %s\n" @@ -3023,20 +3139,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Æi tiu þlosilo ne estas protektita.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Þlosilo estas protektita.\n" @@ -3053,7 +3169,7 @@ "Donu la novan pasfrazon por æi tiu sekreta þlosilo.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" @@ -3397,141 +3513,141 @@ msgid "Really update the preferences? (y/N) " msgstr "Æu vere aktualigi la preferojn? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Æu skribi þanøojn? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Æu fini sen skribi þanøojn? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "aktualigo malsukcesis: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "aktualigo de sekreto malsukcesis: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notacio: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sentema)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "ne povas krei %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "rev" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Æi tiu þlosilo estas malþaltita" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "rev" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "eksval" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3540,75 +3656,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 #, 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Forviþis %d subskribon.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Forviþis %d subskribojn.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nenio estis forviþita.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "nevalida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 #, fuzzy msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " @@ -3618,269 +3734,275 @@ "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:3353 +#: g10/keyedit.c:3355 #, 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:3373 +#: g10/keyedit.c:3375 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Donu la þlosilgrandon" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 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:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Mankas responda subskribo en sekreta þlosilaro\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Bonvolu elekti precize unu uzantidentigilon.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, 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:4139 +#: g10/keyedit.c:4147 #, 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:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Subskribo-notacio: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Æu surskribi (j/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "uzantidentigilo: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 #, 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:4651 +#: g10/keyedit.c:4659 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " subskribita per %08lX je %s%s\n" + +#: g10/keyedit.c:4716 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr "subskribi þlosilon nerevokeble" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokita de %08lX je %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Vi revokos la sekvajn subskribojn:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Æu vere krei la revokatestilojn? (j/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "mankas sekreta þlosilo\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "prefero %c%lu ripetita\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "tro da '%c'-preferoj\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "tro da '%c'-preferoj\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "tro da '%c'-preferoj\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "nevalida signo en signoæeno\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 #, fuzzy msgid "writing direct signature\n" msgstr "skribas mem-subskribon\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "skribas mem-subskribon\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "skribas þlosilbindan subskribon\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "þlosilgrando nevalida; uzas %u bitojn\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "þlosilgrando rondigita øis %u bitoj\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "subskribi" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "æifri datenojn" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3893,109 +4015,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (nur æifri)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (nur subskribi)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (nur æifri)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (nur subskribi)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (nur æifri)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (nur subskribi)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA-þlosilparo havos 1024 bitojn.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Kiun þlosilgrandon vi deziras? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Kiun þlosilgrandon vi deziras? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Petita þlosilgrando estas %u bitoj\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rondigita øis %u bitoj\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4011,7 +4128,7 @@ " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4027,40 +4144,40 @@ " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Þlosilo validu ...? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Þlosilo validu por ...? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "nevalida valoro\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s neniam eksvalidiøos\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s neniam eksvalidiøos\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s eksvalidiøos je %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4068,12 +4185,12 @@ "Via sistemo ne povas montri datojn post 2038.\n" "Tamen, øi estos øuste traktata øis 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Æu tio estas øusta (j/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4089,44 +4206,44 @@ " \"Heinrich Heine (la poeto) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Vera nomo: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Nevalida signo en nomo\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Nomo ne povas komenciøi per cifero\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Nomo devas havi almenaý 5 signojn\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Retadreso: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Nevalida retadreso\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Komento: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Nevalida signo en komento\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vi uzas la signaron '%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4137,7 +4254,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4152,23 +4269,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKkAaBbFf" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Bonvolu korekti la eraron unue\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4176,12 +4293,12 @@ "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4193,7 +4310,7 @@ "uzante æi tiun programon kun la opcio \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4205,50 +4322,50 @@ "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n" "akiri sufiæe da entropio.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Kreado de þlosiloj nuligita.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "neniu skribebla publika þlosilaro trovita: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "neniu skribebla sekreta þlosilaro trovita: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "eraro dum skribado de publika þlosilaro '%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4257,12 +4374,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4270,7 +4387,7 @@ "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4278,26 +4395,26 @@ "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Æu vere krei? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "ne povas krei '%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTO: sekreta þlosilo %08lX eksvalidiøis je %s\n" @@ -4332,258 +4449,258 @@ msgid "Keyring" msgstr "Þlosilaro" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 #, fuzzy msgid "Primary key fingerprint:" msgstr "listigi þlosilojn kaj fingroþpurojn" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 #, fuzzy msgid " Primary key fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s estas la neþanøita\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s estas la nova\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Bonvolu ripari æi tiun eblan sekurecproblemon\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "kontrolas þlosilaron '%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu þlosiloj kontrolitaj (%lu subskriboj)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu þlosiloj kontrolitaj (%lu subskriboj)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: þlosilaro kreita\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "el" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "nevalida þlosilaro" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "subskribita per via þlosilo %08lX je %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, 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:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "nevalida þlosilaro" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "þlosilservila eraro" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "þlosilservila eraro" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: ne valida þlosilidentigilo\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" @@ -4740,64 +4857,64 @@ msgid "[uncertain]" msgstr "[malcerta]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alinome \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 #, fuzzy msgid "binary" msgstr "æefa" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 #, fuzzy msgid "unknown" msgstr "nekonata versio" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne povas kontroli subskribon: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "ne aparta subskribo\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "memstara subskribo de klaso 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "malnovstila subskribo (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "nevalida radikpaketo trovita en proc_tree()\n" @@ -4836,61 +4953,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "la aldona¼o por la æifro IDEA en æeestas\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = bonvolu montri pli da informoj\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent ne estas disponata en æi tiu sesio\n" + +#: g10/misc.c:748 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/misc.c:719 +#: g10/misc.c:774 #, fuzzy msgid "Uncompressed" msgstr "ne traktita" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "ne traktita" -#: g10/misc.c:871 +#: g10/misc.c:926 #, fuzzy, c-format msgid "this message may not be usable by %s\n" msgstr "æi tiu mesaøo povas ne esti uzebla de PGP 2.x\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "nekonata implicita ricevonto '%s'\n" @@ -4943,11 +5065,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "ne povas trakti publikþlosilan metodon %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n" @@ -5035,7 +5157,7 @@ msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5044,61 +5166,61 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "ne povas malfermi %s: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "%s: ne estas fido-datenaro\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 #, fuzzy msgid "Is this photo correct (y/N/q)? " msgstr "Æu tio estas øusta (j/n)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 #, fuzzy msgid "unable to display photo ID!\n" msgstr "ne povas malfermi %s: %s\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nenia kialo specifita" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Þlosilo estas anstataýigita." -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Þlosilo estas kompromitita" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Þlosilo estas ne plu uzata" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Uzantidentigilo ne plu validas" @@ -5123,89 +5245,89 @@ "Nenia fidovaloro atribuita al:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alinome \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Æi tiu þlosilo verþajne apartenas al la posedanto\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Ne scias\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Ni NE fidas æi tiun þlosilon\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Mi fidas absolute\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = reen al la æefmenuo\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = supersalti æi tiun þlosilon\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " f = fini\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Via decido? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Æu vi vere volas þanøi æi tiun þlosilon al absoluta fido? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Atestiloj, kiuj kondukas al absolute fidata þlosilo:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Estas nenia indiko, ke æi tiu þlosilo vere apartenas al la posedanto\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Estas nenia indiko, ke æi tiu þlosilo vere apartenas al la posedanto\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Æi tiu þlosilo verþajne apartenas al la posedanto\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Æi tiu þlosilo apartenas al ni\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5217,111 +5339,111 @@ "la sekva demando per \"jes\"\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Æu tamen uzi æi tiun þlosilon? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVERTO: Uzas nefidatan þlosilon!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Tio povas signifi, ke la subskribo estas falsa.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVERTO: Æi tiu subþlosilo estas revokita de sia posedanto!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Noto: Æi tiu þlosilo estas malþaltita.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Noto: Æi tiu þlosilo eksvalidiøis!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVERTO: Æi tiu þlosilo ne estas atestita kun fidata subskribo!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVERTO: Ni NE fidas æi tiun þlosilon!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " La subskribo verþajne estas FALSA.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVERTO: Æi tiu þlosilo ne estas atestita kun sufiæe fidataj subskriboj!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorita: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ignorita: publika þlosilo jam æeestas\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5329,33 +5451,33 @@ "\n" "Donu la uzantidentigilon. Finu per malplena linio: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Uzantidentigilo ne ekzistas.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "ignorita: publika þlosilo jam difinita kiel implicita ricevonto\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Publika þlosilo estas malþaltita.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "ignorita: publika þlosilo jam agordita\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "nekonata implicita ricevonto '%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ignorita: publika þlosilo estas malþaltita\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "mankas validaj adresitoj\n" @@ -5423,7 +5545,7 @@ msgstr "þlosilo %08lX: þlosilo estas revokita!\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, fuzzy, c-format msgid "build_packet failed: %s\n" msgstr "aktualigo malsukcesis: %s\n" @@ -5446,11 +5568,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, fuzzy, c-format msgid "make_keysig_packet failed: %s\n" msgstr "listigo de þlosilblokoj malsukcesis: %s\n" @@ -5470,31 +5592,31 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, fuzzy, c-format msgid "no corresponding public key: %s\n" msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 #, fuzzy msgid "unknown protection algorithm\n" msgstr "nekonata densig-metodo" -#: g10/revoke.c:541 +#: g10/revoke.c:539 #, fuzzy msgid "NOTE: This key is not protected!\n" msgstr "Æi tiu þlosilo ne estas protektita.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5505,37 +5627,37 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "Kialo por revoko: " -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 #, fuzzy msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "\n" "Donu la uzantidentigilon. Finu per malplena linio: " -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "Kialo por revoko: " -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Æu tamen uzi æi tiun þlosilon? " @@ -5610,17 +5732,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "la publika þlosilo estas %lu sekundon pli nova ol la subskribo\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "la publika þlosilo estas %lu sekundojn pli nova ol la subskribo\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5628,7 +5750,7 @@ "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5636,22 +5758,22 @@ "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTO: subskribo-þlosilo %08lX eksvalidiøis je %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" @@ -5793,12 +5915,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "fido-datenaro: sync malsukcesis: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n" @@ -5842,84 +5964,85 @@ msgid "%s: trustdb created\n" msgstr "%s: fido-datenaro kreita\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: nevalida fido-datenaro\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: malsukcesis krei haktabelon: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: eraro dum aktualigo de versiregistro: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: eraro dum legado de versiregistro: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: eraro dum skribado de versiregistro: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "fido-datenaro: lseek malsukcesis: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ne estas fido-datenaro\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versiregistro kun registronumero %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: eraro dum legado de libera registro: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: eraro dum skribo de dosieruja registro: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: malsukcesis nuligi registron: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: malsukcesis aldoni registron: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "la fido-datenaro estas fuþita; bonvolu ruli \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: fido-datenaro kreita\n" #: g10/textfilter.c:147 #, c-format @@ -5966,130 +6089,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "fido-registro %lu ne havas petitan specon %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "rev" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "eksval" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "nekonata versio" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "publika þlosilo %08lX ne trovita: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "kontrolas la fido-datenaron\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n" @@ -6351,48 +6482,48 @@ msgstr "vi trovis cimon ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 #, fuzzy msgid "yes" msgstr "jes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "ne" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "fini" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "fF" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "k" @@ -6414,6 +6545,14 @@ 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" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA-þlosilparo havos 1024 bitojn.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "la fido-datenaro estas fuþita; bonvolu ruli \"gpg --fix-trustdb\".\n" + #~ msgid "" #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n" #~ msgstr "" @@ -6823,10 +6962,6 @@ #~ "\"\n" #~ "subskribita per via þlosilo %08lX je %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " subskribita per %08lX je %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: ne povas aliri: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/es.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/es.gmo differ diff -Nru gnupg-1.4.9/po/es.po gnupg-1.4.10/po/es.po --- gnupg-1.4.9/po/es.po 2008-03-25 08:53:07.000000000 +0000 +++ gnupg-1.4.10/po/es.po 2009-09-02 17:19:38.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2007-10-23 11:32+0200\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" @@ -42,13 +42,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "escribiendo clave privada en `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "no se puede abrir `%s': %s\n" @@ -86,9 +85,10 @@ msgid "note: random_seed file not updated\n" msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "no se puede crear %s: %s\n" @@ -143,173 +143,219 @@ "otro trabajo para que el sistema pueda recolectar más entropía\n" "(se necesitan %d bytes más).\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "fallo al almacenar la huella digital: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "fallo guardando la fecha de creación: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "fallo leyendo la clave\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "la respuesta no incluye la clave pública\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "la respuesta no incluye el módulo RSA\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "la respuesta no incluye el exponente público RSA\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, fuzzy, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "PIN [firmas hechas: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "PIN [firmas hechas: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "la función de manejo del PIN devolvió un error: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "la verificación CHV%d falló: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "el acceso a órdenes de administrador no está configurado\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "error recuperando el estatus CHV de la tarjeta\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "¡la tarjeta está bloqueada permanentemente!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" "%d intentos quedan para PIN de administrador antes de " "bloquearpermanentemente la clave\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|PIN Administrador" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "PIN [firmas hechas: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "PIN [firmas hechas: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "el acceso a órdenes de administrador no está configurado\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "clave pública no disponible" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Por favor elija una razón para la revocación:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Nuevo PIN Administrador" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Nuevo PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "error obteniendo nuevo PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "error leyendo datos de la aplicación\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "error leyendo huella digital DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "la clave ya existe\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "la clave existente será reemplazada\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generando nueva clave\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "generando nueva clave\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, fuzzy, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "exponente público demasiado grande (más de 32 bits)\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "fallo al almacenar la clave: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "por favor, espere mientras se genera la clave ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "la generación de la clave falló\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "generación de clave completada (%d segundos)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "firma %s, algoritmo de resumen %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "firmas creadas hasta ahora: %lu\n" -#: g10/app-openpgp.c:2140 -#, fuzzy, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "PIN [firmas hechas: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n" @@ -394,165 +440,227 @@ "caracter \"quoted printable\" en la armadura - probablemente se usó\n" "un MTA defectuoso\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "tarjeta OpenPGP no disponible: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "tarjeta OpenPGP num. %s detectada\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "imposible hacer esto en modo de proceso por lotes\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Esta orden no se permite en modo %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Su elección: " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[no establecido]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "hombre" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "mujer" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "no especificado" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "no forzado" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forzado" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Error: sólo se permite ASCII sin formato actualmente.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Error: El caracter \"<\" no puede usarse.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Error: no se permiten dobles espacios.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Apellido del titular de la tarjeta: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Nombre del titular de la tarjeta: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Error: nombre combinado demasiado largo (máximo %d caracteres).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL de donde recuperar la clave pública: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Error: URL demasiado larga (el máximo son %d caracteres).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "error escribiendo anillo `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "error leyendo `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "error creando `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Datos de login (nombre de la cuenta): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Error: el login es demasiado largo (límite de %d caracteres).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Datos privados: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" "Error: los datos privados son demasiado largos (límite de %d caracteres).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Preferencias de idioma: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Error: longitud de la cadena de preferencias inválida.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Error: caracteres inválidos en cadena de preferencias.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Sexo ((H)ombre, (M)mujer o espacio): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Error: respuesta no válida.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "Huella dactilar CA:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Error: formato inválido de huella dactilar.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "la operación con la clave no es posible: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "no es una tarjeta OpenPGP" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "error obteniendo la información actual de la clave: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "¿Reemplazar la clave existente? (s/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "¿De qué tamaño quiere la clave? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "¿De qué tamaño quiere la clave? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "¿De qué tamaño quiere la clave? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "redondeados a %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "error leyendo bloque de clave secreta \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" "¿Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "clave secreta ya almacenada en una tarjeta\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "¿Reemplazar las claves existentes? (s/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -563,138 +671,147 @@ " PIN = `%s' PIN Administrador = `%s'\n" "Debería cambiarlos usando la orden --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Por favor seleccione tipo de clave que generar:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Clave de firmado\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Clave de cifrado\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Clave de autentificación\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Elección inválida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Por favor elija donde guardar la clave:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "algoritmo de protección de clave desconocido\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "las partes secretas de la clave no están disponibles\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "clave secreta ya almacenada en una tarjeta\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "error escribiendo anillo `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "sale de este menú" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "ver órdenes de administrador" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "listar todos los datos disponibles" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "cambiar el nombre del titular de la tarjeta" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "cambiar URL de donde obtener la clave" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "recuperar la clave especificada en la URL de la tarjeta" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "cambiar nombre de usuario" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "cambiar preferencias de idioma" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "cambiar sexo del titular de la tarjeta" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "cambiar huella dactilar de una CA" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "cambiar estado de la opción forzar firma del PIN" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "generar nuevas claves" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "menú para cambiar o desbloquear el PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Orden> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Órdenes sólo de administrador\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Se permiten órdenes de administrador\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "No se permiten órdenes de administrador\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Orden inválida (pruebe \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "clave secreta no disponible" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "borrado de bloque de anillo de claves fallido: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -703,36 +820,36 @@ "Por favor retire la tarjeta actual e inserte la de número de serie:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Pulse Intro cuando esté listo" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Introduzca nuevo PIN de administrador: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Introduzca el nuevo PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Introduzca PIN de administrador: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Introduzca PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Repita este PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN repetido incorrectamente; inténtelo de nuevo" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "no se puede abrir `%s'\n" @@ -741,13 +858,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona con esta orden\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "clave \"%s\" no encontrada: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -850,7 +967,7 @@ "forzar el cifrado simétrico %s (%d) viola las preferencias\n" "del destinatario\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "no puede usar %s en modo %s\n" @@ -1253,7 +1370,7 @@ msgid "Pubkey: " msgstr "Clave pública: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cifrado: " @@ -1261,7 +1378,7 @@ msgid "Hash: " msgstr "Resumen: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compresión: " @@ -1404,401 +1521,401 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s no es para uso normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' no es un juego de caracteres válido\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' no es un juego de caracteres válido\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "no se puede interpretar la URL del servidor de claves\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opciones del servidor de claves inválidas\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "opciones del servidor de claves inválidas\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opciones de importación inválidas\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opciones de exportación inválidas\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: lista de opciones inválida\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "lista de opciones inválida\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "`%s' no es un juego de caracteres válido\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "la URL del servidor de claves preferido no es válida\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "`%s' no es un juego de caracteres válido\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "`%s' no es un juego de caracteres válido\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opciones de verificación inválidas\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "opciones de verificación inválidas\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opciones de verificación inválidas\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s no permitido con %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s no tiene sentido con %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "el agente gpg no esta disponible en esta sesión\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "no se ejecutará en memoria insegura por %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inválido\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "el algoritmo de compresión seleccionado es inválido\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificación por resumen elegido es inválido\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe estar en el rango de 1 a 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferencias por defecto inválidas\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inválidas\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inválidas\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresión inválidas\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s aún no funciona con %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "el cifrado simétrico de `%s' falló: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [nombre_fichero]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no puede usar --symetric --encrypt en modo %s\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [nombre_fichero]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [órdenes]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "envío al servidor de claves fallido: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepción del servidor de claves fallida: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "exportación de clave fallida: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "búsqueda del servidor de claves fallida: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "renovación al servidor de claves fallida: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución inválido `%s'\n" @@ -1846,17 +1963,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "no hay subclave secreta para la subclave pública %s - ignorada\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "usando subclave %s en vez de clave primaria %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "clave %s: clave secreta sin clave pública - omitida\n" @@ -1886,8 +2003,9 @@ msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxis: gpg [opciones] [ficheros]\n" @@ -2690,12 +2808,12 @@ msgid "keyring `%s' created\n" msgstr "anillo `%s' creado\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "%s: problema lectura del bloque de clave: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo reconstruyendo caché del anillo de claves: %s\n" @@ -2744,7 +2862,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "Detectados %d identificadores de usuario sin autofirma válida\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2756,12 +2874,12 @@ "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Confío un poco\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Confío totalmente\n" @@ -2977,8 +3095,8 @@ msgid "Really sign? (y/N) " msgstr "¿Firmar de verdad? (s/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" @@ -2989,19 +3107,19 @@ "La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n" "- no hay frase contraseña que cambiar.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Esta clave no está protegida.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Las partes secretas de la clave primaria no están disponibles.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "La clave está protegida.\n" @@ -3018,7 +3136,7 @@ "Introduzca la nueva frase contraseña para esta clave secreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" @@ -3332,114 +3450,114 @@ msgid "Really update the preferences? (y/N) " msgstr "¿Actualizar realmente las preferencias? (s/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "¿Grabar cambios? (s/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "¿Salir sin grabar? (s/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "actualización fallida: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "actualización de la clave secreta fallida: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Clave sin cambios, no se necesita actualización.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Resumen: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Sevidor de claves no-modificar" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Servidor de claves preferido: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notación: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Esta clave fue revocada en %s por %s clave %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta clave puede ser revocada por %s clave %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(confidencial)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "creado: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revocada: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "caducó: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "caduca: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "uso: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "confianza: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "validez: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Esta clave está deshabilitada" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "num. tarjeta: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3447,17 +3565,17 @@ "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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revocada" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "caducada" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3465,7 +3583,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3474,75 +3592,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de querer añadirla? (s/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta firma correcta? (s/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta firma inválida? (s/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta firma desconocida? (s/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "¿Borrar realmente esta autofirma? (s/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas borradas.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas borradas\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "No se borró nada\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "Armadura no válida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "ID de usuario \"%s\" revocado." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "ID de usuario \"%s\" revocado." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "ID de usuario \"%s\" revocado." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3551,253 +3669,258 @@ "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:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Introduzca el ID de usuario del revocador designado: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "esta clave ya ha sido designada como revocadora\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite las selecciones de las claves secretas.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Por favor, seleccione como máximo una clave secundaria.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Cambiando fecha de caducidad de subclave.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "No existe la firma correspondiente en el anillo secreto\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Por favor seleccione exactamente un identificador de usuario.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitiendo autofirma V3 para el id \"%s\"\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Introduzca la URL de su servidor de claves preferido: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Seguro que quiere reemplazarlo? (s/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Seguro que quiere borrarlo? (s/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notación de firma: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "¿Sobreescribir? (s/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, 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:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "No hay ningún identificador de usuario con el índice %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "No existe una subclave con índice %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "firmada con su clave %s el %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (no exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta firma caducó el %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿De verdad quiere revocarla? (s/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ha firmado estos IDs de usuario con la clave %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (no revocable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revocada por la clave %s el %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Va a revocar las siguientes firmas:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Crear los certificados de revocación realmente? (s/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "no hay clave secreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "La clave %s ya ha sido revocada.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "La subclave %s ya ha sido revocada.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "preferencia `%s' duplicada\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "demasiadas preferencias de cifrado\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "demasiadas preferencias de resumen\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "demasiadas preferencias de compresión\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "caracter inválido `%s' en cadena de preferencias\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "escribiendo firma directa\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "escribiendo autofirma\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "escribiendo la firma de comprobación de clave\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de clave incorrecto; se usarán %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de clave redondeado a %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Firma" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Cifrado" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autentificación" @@ -3810,109 +3933,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "FfCcAaSs" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Posibles accriones para una %s clave: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Acciones permitidas actualmente: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Conmutar la capacidad de firmar\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Conmutar la capacidad de cifrado\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Conmutar la capacidad de autentificación\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Acabado\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Por favor seleccione tipo de clave deseado:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA y ElGamal (por defecto)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA y ElGamal (por defecto)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sólo firmar)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (permite elegir capacidades)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (sólo firmar)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (sólo cifrar)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (sólo firmar)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sólo cifrar)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (permite elegir capacidades)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (permite elegir capacidades)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "El par de claves DSA tendrá %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (permite elegir capacidades)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "¿De qué tamaño quiere la clave? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "¿De qué tamaño quiere la clave? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "El tamaño requerido es de %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "redondeados a %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3928,7 +4046,7 @@ " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3944,38 +4062,38 @@ " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "¿Validez de la clave (0)? " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Clave válida ¿durante (0)? " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "La clave nunca caduca\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "La firma nunca caduca\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "La clave caduca %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "La firma caduca el %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3983,11 +4101,11 @@ "Su sistema no puede mostrar fechas más allá del 2038.\n" "Sin embargo funcionará correctamente hasta el 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "¿Es correcto? (s/n) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4003,44 +4121,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nombre y apellidos: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caracter inválido en el nombre\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "El nombre no puede empezar con un número\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "El nombre debe tener al menos 5 caracteres\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Dirección de correo electrónico: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Dirección inválida\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Caracter inválido en el comentario\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está usando el juego de caracteres `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4051,7 +4169,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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 " @@ -4068,23 +4186,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcDdVvSs" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Por favor corrija primero el error.\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4092,12 +4210,12 @@ "Necesita una frase contraseña para proteger su clave secreta.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4109,7 +4227,7 @@ "la opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4122,50 +4240,50 @@ "generador de números aleatorios mayor oportunidad de recoger suficiente\n" "entropía.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Creación de claves cancelada.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "escribiendo clave pública en `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "escribiendo apuntador de la clave privada en `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "anillo público de claves no escribible encontrado: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "anillo privado de claves no escribible encontrado: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error escribiendo anillo público `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error escribiendo anillo privado `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "claves pública y secreta creadas y firmadas.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4173,12 +4291,12 @@ "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n" "la orden \"--edit-key\" para crear una subclave con este propósito.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4186,7 +4304,7 @@ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4194,25 +4312,25 @@ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "¿Crear de verdad? (s/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "almacenado de clave en la tarjeta fallido: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "no se puede crear fichero de respaldo `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n" @@ -4245,252 +4363,252 @@ msgid "Keyring" msgstr "Anillo de claves" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Huellas dactilares de la clave primaria:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Huella de clave primaria:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Huella de clave =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Número de serie de la tarjeta =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "renombrando `%s' en `%s' fallo: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s es el que no se ha modificado\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s es el nuevo\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Por favor arregle este posible fallo de seguridad\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "memorizando anillo `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu claves memorizadas (%lu firmas)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: anillo creado\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Introduzca la URL de su servidor de claves preferido: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "AVISO: las opciones de servidor de claves `%s' no se usan en esta " "plataforma\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "deshabilitado" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Introduzca número(s), O)tro, o F)in >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "clave \"%s\" no encontrada en el servidor\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "clave no encontrada en el servidor\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "solicitando clave %s de %s servidor %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "solicitando clave %s de %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "buscando \"%s\" de %s servidor %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "buscando \"%s\" de %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "enviando clave %s a %s servidor %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "enviando clave %s a %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "buscando \"%s\" de %s servidor %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "buscando \"%s\" de %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "¡no se solicita ninguna acción al servidor de claves!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" "AVISO: el manejo de claves procede de una versión diferente de GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "el servidor de claves no envió VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" "no se pueden realizar llamadas a un servidor externo de claves tal y\n" "como está compilado el programa\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" "la acción `%s' no es posible con este esquema de servidor de claves `%s'\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, fuzzy, c-format msgid "%s does not support handler version %d\n" msgstr "gpgkeys_%s no permite usar la versión %d del manejador\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "agotado el tiempo de espera para el servidor de claves\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "error interno del servidor de claves\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "error de comunicación con el servidor de claves: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" no es un identificador de clave válido: omitido\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "renovando 1 clave de %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "renovando %d claves desde %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n" @@ -4645,62 +4763,62 @@ msgid "[uncertain]" msgstr "[incierto]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " alias \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Firma caducada en %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "La firma caduca el %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "firma %s, algoritmo de resumen %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binaria" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modotexto" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "desconocido" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "no es una firma separada\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "AVISO: detectadas múltiples firmas. Sólo la primera se comprueba.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "firma independiente de clase 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "firma al viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz inválido detectado en proc_tree()\n" @@ -4739,59 +4857,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "AVISO: usando algoritmo de resumen experimental %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "AVISO: el algoritmo de resumen %s es una opción desaconsejada\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "el plugin para el cifrado IDEA no está presente\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = por favor muéstreme más información\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "AVISO: el algoritmo de resumen %s es una opción desaconsejada\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "el agente gpg no esta disponible en esta sesión\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opción desaconsejada \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ATENCIÓN: \"%s\" es una opción desaconsejada\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "por favor use \"%s%s\" en su lugar\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "ATENCIÓN: \"%s\" es una opción desaconsejada\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Sin comprimir" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "sin_comprimir|ninguno" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "este mensaje podría no ser utilizable por %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "opción ambigua `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "opción desconocida `%s'\n" @@ -4843,12 +4966,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "no puedo manejar el algoritmo de clave pública %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "AVISO: clave de sesión cifrada simétricamente potencialmente insegura\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n" @@ -4934,7 +5057,7 @@ msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4948,58 +5071,58 @@ "Si usa una foto muy grande, ¡su clave será también muy grande!\n" "Una imagen cercana a 240x288 tiene un tamaño adecuado.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Introduzca nombre del fichero JPEG para ID fotográfico: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "Imposible abrir fichero JPEG `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "¡Este JPEG es realmente grande (%d bytes)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' no es un fichero JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "¿Es correcta la foto? (s/n) " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "¡no puedo mostrar ID fotográfico!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "No se dio ninguna razón" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "La clave ha sido reemplazada." -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "La clave ha sido comprometida" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "La clave ya no está en uso" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "El identificador de usuario ya no es válido" @@ -5019,46 +5142,46 @@ msgid "No trust value assigned to:\n" msgstr "No hay confianza definida para:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " alias \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "¿Qué seguridad tiene de que esta clave pertenece realmente al usuario\n" "que se nombra?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = No lo sé o prefiero no decirlo\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NO tengo confianza\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = confío absolutamente\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = volver al menú principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = saltar esta clave\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = salir\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5067,41 +5190,41 @@ "El mínimo nivel de confianza para esta clave es: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "¿Su decisión? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "¿De verdad quiere asignar absoluta confianza a esta clave? (s/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que llevan a una clave de confianza absoluta:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: No hay seguridad de que esta clave pertenezca realmente\n" "al usuario que se nombra\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Hay poca seguridad de que esta clave pertenezca realmente\n" "al usuario que se nombra\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Esta clave probablemente pertenece al usuario que se nombra\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Esta clave nos pertenece\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5111,110 +5234,110 @@ "identificador de usuario. Si *realmente* sabe lo que está haciendo,\n" "puede contestar sí a la siguiente pregunta.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "¿Usar esta clave de todas formas? (s/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "AVISO: la clave puede estar revocada (falta clave de revocación)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n" "como revocador!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Esto puede significar que la firma está falsificada.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Nota: Esta clave está deshabilitada.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: ¡Esta clave ha caducado!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " No hay indicios de que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " La firma es probablemente una FALSIFICACIÓN.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATENCIÓN: ¡Esta clave no está certificada con firmas de suficiente " "confianza!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " No es seguro que la firma pertenezca al propietario.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: omitido: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: omitida: clave pública ya presente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Destinatarios actuales:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5222,33 +5345,33 @@ "\n" "Introduzca ID de usuario. Acabe con una línea vacía: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "ID de usuario inexistente.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "omitida: clave pública ya designada como destinataria por defecto\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Clave pública deshabilitada.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "omitida: clave pública ya establecida\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "desconocido el destinatario predefinido \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: omitida: clave pública deshabilitada\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "no hay direcciones válidas\n" @@ -5315,7 +5438,7 @@ msgstr "NOTA: la clave ha sido revocada" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "construcción del paquete fallida: %s\n" @@ -5337,11 +5460,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "se fuerza salida con armadura ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet falló: %s\n" @@ -5360,28 +5483,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "clave secreta \"%s\" no encontrada: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "no existe la clave pública correspondiente: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "¡la clave pública y la privada no se corresponden!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algoritmo de protección desconocido\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTA: ¡Esta clave no está protegida!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5400,33 +5523,33 @@ "de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n" "a otras personas!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Por favor elija una razón para la revocación:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancelar" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probablemente quería seleccionar %d aquí)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Introduzca una descripción opcional; acábela con una línea vacía:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Razón para la revocación: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(No se dió descripción)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "¿Es correcto? (s/N) " @@ -5504,17 +5627,17 @@ msgstr "" "AVISO: la subclave de cifrado %s tiene un certificado cruzado inválido\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "la clave pública %s es %lu segundos más nueva que la firma\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "la clave pública %s es %lu segundos más nueva que la firma\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5522,7 +5645,7 @@ "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n" "o problemas con el reloj)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5530,23 +5653,23 @@ "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n" "o problemas con el reloj)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: clave de la firma %s caducada el %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "asumiendo firma incorrecta de la clave %s por un bit crítico desconocido\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "clave %s: no hay subclave para la firma de revocación de subclave\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "clave %s: no hay subclave para firma de subclave de enlace\n" @@ -5684,12 +5807,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "base de datos de confianza: fallo sincronización: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5734,86 +5857,85 @@ msgid "%s: trustdb created\n" msgstr "%s: se ha creado base de datos de confianza\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: no se puede escribir base de datos de confianza\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de datos de confianza inválida\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: fallo en la creación de la tabla hash: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error actualizando el registro de versión: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error leyendo registro de versión: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error escribiendo registro de versión: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de datos de confianza: fallo lseek: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "base de datos de confianza: error lectura (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: no es una base de datos de confianza\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registro de versión con número de registro %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versión del fichero %d inválida\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error leyendo registro libre: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error escribiendo registro de directorio: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: fallo en poner a cero un registro: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: fallo al añadir un registro: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"La base de datos de confianza está dañada. Por favor, ejecute\n" -"\"gpg --fix-trust-db\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: se ha creado base de datos de confianza\n" #: g10/textfilter.c:147 #, c-format @@ -5860,126 +5982,134 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "registro de confianza %lu no es del tipo requerido %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "usando %s como modelo de confianza\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "13 no apto para supersticiosos" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revocada ]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ caducada ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[desconocida]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[no definida]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ dudosa ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ total ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ absoluta ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "no definido" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "nunca" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "dudosa" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "total" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "absoluta" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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" "con el modelo de confianza `%s'\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "no es necesario comprobar la base de datos de confianza\n" "con el modelo `%s'\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "clave pública %s no encontrada: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "por favor haga un --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "comprobando base de datos de confianza\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d claves procesadas (%d validaciones superadas)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "no se encuentran claves absolutamente fiables\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "clave pública de la clave absolutamente fiable %s no encontrada\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" "%d dudosa(s) necesarias, %d completa(s) necesarias,\n" "modelo de confianza %s\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5987,7 +6117,7 @@ "nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, %" "du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6275,47 +6405,47 @@ msgstr "ha encontrado un error... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "sí" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "fin" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "fF" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "vale|Vale" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancelar|Cancelar" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "vV" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6335,6 +6465,17 @@ 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 "DSA keypair will have %u bits.\n" +#~ msgstr "El par de claves DSA tendrá %u bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "La base de datos de confianza está dañada. Por favor, ejecute\n" +#~ "\"gpg --fix-trust-db\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|PIN Administrador" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "no uede poner datos de notación en claves v3 (estilo PGP 2.x)\n" @@ -7389,9 +7530,6 @@ #~ msgid "Too many preference items" #~ msgstr "Demasiados ítems de preferencias" -#~ msgid "public key not anymore available" -#~ msgstr "clave pública no disponible" - #~ msgid "insert_trust_record: keyblock not found: %s\n" #~ msgstr "insert_trust_record: bloque de clave no encontrado: %s\n" @@ -7419,9 +7557,6 @@ #~ msgid "can't lock keyring `%': %s\n" #~ msgstr "no puede bloquearse el anillo público `%s': %s\n" -#~ msgid "error writing keyring `%': %s\n" -#~ msgstr "error escribiendo anillo `%s': %s\n" - #~ msgid "writing keyblock\n" #~ msgstr "escribiendo bloque de claves\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/et.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/et.gmo differ diff -Nru gnupg-1.4.9/po/et.po gnupg-1.4.10/po/et.po --- gnupg-1.4.9/po/et.po 2008-03-25 08:53:07.000000000 +0000 +++ gnupg-1.4.10/po/et.po 2009-09-02 17:19:38.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "`%s' ei õnnestu avada: %s\n" @@ -76,9 +75,10 @@ msgid "note: random_seed file not updated\n" msgstr "märkus: random_seed faili ei uuendatud\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "`%s' ei õnnestu luua: %s\n" @@ -131,176 +131,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "salajase võtme komponendid ei ole kättesaadavad\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Palun valige tühistamise põhjus:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "viga parooli loomisel: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "viga võtmebloki lugemisel: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: viga vaba kirje lugemisel: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' on juba pakitud\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "genereeri uus võtmepaar" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "genereeri uus võtmepaar" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "ei leia OpenPGP andmeid.\n" @@ -386,176 +430,238 @@ msgstr "" "kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "salajane võti ei ole kättesaadav" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "seda ei saa teha pakettmoodis\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "See käsklus ei ole %s moodis lubatud.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Teie valik? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Põhjus puudub" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "ei töödeldud" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "vastavat avalikku võtit pole: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "viga võtmehoidla `%s' loomisel: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "viga `%s' lugemisel: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "viga `%s' loomisel: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "uuendatud eelistused" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "viga: vigane sõrmejälg\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "näita sõrmejälge" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "viga: vigane sõrmejälg\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "ei leia OpenPGP andmeid.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Millist võtmepikkust te soovite? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Millist võtmepikkust te soovite? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Millist võtmepikkust te soovite? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "ümardatud üles %u bitini\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "jätsin vahele: avalik võti on juba olemas\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -563,192 +669,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Allkiri aegus %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Vigane valik.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Palun valige tühistamise põhjus:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "tundmatu kaitsealgoritm\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, 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:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "välju sellest menüüst" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "näita seda abiinfot" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Võtme leiate: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "muuda aegumise kuupäeva" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "muuda omaniku usaldust" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "näita sõrmejälge" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "genereeri uus võtmepaar" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Käsklus> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Vigane käsklus (proovige \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "salajane võti ei ole kättesaadav" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Korrake parooli: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "`%s' ei õnnestu avada\n" @@ -757,13 +872,13 @@ msgid "--output doesn't work for this command\n" msgstr "võti --output ei tööta selle käsuga\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -866,7 +981,7 @@ msgstr "" "sümmetrilise ¨ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" @@ -1267,7 +1382,7 @@ msgid "Pubkey: " msgstr "Avalik võti: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "¦iffer: " @@ -1275,7 +1390,7 @@ msgid "Hash: " msgstr "Räsi: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Pakkimine: " @@ -1412,411 +1527,411 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "võtmete fail `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "vigased impordi võtmed\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "vigased impordi võtmed\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "antud allkirja poliisi URL on vigane\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path väärtuseks ei õnnestu seada %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s määrab üle %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos mõtet!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "valitud lühendi algoritm ei ole lubatud\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 või 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku ¨ifri eelistused\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lühendi eelistused\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ei tööta veel koos %s-ga\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "lahtikrüpteerimine ebaõnnestus: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [käsud]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "võtme eksport ebaõnnestus: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "võtmeserveri otsing ebaõnnestus: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine ebaõnnestus: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane räsialgoritm `%s'\n" @@ -1864,17 +1979,17 @@ "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid " "kasutamisega\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, 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" @@ -1900,8 +2015,9 @@ msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Süntaks: gpg [võtmed] [failid]\n" @@ -2690,12 +2806,12 @@ msgid "keyring `%s' created\n" msgstr "võtmehoidla `%s' on loodud\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "viga `%s' loomisel: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n" @@ -2744,7 +2860,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2757,12 +2873,12 @@ "passe, kontrollige erinevatest allikatest näpujälgi...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Usaldan vähesel määral\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Usaldan täiesti\n" @@ -3000,8 +3116,8 @@ msgid "Really sign? (y/N) " msgstr "Allkirjastan tõesti? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "allkirjastamine ebaõnnestus: %s\n" @@ -3010,20 +3126,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "See võti ei ole kaitstud.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Võti on kaitstud.\n" @@ -3040,7 +3156,7 @@ "Sisestage sellele salajasele võtmele uus parool.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" @@ -3382,117 +3498,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Kas tõesti uuendan seaded? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvestan muutused? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Väljun salvestamata? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "salajase võtme uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Teatelühend: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Omadused: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Noteering: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Selle võtme võib olla tühistanud %s võti " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (tundlik)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "%s ei õnnestu luua: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[tühistatud] " -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "See võti on blokeeritud" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3500,19 +3616,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[tühistatud] " -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3520,7 +3636,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3529,75 +3645,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Kustutan selle korrektse allkirja? (j/E/v)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Kustutan selle vigase allkirja? (j/E/v)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Kustutan selle tundmatu allkirja? (j/E/v)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Kustutatud %d allkiri.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Kustutatud %d allkirja.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Midagi ei kustutatud.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "vigane pakend" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Kasutaja ID \"%s\" on tühistatud." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Kasutaja ID \"%s\" on tühistatud." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Kasutaja ID \"%s\" on tühistatud." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3606,264 +3722,270 @@ "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:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Sisestage määratud tühistaja kasutaja ID: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "palun valige ülimalt üks sekundaarne võti.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Muudan sekundaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Muudan primaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Palun valige täpselt üks kasutaja ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Allkirja noteerimine: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Kirjutan üle (j/E)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "kasutaja ID: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " allkirjastanud %08lX %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "See allkiri aegub %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " allkirjastanud %08lX %s%s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " tühistanud %08lX %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Te asute tühistama järgmisi allkirju:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "salajast võtit pole\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "eelistus %c%lu on duplikaat\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "liiga palju `%c' eelistusi\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "liiga palju `%c' eelistusi\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "liiga palju `%c' eelistusi\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "kirjutan otsese allkirja\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "kirjutan iseenda allkirja\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "kirjutan võtit siduva allkirja\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "vigane võtme suurus; kasutan %u bitti\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "võtme suurus ümardatud üles %u bitini\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "krüpteeri andmed" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3876,109 +3998,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (ainult krüptimiseks)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Palun valige, millist võtmetüüpi te soovite:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA ja ElGamal (vaikimisi)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA ja ElGamal (vaikimisi)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (ainult allkirjastamiseks)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (ainult krüpteerimiseks)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (ainult allkirjastamiseks)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (ainult krüptimiseks)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (ainult allkirjastamiseks)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Millist võtmepikkust te soovite? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Millist võtmepikkust te soovite? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Soovitud võtmepikkus on %u bitti\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "ümardatud üles %u bitini\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3994,7 +4111,7 @@ " m = võti aegub n kuuga\n" " y = võti aegub n aastaga\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4010,40 +4127,40 @@ " m = allkiri aegub n kuuga\n" " y = allkiri aegub n aastaga\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Võti on kehtiv kuni? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Allkiri on kehtiv kuni? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "vigane väärtus\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s ei aegu kunagi\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s ei aegu kunagi\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s aegub %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Allkiri aegub %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4051,12 +4168,12 @@ "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n" "Siiski käsitletakse neid korrektselt aastani 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "On see õige (j/e)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4072,44 +4189,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Pärisnimi: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Lubamatu sümbol nimes\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Nimi ei või alata numbriga\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Nimes peab olema vähemalt 5 sümbolit\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-posti aadress: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Selline e-posti aadress ei ole lubatud\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Kommentaar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Lubamatu sümbol kommentaaris\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Te kasutate kooditabelit `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4120,7 +4237,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4135,23 +4252,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKkEeOoVv" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Palun parandage kõigepealt viga\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4159,12 +4276,12 @@ "Te vajate oma salajase võtme kaitsmiseks parooli.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4176,7 +4293,7 @@ "kasutades seda programmi võtmega \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4188,50 +4305,50 @@ "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n" "koguda paremat entroopiat.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Võtme genereerimine katkestati.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjutan avaliku võtme faili `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4241,43 +4358,43 @@ "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n" "kasutades võtit \"--edit-key\".\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, 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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, 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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Loon tõesti? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "`%s' ei õnnestu luua: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "MÄRKUS: salajane võti %08lX aegus %s\n" @@ -4310,254 +4427,254 @@ msgid "Keyring" msgstr "Võtmehoidla" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Võtme sõrmejälg =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s ei ole muudetud\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s on uus\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Palun parandage see võimalik turvaprobleem\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "kontrollin võtmehoidlat `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "kontrollitud %lu võtit (%lu allkirja)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "kontrollitud %lu võtit (%lu allkirja)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: võtmehoidla on loodud\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "antud allkirja poliisi URL on vigane\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "vigased ekspordi võtmed\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "allkirjastatud teie võtmega %08lX %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "vigased ekspordi võtmed\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "võtmeserveri viga" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "võtmeserveri viga" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n" @@ -4711,62 +4828,62 @@ msgid "[uncertain]" msgstr "[ebakindel]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " ka \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Allkiri aegus %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Allkiri aegub %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binaarne" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "tekstimood" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "tundmatu" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Allkirja ei saa kontrollida: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "ei ole eraldiseisev allkiri\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "eraldiseisev allkiri klassiga 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "vana stiili (PGP 2.x) allkiri\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() tuvastas vigase juurmise paketi\n" @@ -4806,61 +4923,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "" -"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA ¨ifri lisandprogrammi pole\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = esita palun täiendavat infot\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ebasoovitav võti \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "palun kasutage selle asemel \"%s%s\"\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Pakkimata" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Pakkimata" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "see teade ei pruugi olla programmiga %s kasutatav\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "tundmatu vaikimisi saaja `%s'\n" @@ -4913,13 +5035,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni " "võti\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n" @@ -5007,7 +5129,7 @@ msgid "Repeat passphrase: " msgstr "Korrake parooli: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5021,59 +5143,59 @@ "väga suurt pilti, on ka kõti väha suur!\n" "Mõistlik pildi suurus võiks olla umbes 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Sisestage foto ID jaoks JPEG faili nimi: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "faili ei õnnestu avada: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\": ei ole JPEG fail\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "On see foto õige (j/E/v)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "foto ID ei saa näidata!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Põhjus puudub" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Võti on asendatud" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Võti on kompromiteeritud" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Võti ei ole enam kasutusel" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Kasutaja ID ei ole enam kehtiv" @@ -5096,87 +5218,87 @@ "Usalduse väärtus puudub:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " ka \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "See võti kuulub tõenäoliselt omanikule\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Ei tea\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = EI usalda\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Usaldan absoluutselt\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " t = tagasi põhimenüüsse\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " j = jäta see võti vahele\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " v = välju\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Teie otsus? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Kas te tõesti soovite seda võtit absoluutselt usaldada? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "See võti kuulub tõenäoliselt omanikule\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "See võti kuulub meile\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5188,109 +5310,109 @@ "võite järgnevale küsimusele vastata jaatavalt\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Kasutan seda võtit ikka? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "HOIATUS: see võti võib olla tühistatud (tühistamise võtit pole)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, 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:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Märkus: See võti on blokeeritud.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Märkus: See võti on aegunud!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "HOIATUS: Me EI usalda seda võtit!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Allkiri on tõenäoliselt VÕLTSING.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava " "allkirjaga!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: jätsin vahele: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: jätsin vahele: avalik võti on juba olemas\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5298,33 +5420,33 @@ "\n" "Sisestage kasutaja ID. Lõpetage tühja reaga: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Tundmatu kasutaja ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Avalik võti on blokeeritud.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "jätsin vahele: avalik võti on juba olemas\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "tundmatu vaikimisi saaja `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "kehtivaid aadresse pole\n" @@ -5391,7 +5513,7 @@ msgstr "MÄRKUS: võti on tühistatud" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet ebaõnnestus: %s\n" @@ -5414,11 +5536,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Loon sellele võtmele tühistamise sertifikaadi? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet ebaõnnestus: %s\n" @@ -5439,29 +5561,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "salajast võtit `%s' ei leitud: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "vastavat avalikku võtit pole: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "avalik võti ei sobi salajase võtmega!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Loon sellele võtmele tühistamise sertifikaadi? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "tundmatu kaitsealgoritm\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "MÄRKUS: See võti ei ole kaitstud!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5482,33 +5604,33 @@ "trükisüsteem\n" "võib salvestada need andmed ja teha teistele kättesaadavaks! \n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Palun valige tühistamise põhjus:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Katkesta" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Tõenäoliselt soovite siin valida %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Tühistamise põhjus: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Kirjeldust ei antud)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "On see hästi? " @@ -5584,44 +5706,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "avalik võti %08lX on %lu sekund uuem, kui allkiri\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "avalik võti %08lX on %lu sekundit uuem, kui allkiri\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n" @@ -5765,12 +5887,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync ebaõnnestus: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -5814,84 +5936,85 @@ msgid "%s: trustdb created\n" msgstr "%s: trustdb on loodud\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "MÄRKUS: trustdb pole kirjutatav\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: vigane trustdb\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: viga versioonikirje uuendamisel: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: viga versioonikirje lugemisel: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: viga versioonikirje kirjutamisel: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek ebaõnnestus: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ei ole trustdb fail\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versioonikirje kirje numbriga %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: vigane faili versioon %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: viga vaba kirje lugemisel: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: viga kataloogikirje kirjutamisel: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: kirje nullimine ebaõnnestus: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: kirje lisamine ebaõnnestus: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: trustdb on loodud\n" #: g10/textfilter.c:147 #, c-format @@ -5938,130 +6061,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[tühistatud] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[aegunud] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "tundmatu" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "mitte kunagi" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb järgmine kontroll %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, 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:626 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ei leia avalikku võtit %08lX: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "palun tehke --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "kontrollin trustdb faili\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "absoluutselt usaldatavaid võtmeid pole\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6323,47 +6454,47 @@ msgstr "te leidsite vea ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "jah" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "ei" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "eE" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "välju" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "vV" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6384,6 +6515,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n" @@ -6805,10 +6943,6 @@ #~ "\"\n" #~ "lokaalselt allkirjastatud teie võtmega %08lX %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " allkirjastanud %08lX %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: ei õnnestu kasutada: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/fi.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/fi.gmo differ diff -Nru gnupg-1.4.9/po/fi.po gnupg-1.4.10/po/fi.po --- gnupg-1.4.9/po/fi.po 2008-03-25 08:53:07.000000000 +0000 +++ gnupg-1.4.10/po/fi.po 2009-09-02 17:19:38.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -54,13 +54,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "tiedostoa \"%s\" ei voi avata: %s\n" @@ -93,9 +92,10 @@ msgid "note: random_seed file not updated\n" msgstr "huom: random_seed-tiedostoa ei päivitetty\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "tiedostoa \"%s\" ei voi luoda: %s\n" @@ -149,177 +149,221 @@ "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n" "(Vielä tarvitaan %d tavua)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "salaisen avaimen osat eivät ole käytettävissä\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Valitse mitätöinnin syy:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "virhe luotaessa salasanaa: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "virhe luettaessa avainlohkoa: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "\"%s\" on jo pakattu\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "luo uusi avainpari" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "luo uusi avainpari" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + # Ensimmäinen %s on binary, textmode tai unknown, ks. alla -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%sallekirjoitus, tiivistealgoritmi %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n" @@ -407,176 +451,238 @@ "viallista\n" "MTA:ta on käytetty\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "salaista avainta ei löydy" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "tätä ei voi tehdä eräajossa\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Tätä komentoa ei sallita %s-tilassa.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Valintasi? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Ei eriteltyä syytä" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "ei käsitelty" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "ei vastaavaa julkista avainta: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "virhe luotaessa avainrengasta \"%s\": %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "virhe luettaessa tiedostoa \"%s\": %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "virhe luotaessa \"%s\": %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "päivitä valinnat" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "virhe: sormenjälki on väärä\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "näytä sormenjälki" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "virhe: sormenjälki on väärä\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Minkä kokoisen avaimen haluat? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Minkä kokoisen avaimen haluat? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Minkä kokoisen avaimen haluat? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "pyöristetty %u bittiin\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ohitetaan: salainen avain on jo paikalla\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -584,192 +690,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Valitse millaisen avaimen haluat:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Allekirjoitus vanheni %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Valinta ei kelpaa.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Valitse mitätöinnin syy:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "tuntematon suojausalgoritmi\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ohitetaan: salainen avain on jo paikalla\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ulos tästä valikosta" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "näytä tämä ohje" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Avain saatavilla kohteessa: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "muuta voimassoloaikaa" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "muuta luottamusastetta" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "näytä sormenjälki" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "luo uusi avainpari" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Komento> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "salaista avainta ei löydy" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Toista salasana: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "tiedostoa \"%s\" ei voi avata\n" @@ -778,13 +893,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -884,7 +999,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" @@ -1287,7 +1402,7 @@ msgid "Pubkey: " msgstr "JulkAvain: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Salaus: " @@ -1295,7 +1410,7 @@ msgid "Hash: " msgstr "Tiiviste: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Pakkaus: " @@ -1432,412 +1547,412 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "asetustiedosto \"%s\": %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "HUOM: %s ei ole normaaliin käyttöön!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voi asettaa\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s eivät ole sallittuja yhdessä!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s yhdessä on järjetöntä!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistealgoritmi ei kelpaa\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed täytyy olla suurempi kuin 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed täytyy olla suurempi kuin 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 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/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "virheelliset oletusarvoiset valinnat\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "virheelliset henkilökohtaisen salaimen valinnat\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ja %s eivät vielä toimi yhdessä\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "avaus epäonnistui: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key käyttäjätunnus" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key käyttäjätunnus" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key käyttäjätunnus [komennot]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "avaimen vienti epäonnistui: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "avainpalvelimen päivitys epäonnistui: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "ascii-koodauksen purku epäonnistui: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "ascii-koodaaminen epäonnistui: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "virheellinen tiivistealgoritmi \"%s\"\n" @@ -1884,18 +1999,18 @@ msgstr "" "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "" "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -1923,8 +2038,9 @@ msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Käyttö: gpg [valitsimet] [tiedostot]\n" @@ -2724,12 +2840,12 @@ msgid "keyring `%s' created\n" msgstr "avainrengas \"%s\" luotu\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "virhe luotaessa \"%s\": %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n" @@ -2779,7 +2895,7 @@ msgstr "" "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2792,12 +2908,12 @@ "lähteistä...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Luotan osittain\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Luotan täysin\n" @@ -3037,8 +3153,8 @@ msgid "Really sign? (y/N) " msgstr "Varmastiko allekirjoita? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "allekirjoitus epäonnistui: %s\n" @@ -3047,20 +3163,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Avainta ei ole suojattu.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Avain on suojattu.\n" @@ -3077,7 +3193,7 @@ "Syötä uusi salasana salaiselle avaimelle.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." @@ -3419,117 +3535,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Varmastiko päivitä valinnat? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Tallenna muutokset? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Lopeta tallentamatta muutoksia?" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "päivitys epäonnistui: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "salaisen päivitys epäonnistui: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Tiiviste: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Ominaisuudet: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notaatio: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Tämä avain voidaan mitätöidä %s-avaimella " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (luottamuksellinen)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "ei voida luoda kohdetta %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[mitätöity] " -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Tämä avain on poistettu käytöstä" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3537,19 +3653,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[mitätöity] " -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3557,7 +3673,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3566,75 +3682,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Varmastiko poista oma-allekirjoitus? (k/E)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d allekirjoitus poistettu.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d allekirjoitusta poistettu.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Mitään ei poistettu.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "virheellinen ascii-koodaus" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Käyttäjätunnus \"%s\" on mitätöity." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Käyttäjätunnus \"%s\" on mitätöity." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Käyttäjätunnus \"%s\" on mitätöity." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3644,268 +3760,274 @@ "voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 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:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Poista salaisten avainten valinnat, kiitos.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Valitse tasan yksi käyttäjätunnus!\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Allekirjoitusnotaatio: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Ylikirjoita (k/E)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "käyttäjätunnus: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Tämä allekirjoitus vanheni %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Haluatko varmasti mitätöidä sen? (k/E) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " %08lX allekirjoitti tämän %s%s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, 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:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "salainen avain ei ole saatavilla\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, 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:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n" "(käyttäjätunnus %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "valinta %c%lu on kopio\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "liian monta \"%c\" valintaa\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "liian monta \"%c\" valintaa\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "liian monta \"%c\" valintaa\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "kirjoitetaan suora allekirjoitus\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "kirjoitetaan oma-allekirjoitus\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "avaimen koko on pyöristetty %u bittiin\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "salaa tiedot" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3918,109 +4040,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (vain salaus)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Valitse millaisen avaimen haluat:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA ja ElGamal (oletus)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA ja ElGamal (oletus)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (vain allekirjoitus)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (vain salaus)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (vain allekirjoitus)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (vain salaus)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (vain allekirjoitus)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA-avainparissa on 1024 bittiä.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Minkä kokoisen avaimen haluat? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Minkä kokoisen avaimen haluat? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Halutun avaimen koko on %u bittiä\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "pyöristetty %u bittiin\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4036,7 +4153,7 @@ " m = Avain vanhenee n kuukauden kuluttua\n" " y = Avain vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4052,40 +4169,40 @@ " m = Allekirjoitus vanhenee n kuukauden kuluttua\n" " y = Allekirjoitus vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Avain on voimassa? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Allekirjoitus on voimassa? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "arvo ei kelpaa\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s ei vanhene koskaan\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s ei vanhene koskaan\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s vanhenee %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Allekirjoitus vanhenee %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4093,12 +4210,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Onko tämä oikein (k/e) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4116,44 +4233,44 @@ " \"Matti Meikäläinen (nuorempi) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Oikea nimi: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Nimessä on epäkelpo merkki\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Nimi ei voi alkaa numerolla\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Sähköpostiosoite: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Sähköpostiosoite ei kelpaa\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Huomautus: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Huomautuksessa on epäkelpo merkki\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Käytät merkistöä \"%s\".\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4164,7 +4281,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4179,23 +4296,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnHhSsOoLl" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Ole hyvä ja korjaa ensin virhe\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4203,12 +4320,12 @@ "Tarvitset salasanan suojaamaan salaista avaintasi.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4220,7 +4337,7 @@ "tämän ohjelman valitsimella \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4232,50 +4349,50 @@ "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n" "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Avaimen luonti keskeytetty.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4284,12 +4401,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4297,7 +4414,7 @@ "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4305,26 +4422,26 @@ "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Haluatko varmasti luoda? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "tiedostoa \"%s\" ei voi luoda: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "HUOM: salainen avain %08lX vanheni %s\n" @@ -4357,256 +4474,256 @@ msgid "Keyring" msgstr "Avainrengas" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Ensisijaisen avaimen sormenjälki:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Ensisijaisen avaimen sormenjälki:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Avaimen sormenjälki =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "ascii-koodaaminen epäonnistui: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s säilyi muuttumattomana\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s on uusi\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "tarkistetaan avainrengasta \"%s\"\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: avainrengas luotu\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä " "ajossa\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "avainta \"%s\" ei löydy: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "avainta \"%s\" ei löydy: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "allekirjoitettu avaimellasi %08lX %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "avainpalvelinvirhe" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "avainpalvelinvirhe" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n" @@ -4763,65 +4880,65 @@ msgid "[uncertain]" msgstr "[ei tiedossa]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " aka \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Allekirjoitus vanheni %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Allekirjoitus vanhenee %s\n" # Ensimmäinen %s on binary, textmode tai unknown, ks. alla -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%sallekirjoitus, tiivistealgoritmi %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binääri" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "teksti" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "tuntematon " -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Allekirjoitusta ei voi tarkistaa: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "allekirjoitus ei ole erillinen\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "VAROITUS: useita allekirjoituksia havaittu. Vain ensimmäisen voi " "tarkistaa.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n" @@ -4862,61 +4979,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%sallekirjoitus, tiivistealgoritmi %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "" -"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = näytä lisätietoja\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: paheksuttava valitsin \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "käytä valitsinta \"%s%s\" sen sijaan\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "pakkaamaton" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "pakkaamaton" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "%s ei kenties voi käsitellä tätä viestiä\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "tuntematon oletusvastaanottaja \"%s\"\n" @@ -4971,11 +5093,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n" @@ -5062,7 +5184,7 @@ msgid "Repeat passphrase: " msgstr "Toista salasana: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5077,59 +5199,59 @@ "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n" "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "ei voi avata tiedostoa: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" ei ole JPEG-tiedosto\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Onko tämä oikein (k/E/l)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "valokuvatunnistetta ei voi näyttää!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Ei eriteltyä syytä" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Avain on uusittu" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Avain on murrettu" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Avain ei ole enää käytössä" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Käyttäjätunnus ei ole enää käytössä" @@ -5152,91 +5274,91 @@ "Luottamusarvoa ei ole asetettu seuraavalle:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " aka \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = En tiedä\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = EN luota\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Luotan ehdottomasti\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = takaisin päävalikkoon\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " o = ohita tämä avain\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " l = lopeta\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Valintasi? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu " "haltijalleen.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu " "haltijalleen.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Tämä on oma avain\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5248,114 +5370,114 @@ "kysymykseen kyllä\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei " "saatavilla)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, 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:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Huom: Tämä avain on poistettu käytöstä\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Huom: Tämä avain on vanhentunut!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Mikään ei takaa sitä, että allekirjoitus todella kuuluu " "haltijalleen.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n" "allekirjoituksella!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ohitettu: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ohitettu: julkinen avain on jo olemassa\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5363,33 +5485,33 @@ "\n" "Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Käyttäjätunnusta ei löydy.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Julkinen avain on poistettu käytöstä\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "ohitettu: julkinen avain on jo asetettu\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "tuntematon oletusvastaanottaja \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "ei kelvollisia vastaanottajia\n" @@ -5457,7 +5579,7 @@ msgstr "HUOM: avain on mitätöity!" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet epäonnistui: %s\n" @@ -5480,11 +5602,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Luo tälle avaimelle mitätöintivarmenne? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII-koodattu tuloste määritetty.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet epäonnistui: %s\n" @@ -5503,29 +5625,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "salaista avainta \"%s\" ei löydy: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "ei vastaavaa julkista avainta: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Luo tälle avaimelle mitätöintivarmenne? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "tuntematon suojausalgoritmi\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "HUOM: Tätä avainta ei ole suojattu!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5545,33 +5667,33 @@ "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden " "saataville!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Valitse mitätöinnin syy:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Peru" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Todennäköisesti haluat valita %d tässä)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Mitätöinnin syy: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Kuvausta ei annettu)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Kelpaako tämä? " @@ -5648,17 +5770,17 @@ msgstr "" "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5666,7 +5788,7 @@ "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5674,24 +5796,24 @@ "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta " "\"critical bit\":istä\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n" @@ -5838,12 +5960,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: synkronointi epäonnistui: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek epäonnistui: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n" @@ -5887,84 +6009,85 @@ msgid "%s: trustdb created\n" msgstr "%s: trustdb luotu\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "HUOM: trustdb:n ei voida kirjoittaa\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb ei kelpaa\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: virhe luettaessa versiotietuetta: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek epäonnistui: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: luku epäonnistui (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ei ole trustdb-tiedosto\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versiotietue tietuenumerolla %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: tiedostoversio %d ei kelpaa\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: tietueen nollaaminen epäonnistui: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: trustdb luotu\n" #: g10/textfilter.c:147 #, c-format @@ -6012,130 +6135,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[mitätöity] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[vanhentunut] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "tuntematon " -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "ei koskaan" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "seuraava trustdb tarkistus %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "julkista avainta %08lX ei löydy: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "tee --check-trustdb, kiitos\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "tarkistetaan trustdb:tä\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n" @@ -6397,47 +6528,47 @@ msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "kyllä|kylla|joo" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "kK" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "ei" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "eE" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "lopeta|sulje" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "lLsS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6458,6 +6589,13 @@ 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" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA-avainparissa on 1024 bittiä.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n" @@ -6887,10 +7025,6 @@ #~ "\"\n" #~ "allekirjoitettu paikallisesti avaimellasi %08lX %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " %08lX allekirjoitti tämän %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: kohteeseen ei päästä: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/fr.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/fr.gmo differ diff -Nru gnupg-1.4.9/po/fr.po gnupg-1.4.10/po/fr.po --- gnupg-1.4.9/po/fr.po 2008-03-25 10:23:35.000000000 +0000 +++ gnupg-1.4.10/po/fr.po 2009-09-02 17:20:10.000000000 +0100 @@ -1,18 +1,18 @@ # GnuPG French translation -# Copyright (C) 1998-2005 Free Software Foundation, Inc. +# Copyright (C) 1998-2009 Free Software Foundation, Inc. # Gaël Quéri , 1998. # # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po 4715 2008-03-25 10:45:59Z wk $ +# $Id: fr.po 5137 2009-09-02 17:32:43Z wk $ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.4.2rc2\n" +"Project-Id-Version: gnupg 1.4.9\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2005-06-28 00:24+0200\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2009-08-18 10:29+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -34,22 +34,21 @@ msgstr "aucun module de récupération d'entropie n'a été trouvé.\n" #: cipher/random.c:401 -#, fuzzy, c-format +#, c-format msgid "can't lock `%s': %s\n" -msgstr "impossible de verrouiller `%s'\n" +msgstr "impossible de verrouiller `%s': %s\n" #: cipher/random.c:406 -#, fuzzy, c-format +#, c-format msgid "waiting for lock on `%s'...\n" -msgstr "écriture de la clé secrète dans `%s'\n" +msgstr "attente du verrou sur `%s'...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "impossible d'ouvrir `%s': %s\n" @@ -83,9 +82,10 @@ msgid "note: random_seed file not updated\n" msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "impossible de créer `%s': %s\n" @@ -140,179 +140,227 @@ "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:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "impossible de stocker l'empreinte: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "impossible de stocker la date de création: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "la lecture de la clé publique a échoué: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 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:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "la réponse ne contient pas le modulo RSA\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 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:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "l'appel du PIN a retourné une erreur: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, 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:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "la vérification CHV%d a échoué: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "l'accès aux commandes d'administration n'est pas configuré\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "erreur pendant la récupération de l'état CHV de la carte\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "la carte est irrémédiablement bloquée !\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, 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" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|code PIN d'administration" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "l'accès aux commandes d'administration n'est pas configuré\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "les parties secrètes ne sont pas disponibles\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "choisissez la cause de la révocation:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code 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:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Nouveau code PIN d'administration" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Nouveau code PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "erreur pendant la lecture de données d'application\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "erreur pendant la lecture de l'empreinte DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "la clé existe déjà\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "la clé existante sera remplacée\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "générer une nouvelle clé\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "générer une nouvelle clé\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "l'horodatage de création est manquant\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "l'exposant public RSA est manquant ou trop élevé (plus de %d bits)\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n" "%d bits\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "le stockage de la clé a échoué: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "attendez que la clé se génère...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "la génération de la clé a échoué\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "la génération de clé a été effectuée (%d secondes)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "structure de carte OpenPGP invalide (DO 0x93)\n" -#: g10/app-openpgp.c:2085 -#, fuzzy, c-format +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 +#, c-format msgid "card does not support digest algorithm %s\n" -msgstr "signature %s, algorithme de hachage %s\n" +msgstr "la carte ne supporte pas l'algorithme de hachage %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "signatures créées jusqu'ici: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "la vérification du code PIN d'administration est actuellement interdite\n" "au travers de cette commande\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "impossible d'accéder à %s - carte OpenPGP invalide ?\n" @@ -335,9 +383,8 @@ msgstr "en-tête de signature claire invalide\n" #: g10/armor.c:459 -#, fuzzy msgid "unknown armor header: " -msgstr "en-tête d'armure: " +msgstr "en-tête d'armure inconnu: " #: g10/armor.c:512 msgid "nested clear text signatures\n" @@ -397,167 +444,229 @@ "caractère cité-imprimable (quoted-printable) dans l'armure provenant\n" "certainement d'un agent de transfert de messages bogué\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "la carte OpenPGP n'est pas disponible: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "carte OpenPGP n° %s détectée\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "impossible de faire cela en mode automatique\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Cette commande n'est pas admise en mode %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Votre choix ? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[non positionné]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "masculin" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "féminin" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "non spécifié" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "non forcé" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forcé" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Erreur: Le caractère « < » ne peut pas être utilisé.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Erreur: Les espaces doubles ne sont pas permis.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Nom du déteneur de la carte: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Prénom du déteneur de la carte: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Erreur: Nom combiné trop long (la limite est %d caractères).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL pour récupérer la clé publique: %s" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Erreur: URL trop long (la limite est %d caractères).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "erreur durant la création du porte-clés `%s' : %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "erreur pendant la lecture de `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "erreur pendant la création de `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Données d'identification (nom du compte): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, 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:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Données DO privées: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Erreur: DO privé trop long (la limite est %d caractères).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Préférences de langue: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Erreur: longueur invalide de la chaîne de préférences.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Erreur: caractères invalide dans la chaîne de préférences.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Sexe ((M)asculin, (F)éminin ou espace): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Erreur: réponse invalide.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "empreinte de l'autorité de certification: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Erreur: empreinte mal formatée.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "l'opération sur la clé n'est pas possible: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "ce n'est pas une carte OpenPGP" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "" "erreur durant la lecture des informations contenues actuellement\n" "dans la clé: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Remplacer la clé existante ? (o/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Quelle taille de clé désirez-vous ? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Quelle taille de clé désirez-vous ? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Quelle taille de clé désirez-vous ? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "arrondie à %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "les tailles de clés %s doivent être dans l'intervalle %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "erreur pendant la lecture du bloc de clé secrète « %s »: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Faire une sauvegarde hors carte de la clé de chiffrement ? (O/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "la clé secrète est déjà stockée sur une carte\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Remplacer les clés existantes ? (o/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -568,140 +677,148 @@ " PIN = `%s' PIN admin = `%s'\n" "Vous devriez les changer avec la commande --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Sélectionnez le type de clé à générer:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Clé de signature\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Clé de chiffrement\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Clé d'authentification\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Choix invalide.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Sélectionnez l'endroit où stocker la clé:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "algorithme de protection de clé inconnu\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "Les parties secrètes de la clé ne sont pas disponibles.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 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:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "erreur durant l'écriture du porte-clés `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "indiquer les commandes d'administration" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "afficher cette aide" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "lister toutes les données disponibles" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "changer le nom du propriétaire de la carte" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "changer l'URL pour récupérer la clé" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 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:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "changer le nom d'identification" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "changer les préférences de langue" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "changer le sexe du propriétaire de la carte" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "changer l'empreinte d'une autorité de certification" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 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:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "générer de nouvelles clés" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "menu pour changer ou déverrouiller le PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "vérifier le code PIN et lister toutes les données" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Commande> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "La commande n'est utilisable qu'en mode administration\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Les commandes d'administration sont permises\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Les commandes d'administration ne sont pas permises\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez «help»)\n" -#: g10/cardglue.c:414 -#, fuzzy +#: g10/cardglue.c:457 msgid "card reader not available\n" -msgstr "la clé secrète n'est pas disponible" +msgstr "lecteur de cartes indisponible\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Insérez la carte et tapez entrée ou entrez 'c' pour annuler: " -#: g10/cardglue.c:444 -#, fuzzy, c-format +#: g10/cardglue.c:487 +#, c-format msgid "selecting openpgp failed: %s\n" -msgstr "la suppression du bloc de clés a échoué : %s\n" +msgstr "sélectionner openpgp a échoué : %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -711,36 +828,36 @@ "série:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Tapez entrée quand vous êtes prêt ou entrez 'c' pour annuler: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Entrez le nouveau code PIN admin: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Entrez le nouveau code PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Entrez le code PIN admin: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Entrez le code PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Répétez ce code PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "le code PIN n'a pas été correctement répété ; recommencez" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "impossible d'ouvrir `%s'\n" @@ -749,13 +866,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output n'est pas compatible avec cette commande\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "clé « %s » introuvable: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -862,7 +979,7 @@ "forcer le chiffrement symétrique %s (%d) entre en désaccord\n" "avec les préferences du destinataire\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" @@ -958,32 +1075,29 @@ "%s\n" #: g10/export.c:59 -#, fuzzy msgid "export signatures that are marked as local-only" -msgstr "La signature sera marquée comme non-révocable.\n" +msgstr "exporter les signatures marquées comme locales seulement" #: g10/export.c:61 msgid "export attribute user IDs (generally photo IDs)" msgstr "" +"exporter les IDs attributs utilisateur (en général les photos d'identité)" #: g10/export.c:63 -#, fuzzy msgid "export revocation keys marked as \"sensitive\"" -msgstr "aucune clé de révocation trouvée pour « %s »\n" +msgstr "exporter les clés de révocation marquées comme \"sensibles\"" #: g10/export.c:65 -#, fuzzy msgid "remove the passphrase from exported subkeys" -msgstr "révoquer la clé ou les sous-clés sélectionnées" +msgstr "enlever la phrase de passe des sous-clés exportées" #: g10/export.c:67 -#, fuzzy msgid "remove unusable parts from key during export" -msgstr "nettoyer les parties inutilisables de la clé" +msgstr "enlever les parties inutilisables de la clé pendant l'export" #: g10/export.c:69 msgid "remove as much as possible from key during export" -msgstr "" +msgstr "supprimer autant que possible de la clé pendant l'export" #: g10/export.c:323 msgid "exporting secret keys not allowed\n" @@ -1000,18 +1114,18 @@ msgstr "clé %s: clé de style PGP 2.x - ignorée\n" #: g10/export.c:371 -#, fuzzy, c-format +#, c-format msgid "key %s: key material on-card - skipped\n" -msgstr "clé %s: signature de sous-clé au mauvais endroit - ignorée\n" +msgstr "clé %s: matériel de clé sur la carte - ignorée\n" #: g10/export.c:519 msgid "about to export an unprotected subkey\n" -msgstr "" +msgstr "sur le point d'exporter une sous-clé non protégée\n" #: g10/export.c:542 -#, fuzzy, c-format +#, c-format msgid "failed to unprotect the subkey: %s\n" -msgstr "le stockage de la clé a échoué: %s\n" +msgstr "déprotéger la sous-clé a échoué: %s\n" #: g10/export.c:563 #, c-format @@ -1266,7 +1380,7 @@ msgid "Pubkey: " msgstr "Clé publique: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Chiffrement: " @@ -1274,7 +1388,7 @@ msgid "Hash: " msgstr "Hachage: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compression: " @@ -1384,473 +1498,476 @@ #: g10/gpg.c:1577 msgid "display photo IDs during key listings" -msgstr "" +msgstr "afficher les photos d'identité en listant les clés" #: g10/gpg.c:1579 msgid "show policy URLs during signature listings" -msgstr "" +msgstr "afficher les URLs de politique en listant les signatures" #: g10/gpg.c:1581 -#, fuzzy msgid "show all notations during signature listings" -msgstr "Pas de signature correspondante dans le porte-clés secret\n" +msgstr "montrer toutes les notations en listant les signatures" #: g10/gpg.c:1583 msgid "show IETF standard notations during signature listings" -msgstr "" +msgstr "utiliser les notations standard IETF en listant les signatures" #: g10/gpg.c:1587 msgid "show user-supplied notations during signature listings" msgstr "" +"utiliser les notations fournies par l'utilisateur en listant les signatures" #: g10/gpg.c:1589 -#, fuzzy msgid "show preferred keyserver URLs during signature listings" -msgstr "l'URL du serveur de clés favori qui a été donnée est invalide\n" +msgstr "montrer les URLs préférées des serveurs de clés en listant les clés" #: g10/gpg.c:1591 msgid "show user ID validity during key listings" -msgstr "" +msgstr "indiquer la validité du nom d'utilisateur en listant les clés" #: g10/gpg.c:1593 msgid "show revoked and expired user IDs in key listings" msgstr "" +"indiquer les noms d'utilisateurs révoqués et expirés en listant les clés" #: g10/gpg.c:1595 msgid "show revoked and expired subkeys in key listings" -msgstr "" +msgstr "indiquer les sous-clés révoquées et expirées en listant les clés" #: g10/gpg.c:1597 -#, fuzzy msgid "show the keyring name in key listings" -msgstr "" -"passer de la liste des clés secrètes à celle des clés privées\n" -"et inversement" +msgstr "montrer le nom du porte-clés en listant les clés" #: g10/gpg.c:1599 -#, fuzzy msgid "show expiration dates during signature listings" -msgstr "Pas de signature correspondante dans le porte-clés secret\n" +msgstr "montrer les dates d'expiration en listant les signatures" #: g10/gpg.c:1801 #, 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/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: pas de fichier d'options par défaut `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' n'est pas une date d'expiration de signature valide\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' n'est pas un jeu de caractères valide\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "impossible d'interpréter l'URL du serveur de clés\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: les options du serveur de clés sont invalides\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "les options du serveur de clés sont invalides\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: options de liste invalides\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "options de liste invalides\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" -msgstr "" +msgstr "montrer les photos d'identité pendant la vérification de signatures" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" -msgstr "" +msgstr "afficher les URLs de politique pendant la vérification des signatures" -#: g10/gpg.c:2658 -#, fuzzy +#: g10/gpg.c:2664 msgid "show all notations during signature verification" -msgstr "`%s' n'est pas une date d'expiration de signature valide\n" +msgstr "montrer toutes les notations en vérifiant les signatures" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" +"utiliser les notations standard IETF pendant la vérification des signatures" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" +"utiliser les notations fournies par l'utilisateur pendant la vérification " +"des signatures" -#: g10/gpg.c:2666 -#, fuzzy +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" -msgstr "l'URL du serveur de clés favori qui a été donnée est invalide\n" +msgstr "" +"montrer les URLs de serveur de clé préféré pendant la vérification\n" +"des signatures" -#: g10/gpg.c:2668 -#, fuzzy +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" -msgstr "`%s' n'est pas une date d'expiration de signature valide\n" +msgstr "" +"montrer la validité du nom d'utilisateur pendant la vérification\n" +"de signatures" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" +"indiquer les noms d'utilisateurs révoqués et expirés pendant la vérification " +"des signatures" -#: g10/gpg.c:2672 -#, fuzzy +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" -msgstr "`%s' n'est pas une date d'expiration de signature valide\n" +msgstr "" +"ne montrer que le nom d'utilisateur principal pendant la vérification\n" +"de signature" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" -msgstr "" +msgstr "valider les signatures avec les données PKA" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" -msgstr "" +msgstr "augmenter la confiance des signatures avec des données PKA valides" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: options de vérification invalides\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "options de vérification invalides\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'exécution à %s\n" -#: g10/gpg.c:2856 -#, fuzzy, c-format +#: g10/gpg.c:2862 +#, c-format msgid "%s:%d: invalid auto-key-locate list\n" -msgstr "%s:%d: options de vérification invalides\n" +msgstr "%s:%d: liste de recherche de clé automatique invalide\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" -msgstr "" +msgstr "liste de localisation automatique de clés invalide\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "NOTE: %s n'est pas disponible dans cette version\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "pas d'exécution ave une mémoire non sécurisée à cause de %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "l'algorithme de compression sélectionné est invalide\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification sélectionnée est invalide\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "«completes-needed» doit être supérieur à 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "«marginals-needed» doit être supérieur à 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "préférences par défaut invalides\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "préférences de chiffrement personnelles invalides\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "préférences de hachage personnelles invalides\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "préférences de compression personnelles invalides\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne marche pas encore avec %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "le chiffrement symétrique de `%s' a échoué: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [nom du fichier]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 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/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [nom du fichier]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 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/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'envoi vers le serveur de clés a échoué: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la réception depuis le serveur de clés a échoué: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "l'export de la clé a échoué: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "la recherche au sein du serveur de clés a échoué: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "le rafraîchissement par le serveur de clés a échoué: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a échoué: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a échoué: %s \n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" @@ -1887,7 +2004,7 @@ #: g10/getkey.c:997 #, c-format msgid "automatically retrieved `%s' via %s\n" -msgstr "" +msgstr "`%s' automatiquement récupéré par %s\n" #: g10/getkey.c:1829 #, c-format @@ -1896,19 +2013,19 @@ "La clé invalide %s a été rendue valide par\n" "--allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "pas de sous-clé secrète pour la clé publique %s - ignorée\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "" "utilisation de la sous-clé %s à la place de la clé\n" "principale %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "clé %s: clé secrète sans clé publique - non prise en compte\n" @@ -1937,10 +2054,10 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" -"Syntaxe: gpg [options] [fichiers]\n" +"Syntaxe: gpgv [options] [fichiers]\n" "Verifier des signatures avec des clés de confiance connues\n" #: g10/helptext.c:47 @@ -2278,34 +2395,31 @@ #: g10/import.c:94 msgid "import signatures that are marked as local-only" -msgstr "" +msgstr "importer des signatures marquées comme locales seulement" #: g10/import.c:96 msgid "repair damage from the pks keyserver during import" -msgstr "" +msgstr "réparer les données endomagées du serveur pks pendant l'import" #: g10/import.c:98 -#, fuzzy msgid "do not update the trustdb after import" -msgstr "mettre la base de confiance à jour" +msgstr "ne pas mettre à jour la base de confiance après l'import" #: g10/import.c:100 -#, fuzzy msgid "create a public key when importing a secret key" -msgstr "la clé publique ne correspond pas à la clé secrète !\n" +msgstr "créer une clé publique en important une clé secrète" #: g10/import.c:102 msgid "only accept updates to existing keys" -msgstr "" +msgstr "n'accepter que les mises à jour des clés existantes" #: g10/import.c:104 -#, fuzzy msgid "remove unusable parts from key after import" -msgstr "nettoyer les parties inutilisables de la clé" +msgstr "nettoyer les parties inutilisables de la clé après l'import" #: g10/import.c:106 msgid "remove as much as possible from key after import" -msgstr "" +msgstr "enlever autant que possible de la clé après l'import" #: g10/import.c:265 #, c-format @@ -2393,14 +2507,13 @@ msgstr " noms d'utilisateur nettoyés: %lu\n" #: g10/import.c:565 -#, fuzzy, c-format +#, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "AVERTISSEMENT: la clé %s contient des préferences pour des\n" #. TRANSLATORS: This string is belongs to the previous one. They are #. only split up to allow printing of a common prefix. #: g10/import.c:569 -#, fuzzy msgid " algorithms on these user IDs:\n" msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n" @@ -2747,12 +2860,12 @@ msgid "keyring `%s' created\n" msgstr "le porte-clés `%s` a été créé\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "ressource bloc de clés `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "la reconstruction du cache de porte-clés a échoué : %s\n" @@ -2801,7 +2914,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d nom d'utilisateurs sans auto-signature valide détecté\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2809,16 +2922,16 @@ "etc.)\n" msgstr "" "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" +"pour qu'il vérifie les clés des autres utilisateurs\n" +"(en vérifiant les passeports, en vérifiant les empreintes de plusieurs\n" +" sources différentes, etc.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = je crois marginalement\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = je fais entièrement confiance\n" @@ -3041,8 +3154,8 @@ msgid "Really sign? (y/N) " msgstr "Signer réellement ? (o/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "la signature a échoué: %s\n" @@ -3053,21 +3166,21 @@ "La clé possède seulement des items partiels ou stockés sur carte -\n" "pas de phrase de passe à changer.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Cette clé n'est pas protégée.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Les parties secrètes de la clé principale ne sont pas disponibles.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "" "Les parties secrètes de la clé principale sont stockées sur la\n" "carte.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "La clé est protégée.\n" @@ -3082,7 +3195,7 @@ "\n" msgstr "Entrez la nouvelle phrase de passe pour cette clé secrète.\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "la phrase de passe n'a pas été correctement répétée ; recommencez." @@ -3131,21 +3244,21 @@ msgid "sign selected user IDs [* see below for related commands]" msgstr "" "signer les noms d'utilisateurs sélectionnés [* voir ci-dessous pour\n" -"les commandes similaires]" +" les commandes similaires]" #: g10/keyedit.c:1369 msgid "sign selected user IDs locally" -msgstr "signer le nom d'utilisateur sélectionné localement" +msgstr "signer les noms d'utilisateurs sélectionnés localement" #: g10/keyedit.c:1371 msgid "sign selected user IDs with a trust signature" -msgstr "signer les noms d'utilisateurs sélectionnés localement" +msgstr "signer les noms d'utilisateurs avec une signature de confiance" #: g10/keyedit.c:1373 msgid "sign selected user IDs with a non-revocable signature" msgstr "" "signer les noms d'utilisateurs sélectionnés avec une signature\n" -"non-révocable" +" non-révocable" #: g10/keyedit.c:1377 msgid "add a user ID" @@ -3185,11 +3298,13 @@ #: g10/keyedit.c:1402 msgid "delete signatures from the selected user IDs" -msgstr "enlever les signatures des noms d'utilisateur sélectionnés " +msgstr "enlever les signatures des noms d'utilisateurs sélectionnés" #: g10/keyedit.c:1404 msgid "change the expiration date for the key or selected subkeys" -msgstr "changer la date d'expiration de la clé ou des sous-clés sélectionnées" +msgstr "" +"changer la date d'expiration de la clé ou des sous-clés\n" +" sélectionnées" #: g10/keyedit.c:1406 msgid "flag the selected user ID as primary" @@ -3199,7 +3314,7 @@ msgid "toggle between the secret and public key listings" msgstr "" "passer de la liste des clés secrètes à celle des clés privées\n" -"et inversement" +" et inversement" #: g10/keyedit.c:1411 msgid "list preferences (expert)" @@ -3213,21 +3328,17 @@ msgid "set preference list for the selected user IDs" msgstr "" "indiquer la liste des préférences pour le nom d'utilisateur\n" -"sélectionné" +" sélectionné" #: g10/keyedit.c:1420 -#, fuzzy msgid "set the preferred keyserver URL for the selected user IDs" msgstr "" -"indiquer l'URL du serveur de clés préféré pour les noms d'utilisateur\n" -"sélectionnés" +"indiquer le serveur de clés préféré pour les noms d'utilisateurs\n" +" sélectionnés" #: g10/keyedit.c:1422 -#, fuzzy msgid "set a notation for the selected user IDs" -msgstr "" -"indiquer la liste des préférences pour le nom d'utilisateur\n" -"sélectionné" +msgstr "indiquer une notation pour le nom d'utilisateur sélectionné" #: g10/keyedit.c:1424 msgid "change the passphrase" @@ -3264,10 +3375,14 @@ #: g10/keyedit.c:1442 msgid "compact unusable user IDs and remove unusable signatures from key" msgstr "" +"compacter les noms d'utilisateurs inutilisables et enlever les\n" +" signatures inutilisables de la clé" #: g10/keyedit.c:1444 msgid "compact unusable user IDs and remove all signatures from key" msgstr "" +"compacter les noms d'utilisateur inutilisables et enlever toutes\n" +" les signatures de la clé" #: g10/keyedit.c:1566 #, c-format @@ -3410,119 +3525,115 @@ msgid "Really update the preferences? (y/N) " msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Enregistrer les changements? (o/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Quitter sans enregistrer ? (o/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "la mise à jour a échoué: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "la mise à jour de la clé secrète a échoué: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Hachage: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Fonctions: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Serveur de clés: pas-de-modification" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Serveur de clés préféré: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 -#, fuzzy +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " -msgstr "" -"@\n" -"Options:\n" -" " +msgstr "Notations: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Cette clé a été révoquée le %s par la clé %s %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(sensible)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "créé: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revoqué: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "expiré: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "expire: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "utilisation: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr " confiance: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "validité: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Cette clé a été désactivée" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "n° de carte: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3530,17 +3641,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revoquée" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "expirée" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3549,7 +3660,7 @@ "Cette commande risque de rendre un autre nom d'utilisateur principal\n" "par défaut.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3559,75 +3670,75 @@ "d'identité peut empêcher certaines versions de PGP d'accepter\n" "cette clé\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Supprimer cette bonne signature ? (o/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Supprimer cette signature invalide ? (o/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Supprimer cette signature inconnue ? (o/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d signature supprimée.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d signatures supprimées\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Rien n'a été supprimé.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "invalide" -#: g10/keyedit.c:3231 -#, fuzzy, c-format +#: g10/keyedit.c:3233 +#, c-format msgid "User ID \"%s\" compacted: %s\n" -msgstr "Nom d'utilisateur \"%s\": déjà nettoyé.\n" +msgstr "Nom d'utilisateur \"%s\" compacté: %s\n" -#: g10/keyedit.c:3238 -#, fuzzy, c-format +#: g10/keyedit.c:3240 +#, c-format msgid "User ID \"%s\": %d signature removed\n" -msgstr "clé %s: « %s » %d signature nettoyée\n" +msgstr "Nom d'utilisateur \"%s\": %d signature enlevée\n" -#: g10/keyedit.c:3239 -#, fuzzy, c-format +#: g10/keyedit.c:3241 +#, c-format msgid "User ID \"%s\": %d signatures removed\n" -msgstr "clé %s: « %s » %d signatures nettoyées\n" +msgstr "Nom d'utilisateur \"%s\": %d signatures enlevées\n" -#: g10/keyedit.c:3247 -#, fuzzy, c-format +#: g10/keyedit.c:3249 +#, c-format msgid "User ID \"%s\": already minimized\n" -msgstr "Nom d'utilisateur \"%s\": déjà nettoyé.\n" +msgstr "Nom d'utilisateur \"%s\": déjà minimisé\n" -#: g10/keyedit.c:3248 -#, fuzzy, c-format +#: g10/keyedit.c:3250 +#, c-format msgid "User ID \"%s\": already clean\n" -msgstr "Nom d'utilisateur \"%s\": déjà nettoyé.\n" +msgstr "Nom d'utilisateur \"%s\": déjà nettoyé\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3637,269 +3748,272 @@ "désigné peut empêcher certaines versions de PGP d'accepter\n" "cette clé.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Entrez le nom d'utilisateur du révocateur désigné: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sélections des clés secrètes.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Vous devez sélectionner au plus une sous-clé.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Changer la date d'expiration d'une sous-clé.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clé principale.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clés secret\n" -#: g10/keyedit.c:3680 -#, fuzzy, c-format +#: g10/keyedit.c:3687 +#, c-format msgid "signing subkey %s is already cross-certified\n" -msgstr "" -"AVERTISSEMENT: la sous-clé de signature %s n'a pas de certificat\n" -"croisé\n" +msgstr "la sous-clé de signature %s a déjà une certification croisée\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" +"la sous-clé %s ne signe pas et n'a donc pas besoin d'une certification " +"croisée\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Vous devez sélectionner exactement un utilisateur.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Entrez l'URL de votre serveur de clés favori: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 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:4139 +#: g10/keyedit.c:4147 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:4201 -#, fuzzy +#: g10/keyedit.c:4209 msgid "Enter the notation: " -msgstr "Notation de signature: " +msgstr "Entrez la notation: " -#: g10/keyedit.c:4350 -#, fuzzy +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " -msgstr "Réécrire par-dessus ? (o/N) " +msgstr "Continuer ? (o/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Pas de nom d'utilisateur avec le hachage %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Pas de sous-clé avec l'index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "nom d'utilisateur: « %s »\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (non-révocable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "révoqué par votre clé %s à %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Vous êtes sur le point de révoquer ces signatures:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Créer réellement les certificats de révocation ? (o/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "pas de clé secrète\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, 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:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "La clé %s est déjà révoqué.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "La sous-clé %s est déjà révoquée.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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é\n" "0x%s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "préférence `%s' dupliquée\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "trop de préférences de chiffrement\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "trop de préférences de hachage\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "trop de préférences de compression\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "élément `%s' invalide dans la chaîne de préférences\n" # g10/keygen.c:123 ??? -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "écriture de la signature directe\n" # g10/keygen.c:123 ??? -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "écriture de l'auto-signature\n" # g10/keygen.c:161 ??? -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "écriture de la signature de liaison\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Taille invalide; utilisation de %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "taille arrondie à %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Signer" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" -msgstr "" +msgstr "Certifier" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Chiffrer" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authentifier" @@ -3912,109 +4026,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsCcAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Actions possibles pour une clé %s: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Actions actuellement permises: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Inverser la capacité de signer\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Inverser la capacité de chiffrement\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Inverser la capacité d'authentifier\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Terminé\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Sélectionnez le type de clé désiré:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA et Elgamal (par défaut)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA et Elgamal (par défaut)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (signature seule)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (indiquez vous-même les capacités)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (signature seule)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (chiffrement seul)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (signature seule)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (chiffrement seul)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (indiquez vous-même les capacités)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (indiquez vous-même les capacités)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "La paire de clés DSA fera %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (indiquez vous-même les capacités)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "les clés %s peuvent faire entre %u et %u bits de longueur.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Quelle taille de clé désirez-vous ? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "les tailles de clés %s doivent être dans l'intervalle %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "Quelle taille de clé désirez-vous ? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La taille demandée est %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "arrondie à %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4030,7 +4139,7 @@ " m = la clé expire dans n mois\n" " y = la clé expire dans n années\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4046,38 +4155,38 @@ " m = la signature expire dans n mois\n" " y = la signature expire dans n années\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "La clé est valide pour ? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "La signature est valide pour ? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valeur invalide\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "La clé n'expire pas du tout\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "La signature n'expire pas du tout\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "La clé expire le %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "La signature expire le %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4085,11 +4194,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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Est-ce correct ? (o/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4105,44 +4214,44 @@ " « Heinrich Heine (Der Dichter) »\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nom réel: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caractère invalide dans le nom\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Le nom ne doit pas commencer par un chiffre\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Adresse e-mail: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ce n'est pas une adresse e-mail valide\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Commentaire: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Caractère invalide dans le commentaire\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vous utilisez le jeu de caractères '%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4153,7 +4262,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4169,23 +4278,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Corrigez l'erreur d'abord\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4194,12 +4303,12 @@ "secrète.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4213,7 +4322,7 @@ "« --edit-key ».\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4225,52 +4334,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "La génération de clé a été annulée.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "écriture de la clé publique dans `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "écriture d'une clé secrète partielle dans `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "écriture de la clé secrète dans `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, 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:3122 +#: g10/keygen.c:3308 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:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4279,13 +4388,13 @@ "utiliser la commande «--edit-key» pour générer une sous-clé à\n" "cette fin.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, 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:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4293,7 +4402,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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4301,26 +4410,26 @@ "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Créer vraiment ? (o/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "le stockage de la clé dans la carte a échoué: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossible de créer le fichier de sauvegarde `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTE: sauvegarde de la clé de la carte dans `%s'\n" @@ -4353,264 +4462,262 @@ msgid "Keyring" msgstr "Porte-clés" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Empreinte de clé principale:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Empreinte de la clé principale:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Empreinte de la clé =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "N° de série de la carte =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "renommer `%s' en `%s' a échoué: %s \n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s est le fichier original\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s est le nouveau\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Réparez ce problème de sécurité possible\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "mise en antémémoire du porte-clés `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu clés en antémémoire vérifiées pour l'instant (%lu signatures)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu clés en antémémoire (%lu signatures)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: porte-clés créé\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" -msgstr "" +msgstr "inclure les clés révoquées dans les résultats de recherche" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" -msgstr "" +msgstr "inclure les sous-clés en cherchant par ID de clé" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" +"utiliser des fichiers temporaires pour passer les données aux aides pour\n" +"serveurs de clés" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" -msgstr "" +msgstr "ne pas supprimer les fichiers temporaires après les avoir utilisés" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" -msgstr "" +msgstr "récupérer les clés automatiquement en vérifiant les signatures" -#: g10/keyserver.c:78 -#, fuzzy +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" -msgstr "Entrez l'URL de votre serveur de clés favori: " +msgstr "honorer l'URL de serveur de clés préféré indiqué dans la clé" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" +"honorer l'enregistrement PKA positionné sur une clé en récupérant les clés" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "AVERTISSEMENT: les options de serveur de clés `%s' ne sont pas\n" "utilisées dans cette plateforme\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "désactivé" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "clé « %s » introuvable dans le serveur de clés\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "clé non trouvée dans le serveur de clés\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "requête de la clé %s de %s\n" -#: g10/keyserver.c:1179 -#, fuzzy, c-format +#: g10/keyserver.c:1184 +#, c-format msgid "searching for names from %s server %s\n" -msgstr "recherche de « %s » du serveur %s %s\n" +msgstr "recherche de noms du %s serveur %s\n" -#: g10/keyserver.c:1182 -#, fuzzy, c-format +#: g10/keyserver.c:1187 +#, c-format msgid "searching for names from %s\n" -msgstr "recherche de « %s » de %s\n" +msgstr "recherche de noms de %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "envoi de la clé %s à %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "recherche de « %s » du serveur %s %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "recherche de « %s » de %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "pas d'action pour le serveur de clés !\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, 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:1449 +#: g10/keyserver.c:1479 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:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 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:1529 +#: g10/keyserver.c:1559 #, 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:1534 +#: g10/keyserver.c:1564 #, 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:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s ne supporte pas le gestionnaire de version %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "le délai d'attente du serveur de clés a expiré\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "erreur interne du serveur de clés\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "erreur de communication avec le serveur de clés: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "« %s » n'est pas une ID de clé: ignoré\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "rafraîchissement d'une clé depuis %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "rafraîchissement de %d clés depuis %s\n" -#: g10/keyserver.c:1961 -#, fuzzy, c-format +#: g10/keyserver.c:1991 +#, c-format msgid "WARNING: unable to fetch URI %s: %s\n" -msgstr "" -"AVERTISSEMENT: impossible de rafraîchir la clé %s\n" -"via %s: %s\n" +msgstr "AVERTISSEMENT: impossible de récupérer l'URI %s: %s\n" -#: g10/keyserver.c:1967 -#, fuzzy, c-format +#: g10/keyserver.c:1997 +#, c-format msgid "WARNING: unable to parse URI %s\n" -msgstr "" -"AVERTISSEMENT: impossible de rafraîchir la clé %s\n" -"via %s: %s\n" +msgstr "AVERTISSEMENT: impossible d'analyser l'URI %s\n" #: g10/mainproc.c:243 #, c-format @@ -4705,25 +4812,23 @@ #: g10/mainproc.c:722 msgid "WARNING: multiple plaintexts seen\n" -msgstr "" +msgstr "AVERTISSEMENT: plusieurs textes en clair ont été aperçus\n" #: g10/mainproc.c:850 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n" #: g10/mainproc.c:1198 -#, fuzzy msgid "no signature found\n" -msgstr "Bonne signature de « %s »" +msgstr "aucune signature trouvée\n" #: g10/mainproc.c:1441 msgid "signature verification suppressed\n" msgstr "vérification de signature supprimée\n" #: g10/mainproc.c:1550 -#, fuzzy msgid "can't handle this ambiguous signature data\n" -msgstr "le traitement de ces signatures multiples est impossible\n" +msgstr "impossible de traiter ces données ambiguës de signature\n" #: g10/mainproc.c:1561 #, c-format @@ -4763,48 +4868,48 @@ msgid "[uncertain]" msgstr "[incertain]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " alias « %s »" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "La signature a expiré le %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "La signature expire le %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "signature %s, algorithme de hachage %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binaire" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modetexte" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "inconnu" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossible de vérifier la signature: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "la signature n'est pas détachée\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" @@ -4812,16 +4917,16 @@ "première\n" "sera vérifiée.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "signature autonome de classe 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide détecté dans proc_tree()\n" @@ -4848,9 +4953,9 @@ "publique %s\n" #: g10/misc.c:320 -#, fuzzy msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n" -msgstr "AVERTISSEMENT: l'algorithme de hachage %s est déconseillé\n" +msgstr "" +"AVERTISSEMENT: Les clés signature+chiffrement Elgamal sont déconseillées\n" #: g10/misc.c:333 #, c-format @@ -4866,61 +4971,66 @@ "AVERTISSEMENT: utilisation de l'algorithme de hachage\n" "expérimental %s\n" -#: g10/misc.c:353 +#: g10/misc.c:458 +msgid "the IDEA cipher plugin is not present\n" +msgstr "le module de chiffrement IDEA n'est pas présent\n" + +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 +#, c-format +msgid "please see %s for more information\n" +msgstr "merci de voir %s pour plus d'informations\n" + +#: g10/misc.c:475 #, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "AVERTISSEMENT: l'algorithme de hachage %s est déconseillé\n" -#: g10/misc.c:459 -msgid "the IDEA cipher plugin is not present\n" -msgstr "le module de chiffrement IDEA n'est pas présent\n" - -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:491 #, fuzzy, c-format -msgid "please see %s for more information\n" -msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n" +msgid "NOTE: This feature is not available in %s\n" +msgstr "NOTE: %s n'est pas disponible dans cette version\n" -#: g10/misc.c:693 +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: option déconseillée \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVERTISSEMENT: \"%s\" est une option déconseillée.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "utilisez \"%s%s\" à la place\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" "AVERTISSEMENT: \"%s\" est une commande déconseillée - ne\n" "l'utilisez pas\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Non-compressé" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "noncompressé|non" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "ce message ne sera pas utilisable par %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "option ambiguë `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "option `%s' inconnue\n" @@ -4973,13 +5083,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossible de gérer l'algorithme à clé publique %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "AVERISSEMENT: la clé de session chiffrée de manière symétrique est\n" "potentiellement non sûre\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "un sous-paquet de type %d possède un bit critique\n" @@ -5066,7 +5176,7 @@ msgid "Repeat passphrase: " msgstr "Répétez la phrase de passe: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5081,58 +5191,58 @@ "en sera de même pour votre clé !\n" "La meilleure taille à utiliser est 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Entrez le nom du fichier JPEG pour la photo d'identité: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Ce JPEG est vraiment trés grand (%d octets) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Êtes-vous sûr de vouloir l'utiliser ? (o/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' n'est pas un fichier JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Cette photo est-elle correcte (o/N/q) ? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" -msgstr "" +msgstr "aucun visionneur de photos n'a été choisi\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "impossible d'afficher la photo d'identité !\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Aucune raison spécifiée" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "La clé a été remplacée" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "La clé a été compromise" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "La clé n'est plus utilisée" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Le nom d'utilisateur n'est plus valide" @@ -5152,46 +5262,46 @@ msgid "No trust value assigned to:\n" msgstr "Pas de valeur de confiance définie pour :\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " alias « %s »\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "Jusqu'à quel point avez-vous confiance au fait que cette clé\n" "appartient rééllement à l'utilisateur nommé ?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = ne sais pas ou ne dirai pas\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = je ne fais PAS confiance\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = je donne une confiance ultime\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = retour au menu principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = sauter cette clé\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = quitter\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5200,41 +5310,41 @@ "Le niveau de confiance minimal pour cette clé est: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Votre décision ? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Voulez-vous vraiment donner une confiance ultime à cette clé ? (o/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clé à confiance ultime:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Rien ne dit que la clé appartient vraiment à l'utilisateur\n" "nommé.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Il n'est pas vraiment sûr que la clé appartient vraiment\n" "à l'utilisateur nommé.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Cette clé appartient probablement à l'utilisateur nommé\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Cette clé nous appartient\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5245,115 +5355,115 @@ "vous pouvez répondre oui à la prochaine question.\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Utiliser cette clé quand même ? (o/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION: Utilisation d'une clé sans confiance !\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "AVERTISSEMENT: cette clé est peut-être révoquée (clé de révocation\n" "absente)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVERTISSEMENT: Cette clé à été révoquée par son révocateur désigné !\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENTION: Cette clé à été révoquée par son propriétaire !\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENTION: Cette sous-clé à été révoquée par son propriétaire !\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Note: cette clé a été désactivée.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" -msgstr "" +msgstr "Note: L'adresse vérifiée du signataire est `%s'\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" -msgstr "" +msgstr "Note: L'adresse du signataire `%s' n'est pas conforme à l'entrée DNS\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" -msgstr "" +msgstr "indice de confiance ajusté à PLEIN car informations PKA valides\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" -msgstr "" +msgstr "indice de confiance ajusté à JAMAIS car mauvaises informations PKA\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Note: Cette clé a expiré !\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATTENTION: Cette clé n'est pas certifiée avec une signature de confiance !\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Rien ne dit que la signature appartient à son propriétaire.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION: Nous ne faisons PAS confiance à cette clé !\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENTION: Les signatures de cette clé n'ont pas une confiance suffisante !\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Il n'est pas sûr que la signature appartient à son " "propriétaire.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignoré: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ignoré: clé publique déjà présente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Vous n'avez pas spécifié de nom d'utilisateur. (vous pouvez\n" "utiliser «-r»)\n" "\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Récipients actuels:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5361,33 +5471,33 @@ "\n" "Entrez le nom d'utilisateur, en terminant par une ligne vide: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Pas d'utilisateur de ce nom.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "ignoré: la clé publique est déjà le destinataire par défaut\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "La clé publique est désactivée.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "ignoré: clé publique déjà activée\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinataire par défaut « %s » inconnu\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ignoré: la clé publique est désactivée\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -5458,7 +5568,7 @@ msgstr "NOTE: la clé a été révoquée" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet a échoué: %s\n" @@ -5480,11 +5590,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Générer un certificat de révocation désignée pour cette clé ? (o/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "sortie avec armure ASCII forcée.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet a échoué: %s\n" @@ -5503,28 +5613,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "la clé secrète « %s » n'a pas été trouvée: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "pas de clé publique correspondante: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "la clé publique ne correspond pas à la clé secrète !\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Générer un certificat de révocation pour cette clé ? (o/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algorithme de protection inconnu\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTE: Cette clé n'est pas protégée !\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5544,33 +5654,33 @@ "le système d'impression de votre machine pourrait stocker ces\n" "données et les rendre accessibles à d'autres personnes !\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "choisissez la cause de la révocation:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Annuler" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Vous devriez sûrement sélectionner %d ici)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Entrez une description optionnelle ; terminez-là par une ligne vide:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Cause de révocation: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Aucune description donnée)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Est-ce d'accord ? (o/N) " @@ -5620,17 +5730,17 @@ #: g10/seskey.c:218 msgid "DSA requires the hash length to be a multiple of 8 bits\n" -msgstr "" +msgstr "DSA nécessite que la longueur du hachage soit un multiple de 8 bits\n" #: g10/seskey.c:232 #, c-format msgid "DSA key %s uses an unsafe (%u bit) hash\n" -msgstr "" +msgstr "la clé DNS %s utilise un hachage peu sûr (%u bits)\n" #: g10/seskey.c:244 #, c-format msgid "DSA key %s requires a %u bit or larger hash\n" -msgstr "" +msgstr "la clé DSA %s a besoin d'un hachage de %u bits ou plus\n" #: g10/sig-check.c:74 msgid "WARNING: signature digest conflict in message\n" @@ -5650,18 +5760,18 @@ "AVERTISSEMENT: la sous-clé de signature %s a un certificat croisé\n" "invalide\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "la clé publique %s est plus récente de %lu seconde que la signature\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the 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:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5669,7 +5779,7 @@ "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:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5677,24 +5787,24 @@ "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:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTE: la clé de signature %s a expiré le %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "la signature de la clé %s est supposée être fausse car un bit\n" "critique est inconnu\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "clé %s: pas de sous-clé pour la signature de révocation de sous-clé\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5842,12 +5952,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "base de confiance: la synchronisation a échoué: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "enregistrement de base de confiance %lu: lseek a échoué: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5892,86 +6002,87 @@ msgid "%s: trustdb created\n" msgstr "%s: base de confiance créée\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTE: la base de confiance n'a pas les permissions d'écriture\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de confiance invalide\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: la création de la table de hachage a échoué: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erreur pendant la mise à jour de l'enregistrement de version: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erreur pendant l'écriture de l'enregistrement de version: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de confiance: «lseek()» a échoué: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "base de confiance: la lecture a échoué (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ce n'est pas un fichier de base de confiance\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: enregistrement de version avec un numéro %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: version %d du fichier invalide\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" "%s: erreur pendant l'écriture de l'enregistrement de\n" "répertoire: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: n'a pu mettre un enregistrement à zéro: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: impossible d'ajouter un enregistrement: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: base de confiance créée\n" #: g10/textfilter.c:147 #, c-format @@ -6020,128 +6131,136 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "l'enregistrement de confiance %lu: n'est pas du type demandé %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, 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:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "utilisation du modèle de confiance %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "11 le traducteur a bien lu ce qu'il fallait :)" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revoquée]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ expirée ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ inconnue]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[indéfinie]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginale]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ entière ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ ultime ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "indéfinie" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "jamais" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginale" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "entière" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ultime" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "clé publique %s non trouvée : %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "faites un --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "vérifier la base de confiance\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "aucune clé de confiance ultime n'a été trouvée\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, 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:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -6149,7 +6268,7 @@ "profondeur: %d valide: %3d signé: %3d\n" "confiance: %d-. %dg. %dn. %dm. %df. %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6390,9 +6509,8 @@ msgstr "pas de carte" #: util/errors.c:109 -#, fuzzy msgid "no data" -msgstr "pas de données signées\n" +msgstr "pas de données" #: util/logger.c:156 msgid "ERROR: " @@ -6413,47 +6531,47 @@ msgstr "vous avez trouvé un bug... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "oui" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "oO" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "non" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quitter" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "ok|ok" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "annuler|annuler" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "aA" @@ -6475,58 +6593,11 @@ 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 "can't put notation data into v3 (PGP 2.x style) signatures\n" -#~ msgstr "" -#~ "impossible de mettre des données de notation dans des signatures v3\n" -#~ "(de style PGP 2.x)\n" - -#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -#~ msgstr "" -#~ "impossible de mettres des données de notation dans des signatures de\n" -#~ "clés v3 (de style PGP 2.x)\n" - -#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -#~ msgstr "" -#~ "impossible de mettre une URL de politique dans des signatures v3\n" -#~ "(de style PGP 2.x)\n" - -#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -#~ msgstr "" -#~ "impossible de mettre une URL de politique dans des signatures de clé v3\n" -#~ "(de style PGP 2.x)\n" - -#~ 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" - -#~ msgid "" -#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n" -#~ msgstr "" -#~ "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n" - -#~ msgid "" -#~ "a notation name must have only printable characters or spaces, and end " -#~ "with an '='\n" -#~ msgstr "" -#~ "le nom d'une notation ne doit comporter que des caractères imprimables\n" -#~ "ou des espaces, et se terminer par un signe '='\n" - -#~ msgid "a user notation name must contain the '@' character\n" -#~ msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n" - -#~ msgid "a notation name must not contain more than one '@' character\n" -#~ msgstr "" -#~ "un nom de notation utilisateur ne doit pas plus d'un caractère '@'\n" - -#~ 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" - -#~ msgid "WARNING: invalid notation data found\n" -#~ msgstr "ATTENTION: des données de notation invalides ont été détectées\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "La paire de clés DSA fera %u bits.\n" -#~ msgid "not human readable" -#~ msgstr "illisible par un humain" +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n" -#~ msgid "expired: %s)" -#~ msgstr "expirée: %s)" +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|code PIN d'administration" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/gl.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/gl.gmo differ diff -Nru gnupg-1.4.9/po/gl.po gnupg-1.4.10/po/gl.po --- gnupg-1.4.9/po/gl.po 2008-03-25 08:53:08.000000000 +0000 +++ gnupg-1.4.10/po/gl.po 2009-09-02 17:19:39.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "gravando a chave secreta en `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "non se puido abrir `%s': %s\n" @@ -76,9 +75,10 @@ msgid "note: random_seed file not updated\n" msgstr "nota: o ficheiro random_seed non se actualiza\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "non se pode crear `%s': %s\n" @@ -134,176 +134,221 @@ "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:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, 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:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "Introduza o ID de usuario: " + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "hai partes da chave secreta non dispoñibles\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Por favor, escolla o motivo da revocación:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "erro ao crea-lo contrasinal: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "erro ao le-lo bloque de chaves: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: erro ao ler un rexistro libre: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' xa está comprimido\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "xerar un novo par de chaves" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "xerar un novo par de chaves" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "Sinatura %s, algoritmo de resumo %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "non se atoparon datos OpenPGP válidos.\n" @@ -390,176 +435,238 @@ "carácter quoted-printable na armadura - seguramente empregouse un MTA con " "erros\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "a chave secreta non está dispoñible" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, 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:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Non se admite este comando no modo %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "¿A súa selección? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Non se especificou un motivo" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "non procesado" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "non hai unha chave pública correspondente: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "erro ao crea-lo chaveiro `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "erro lendo `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "erro ao crear `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "preferencias actualizadas" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "erro: pegada dactilar non válida\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "Pegada dactilar:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "erro: pegada dactilar non válida\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "non se atoparon datos OpenPGP válidos.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "erro escribindo no chaveiro secreto `%s': %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "¿Qué tamaño de chave quere? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "¿Qué tamaño de chave quere? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "¿Qué tamaño de chave quere? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "redondeado a %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "omítese: a chave secreta xa está presente\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -567,195 +674,204 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "A sinatura caducou o %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Selección non válida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Por favor, escolla o motivo da revocación:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de protección descoñecido\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "omítese: a chave secreta xa está presente\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "erro escribindo no chaveiro `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "saír deste menú" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "amosar esta axuda" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Chave dispoñible en: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "cambia-la fecha de expiración" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "cambia-la confianza sobre o dono" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "amosar fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "xerar un novo par de chaves" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "a chave secreta non está dispoñible" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Introduza o ID de usuario: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "Introduza o ID de usuario: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 #, fuzzy msgid "Enter PIN: " msgstr "Introduza o ID de usuario: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Repita o contrasinal: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "non se puido abrir `%s'\n" @@ -764,13 +880,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non traballa con este comando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -876,7 +992,7 @@ msgstr "" "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" @@ -1278,7 +1394,7 @@ msgid "Pubkey: " msgstr "Pública: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cifra: " @@ -1286,7 +1402,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compresión: " @@ -1423,415 +1539,415 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opcións `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s non é para uso normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcións de exportación non válidas\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opcións de importación non válidas\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opcións de exportación non válidas\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "opcións de importación non válidas\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "o URL de normativa de sinaturas dado non é válido\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "opcións de exportación non válidas\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s non se admite con %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s non ten sentido empregándoo con %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent non está dispoñible nesta sesión\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non é válido\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 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/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferencias por defecto non válidas\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non válidas\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non válidas\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresión personais non válidas\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "¡%s aínda non traballa con %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "o descifrado fallou: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "o envío ao servidor de chaves fallou: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "a exportación da chave fallou: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "a busca no servidor de chaves fallou fallou: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "a actualización no servidor de chaves fallou: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non válido `%s'\n" @@ -1878,18 +1994,18 @@ msgstr "" "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sen chave pública - omitida\n" @@ -1915,8 +2031,9 @@ msgstr "Uso: gpgv [opcións] [ficheiros] (-h para ve-la axuda)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxe: gpg [opcións] [ficheiros]\n" @@ -2717,12 +2834,12 @@ msgid "keyring `%s' created\n" msgstr "chaveiro `%s' creado\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "erro ao crear `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n" @@ -2771,7 +2888,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "detectados %d IDs de usuario sin auto-sinatura válida\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2783,12 +2900,12 @@ "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n" "comprobando pegadas dactilares de varias fontes...).\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Confío marxinalmente\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Confío totalmente\n" @@ -3025,8 +3142,8 @@ msgid "Really sign? (y/N) " msgstr "¿Asinar de verdade? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "fallou a sinatura: %s\n" @@ -3035,20 +3152,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Esta chave non está protexida.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "as partes secretas da chave primaria non están dispoñibles.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "as partes secretas da chave primaria non están dispoñibles.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "A chave está protexida.\n" @@ -3065,7 +3182,7 @@ "Introduza o novo contrasinal para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" @@ -3415,117 +3532,117 @@ msgid "Really update the preferences? (y/N) " msgstr "¿Realmente desexa actualiza-las preferencias? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "¿Garda-los cambios? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "¿Saír sin gardar? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "a actualización fallou: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "o segredo da actualización fallou: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "A chave non cambiou, polo que non fai falla actualizar.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Resumo: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notación: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Esta chave pode estar revocada por %s chave " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "non foi posible crear %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada] " -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Esta chave está desactivada" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3533,19 +3650,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[revocada] " -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3553,7 +3670,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3562,77 +3679,77 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de que quere engadila? (s/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta sinatura correcta? (s/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Borrada %d sinatura.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Borradas %d sinaturas.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Non se borrou nada.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "armadura non válida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "O ID de usuario \"%s\" está revocado." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "O ID de usuario \"%s\" está revocado." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "O ID de usuario \"%s\" está revocado." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3642,272 +3759,278 @@ "designado\n" " pode facer que algunhas versións de PGP rexeiten esta chave.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Introduza o ID de usuario do revocador designado: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite as seleccións das chaves secretas.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Por favor, seleccione como máximo unha chave secundaria.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Cambiando a data de expiración para a chave secundaria.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando a data de expiración da chave primaria.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non " "se pode desfacer!\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Escolla exactamente un ID de usuario.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notación de sinaturas: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "¿Sobrescribir? (s/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non exportable)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿Está seguro de que quere revocala? (s/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " asinada por %08lX no %s%s\n" + +#: g10/keyedit.c:4716 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (non exportable)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX no %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Está a punto de revocar estas sinaturas:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "non hai chave secreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "preferencia %c%lu duplicada\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "demasiadas preferencias `%c'\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "demasiadas preferencias `%c'\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "demasiadas preferencias `%c'\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "escribindo unha sinatura directa\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "escribindo a propia sinatura\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "escribindo unha sinatura que liga a chave\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de chave non válido; empregando %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de chave redondeado a %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "cifrar datos" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3920,109 +4043,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (só cifrar)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Por favor, seleccione o tipo de chave que quere:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA e ElGamal (por defecto)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA e ElGamal (por defecto)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (só asinar)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (só cifrar)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (só asinar)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (só cifrar)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (só asinar)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "O par de chaves DSA ha ter 1024 bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "¿Qué tamaño de chave quere? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "¿Qué tamaño de chave quere? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamaño de chave requerido son %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "redondeado a %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4038,7 +4156,7 @@ " m = a chave caduca en n meses\n" " y = a chave caduca en n anos\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4054,40 +4172,40 @@ " m = a sinatura caduca en n meses\n" " y = a sinatura caduca en n anos\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "¿Por canto tempo é válida a chave? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "¿Por canto tempo é válida a sinatura? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valor non válido\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s non caduca nunca\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s non caduca nunca\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s caduca o %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "A sinatura caduca o %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4095,12 +4213,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "¿Isto é correcto? (s/n) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4117,44 +4235,44 @@ " \"Heinrich Heime (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nome: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caracter non válido no nome\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "O nome non pode comezar cun díxito\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "O nome debe ter alomenos 5 caracteres\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Enderezo de E-mail: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Non é un enderezo de e-mail válido\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Carácter non válido no comentario\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está a usa-lo xogo de caracteres `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4165,7 +4283,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4181,23 +4299,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeAaSs" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Por favor, corrixa antes o erro\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4205,12 +4323,12 @@ "Necesita un contrasinal para protexe-la súa chave secreta.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4222,7 +4340,7 @@ "momento, empregando este programa coa opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4234,50 +4352,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Cancelouse a xeración de chaves.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "gravando a chave pública en `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro escribindo no chaveiro público `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro escribindo no chaveiro secreto `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 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:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4287,12 +4405,12 @@ "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n" "con esa finalidade.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4300,7 +4418,7 @@ "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4308,26 +4426,26 @@ "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "¿Crear realmente? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "non se pode crear `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: a chave secreta %08lX caducou o %s\n" @@ -4360,255 +4478,255 @@ msgid "Keyring" msgstr "Chaveiro" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Pegada dactilar =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: existen dous ficheiros con información confidencial.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o que non cambiou\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Por favor, amañe este posible fallo de seguridade\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "comprobando o chaveiro `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu chaves comprobadas (%lu sinaturas)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu chaves comprobadas (%lu sinaturas)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: chaveiro creado\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "o URL de normativa de sinaturas dado non é válido\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opcións de exportación non válidas\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "asinado coa súa chave %08lX no %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "opcións de exportación non válidas\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 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:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: non é un ID de chave válido\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n" @@ -4762,63 +4880,63 @@ msgid "[uncertain]" msgstr "[incerto]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "A sinatura caducou o %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "A sinatura caduca o %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "Sinatura %s, algoritmo de resumo %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binario" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modo texto" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "descoñecido" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Non foi posible verifica-la sinatura: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "non é unha sinatura separada\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "AVISO: detectáronse sinaturas múltiples. Só se ha comproba-la primeira.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "sinatura independiente de clase 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "Sinatura ó vello estilo (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz incorrecto detectado en proc_tree()\n" @@ -4860,61 +4978,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "Sinatura %s, algoritmo de resumo %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "" -"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "o plugin de cifra IDEA non está presente\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = amosar máis información\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent non está dispoñible nesta sesión\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opción a extinguir \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: \"%s\" é unha opción a extinguir\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "empregue \"%s%s\" no seu canto\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVISO: \"%s\" é unha opción a extinguir\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Sen comprimir" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Sen comprimir" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "esta mensaxe pode non ser utilizable por %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "destinatario por defecto `%s' descoñecido\n" @@ -4967,12 +5090,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "non é posible manexa-lo algoritmo de chave pública %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "un subpaquete de tipo %d ten o bit crítico posto\n" @@ -5060,7 +5183,7 @@ msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5074,59 +5197,59 @@ "pública. Se emprega unha imaxe moi grande, a súa chave tamén se ha volver\n" "moi grande. Un bo tamaño para empregar é un semellante a 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Introduza o nome do ficheiro JPEG: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "non se puido abrir un ficheiro: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" non é un ficheiro JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "¿É esta foto correcta (s/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "¡non se pode amosa-la identificación fotográfica!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Non se especificou un motivo" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "A chave é obsoleta" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Esta chave quedou descoberta" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Xa non se emprega esta chave" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "O ID de usuario xa non é válido" @@ -5149,89 +5272,89 @@ "Non se asignou un valor de confianza a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alias \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Esta chave probablemente pertenza ao propietario\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Non sei\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NON confío\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Confío absolutamente\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = voltar ao menú principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " o = omitir esta chave\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " s = saír\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "¿A súa decisión? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "¿Está seguro de querer dar confianza absoluta a esta chave? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que conducen a unha chave de confianza absoluta:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Esta chave probablemente pertenza ao propietario\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Esta chave perténcenos a nós\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5243,114 +5366,114 @@ "respostar á seguinte pregunta cun \"si\"\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "¿Empregar esta chave de tódolos xeitos?" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: ¡Emprégase unha chave que non é de confianza!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX " "ausente.\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a sinatura está falsificada.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: ¡Esta subchave está revocada polo propietario!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Nota: Esta chave está desactivada.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: ¡Esta chave xa caducou!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Non hai indicacións de que a sinatura pertenza ao seu propietario.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: ¡Esta chave NON é de confianza!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Probablemente, a sinatura estea FALSIFICADA.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: ¡Esta chave non está certificada con sinaturas de suficiente " "confianza!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Non é seguro que a sinatura pertenza ao seu propietario.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: omitido: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: omitido: a chave pública xa está presente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5358,34 +5481,34 @@ "\n" "Introduza o ID de usuario. Remate cunha liña en branco: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Non hai tal ID de usuario.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" "omitido: a chave pública xa está estabrecida coma destinatario por defecto\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "A chave pública está desactivada.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "omitido: chave pública xa estabrecida\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinatario por defecto `%s' descoñecido\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: omitido: a chave pública está desactivada\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "non hai enderezos válidos\n" @@ -5452,7 +5575,7 @@ msgstr "NOTA: a chave está revocada" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "a chamada a build_packet fallou: %s\n" @@ -5475,11 +5598,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Forzouse unha saída con armadura ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "a chamada a make_keysig_packet fallou: %s\n" @@ -5498,29 +5621,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "non se atopou a chave secreta `%s': %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "non hai unha chave pública correspondente: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "¡a chave pública con coincide coa chave secreta!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algoritmo de protección descoñecido\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTA: ¡Esta chave non está protexida!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5538,33 +5661,33 @@ "se volve ilexible. Pero teña coidado: o sistema de impresión da súa\n" "máquina podería armacena-los datos e deixárllelos dispoñibles a outros.\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Por favor, escolla o motivo da revocación:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancelar" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(probablemente queira seleccionar %d aquí)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Motivo para a revocación: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Non se deu unha descrición)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "¿É correcto? " @@ -5645,17 +5768,17 @@ "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non " "se pode desfacer!\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "a chave pública %08lX é %lu segundo máis nova cá sinatura\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "a chave pública %08lX é %lu segundos máis nova cá sinatura\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5663,7 +5786,7 @@ "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5671,26 +5794,26 @@ "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "asumindo unha sinatura incorrecta da chave %08lX debido a un bit crítico " "descoñecido\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" "chave %08lX: non hai unha sub-chave para o paquete de a revocación de " "subchave\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "chave %08lX: non hai sub-chave para a sinatura da ligazón da chave\n" @@ -5831,12 +5954,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "base de datos de confianza: fallou a sincronización: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5881,86 +6004,85 @@ msgid "%s: trustdb created\n" msgstr "%s: creouse a base de datos de confianza\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: non se pode escribir na base de datos de confianza\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de datos de confianza non válida\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: fallo ao crear unha táboa hash: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erro ao actualiza-lo rexistro de versión: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erro ao le-lo rexistro de versión: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erro ao escribi-lo rexistro de versión: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de datos de confianza: lseek fallou: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: non é un ficheiro de base de datos de confianza\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: rexistro de versión con número de rexistro %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versión do ficheiro incorrecta %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro ao ler un rexistro libre: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: non se puido pór a cero un rexistro: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: non se puido engadir un rexistro: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb" -"\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: creouse a base de datos de confianza\n" #: g10/textfilter.c:147 #, c-format @@ -6008,130 +6130,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "o rexistro de confianza %lu non é do tipo %d solicitado\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[revocada] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[caducada ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "descoñecido" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, 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:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "por favor, execute con --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "comprobando a base de datos de confianza\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "non se atoparon chaves de confianza absoluta\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6394,47 +6524,47 @@ msgstr "atopou un erro ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "si|sim" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "non|nom" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "abandonar" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "aA" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "v" @@ -6455,6 +6585,15 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pode que usara o programa equivocado para esta tarefa)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "O par de chaves DSA ha ter 1024 bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb" +#~ "\".\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "non se pode poñer datos de notación nas sinaturas v3 (estilo PGP 2.x)\n" @@ -6884,10 +7023,6 @@ #~ "\"\n" #~ "asinado localmente coa súa chave %08lX no %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " asinada por %08lX no %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: non é posible acceder: %s\n" diff -Nru gnupg-1.4.9/po/gnupg.pot gnupg-1.4.10/po/gnupg.pot --- gnupg-1.4.9/po/gnupg.pot 2008-03-25 08:52:51.000000000 +0000 +++ gnupg-1.4.10/po/gnupg.pot 2009-09-02 17:19:33.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,13 +40,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "" @@ -78,9 +77,10 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "" @@ -123,171 +123,212 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "" + +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "" + +#: g10/app-openpgp.c:2028 +msgid "||Please enter the Reset Code for the card" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +msgid "writing new key\n" +msgstr "" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 -#, c-format -msgid "card does not support digest algorithm %s\n" +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" msgstr "" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3092 #, c-format -msgid "signatures created so far: %lu\n" +msgid "card does not support digest algorithm %s\n" msgstr "" -#: g10/app-openpgp.c:2140 +#: g10/app-openpgp.c:3168 #, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "" @@ -369,163 +410,223 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "" -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, c-format +msgid "error allocating enough memory: %s\n" +msgstr "" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, c-format +msgid "error writing `%s': %s\n" +msgstr "" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "" + +#: g10/card-util.c:1294 +#, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "" + +#: g10/card-util.c:1295 +#, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "" + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +msgid "NOTE: keys are already stored on the card!\n" +msgstr "" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -533,173 +634,182 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr "" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr "" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, c-format +msgid "error writing key to card: %s\n" +msgstr "" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "" -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "" -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "" @@ -708,13 +818,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -810,7 +920,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "" @@ -1176,7 +1286,7 @@ msgid "Pubkey: " msgstr "" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "" @@ -1184,7 +1294,7 @@ msgid "Hash: " msgstr "" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "" @@ -1317,397 +1427,397 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" @@ -1751,17 +1861,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -1788,7 +1898,7 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" @@ -2478,12 +2588,12 @@ msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" @@ -2532,7 +2642,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2540,12 +2650,12 @@ "etc.)\n" msgstr "" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr "" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr "" @@ -2744,8 +2854,8 @@ msgid "Really sign? (y/N) " msgstr "" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "" @@ -2754,19 +2864,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "" @@ -2781,7 +2891,7 @@ "\n" msgstr "" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "" @@ -3084,458 +3194,463 @@ msgid "Really update the preferences? (y/N) " msgstr "" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "" -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 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:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr "" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3548,109 +3663,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr "" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr "" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 #, c-format -msgid " (%d) DSA (sign only)\n" +msgid " (%d) DSA and Elgamal\n" msgstr "" -#: g10/keygen.c:1457 +#: g10/keygen.c:1496 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" +msgid " (%d) DSA (sign only)\n" msgstr "" -#: g10/keygen.c:1459 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) Elgamal (encrypt only)\n" +msgid " (%d) RSA (sign only)\n" msgstr "" -#: g10/keygen.c:1460 +#: g10/keygen.c:1501 #, c-format -msgid " (%d) RSA (sign only)\n" +msgid " (%d) Elgamal (encrypt only)\n" msgstr "" -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr "" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "" -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" +msgid "What keysize do you want? (%u) " msgstr "" -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3660,7 +3770,7 @@ " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3670,48 +3780,48 @@ " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "" -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "" -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "" -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3721,44 +3831,44 @@ "\n" msgstr "" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "" -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "" -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "" -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3766,7 +3876,7 @@ "\n" msgstr "" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" @@ -3781,34 +3891,34 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "" -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -3816,7 +3926,7 @@ "\n" msgstr "" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -3824,91 +3934,91 @@ "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" msgstr "" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" @@ -3941,245 +4051,245 @@ msgid "Keyring" msgstr "" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr "" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr "" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "" @@ -4331,62 +4441,62 @@ msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr "" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -4424,59 +4534,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "" -#: g10/misc.c:353 +#: g10/misc.c:458 +msgid "the IDEA cipher plugin is not present\n" +msgstr "" + +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" +msgid "please see %s for more information\n" msgstr "" -#: g10/misc.c:459 -msgid "the IDEA cipher plugin is not present\n" +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:491 #, c-format -msgid "please see %s for more information\n" +msgid "NOTE: This feature is not available in %s\n" msgstr "" -#: g10/misc.c:693 +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "" @@ -4528,11 +4643,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -4613,7 +4728,7 @@ msgid "Repeat passphrase: " msgstr "" -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4622,58 +4737,58 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "" -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "" @@ -4693,218 +4808,218 @@ msgid "No trust value assigned to:\n" msgstr "" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr "" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr "" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr "" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr "" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr "" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr "" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr "" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "" -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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 "" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr "" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr "" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " msgstr "" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "" @@ -4971,7 +5086,7 @@ msgstr "" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "" @@ -4993,11 +5108,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "" @@ -5016,28 +5131,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "" -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5048,33 +5163,33 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "" @@ -5146,44 +5261,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5309,12 +5424,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5358,83 +5473,83 @@ msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgid "Error: The trustdb is corrupted.\n" msgstr "" #: g10/textfilter.c:147 @@ -5482,126 +5597,134 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5857,47 +5980,47 @@ msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/hu.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/hu.gmo differ diff -Nru gnupg-1.4.9/po/hu.po gnupg-1.4.10/po/hu.po --- gnupg-1.4.9/po/hu.po 2008-03-25 08:53:08.000000000 +0000 +++ gnupg-1.4.10/po/hu.po 2009-09-02 17:19:39.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "Megjegyzés: random_seed állományt nem frissítettem.\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n" @@ -133,176 +133,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Kérem, válassza ki a visszavonás okát:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "Hiba a jelszó létrehozásakor: %s.\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "Hiba a kulcsblokk olvasásakor: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "\"%s\" már tömörített.\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "új kulcspár létrehozása" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "új kulcspár létrehozása" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Nem találtam érvényes OpenPGP adatot.\n" @@ -388,176 +432,238 @@ msgstr "" "quoted printable karakter a páncélban - valószínûleg egy bugos MTA bûne.\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "titkos kulcs nem áll rendelkezésre" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, 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:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Ez a parancs %s módban nem engedélyezett.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Mit választ? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Nincs megadva ok." -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "nem feldolgozott" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "Hiba \"%s\" olvasásakor: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "Hiba \"%s\" létrehozásakor: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "preferenciák frissítése" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "Hiba: Érvénytelen ujjlenyomat.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "megmutatja az ujjlenyomatot" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "Hiba: Érvénytelen ujjlenyomat.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "Nem találtam érvényes OpenPGP adatot.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Milyen kulcsméretet szeretne? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Milyen kulcsméretet szeretne? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Milyen kulcsméretet szeretne? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "Felkerekítve %u bitre.\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "Kihagytam: titkos kulcs már jelen van.\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -565,192 +671,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Az aláírás lejárt: %s.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Érvénytelen választás.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, 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:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "Ismeretlen védelmi algoritmus!\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "Kihagytam: titkos kulcs már jelen van.\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "kilépés ebbõl a menübõl" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "megmutatja ezt a súgót" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Kulcs található: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "lejárat megváltoztatása" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "megmutatja az ujjlenyomatot" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "új kulcspár létrehozása" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Parancs> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "titkos kulcs nem áll rendelkezésre" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Ismételje meg a jelszót: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "Nem tudom megnyitni %s-t!\n" @@ -759,13 +874,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:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -865,7 +980,7 @@ msgid "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:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" @@ -1265,7 +1380,7 @@ msgid "Pubkey: " msgstr "Nyilvános kulcsú (pubkey): " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Rejtjelezõ (cipher): " @@ -1273,7 +1388,7 @@ msgid "Hash: " msgstr "Kivonatoló (hash): " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Tömörítõ (compression): " @@ -1410,412 +1525,412 @@ 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/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "\"%s\" opciós fájl: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, 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/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core állományt hozhat létre!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hatástalanítja %s-t!\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s és %s nem használható együtt!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s értelmetlen %s mellett!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-nál!\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-nél!\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "Érvénytelen alapértelmezett preferenciák!\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "Érvénytelen személyes kivonatolópreferenciák!\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "Érvénytelen személyes tömörítõpreferenciák!\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s és %s egyelõre nem használható együtt!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [fájlnév]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [fájlnév]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Visszafejtés sikertelen: %s.\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [fájlnév]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [fájlnév]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [fájlnév]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [fájlnév]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [fájlnév]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key felh-azonosító" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonosító" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonosító [parancsok]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "Kulcsexportálás sikertelen: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "Keresés a kulcsszerveren sikertelen: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "Páncél eltávolítása nem sikerült: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Érvénytelen kivonatoló algoritmus: %s\n" @@ -1863,18 +1978,18 @@ "%08lX érvénytelen kulcsot érvényesítettük az\n" "--allow-non-selfsigned-uid opcióval.\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsõdleges helyett.\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, 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" @@ -1900,8 +2015,9 @@ msgstr "Használat: gpgv [opciók] [fájlok] (-h a súgóhoz)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Szintaxis: gpg [opciók] [fájlok]\n" @@ -2701,12 +2817,12 @@ msgid "keyring `%s' created\n" msgstr "\"%s\" kulcskarikát létrehoztam.\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "Hiba \"%s\" létrehozásakor: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n" @@ -2755,7 +2871,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d felhasználóazonosítót találtam érvényes önaláírás nélkül.\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2768,12 +2884,12 @@ "különbözõ forrásból származó digitális ujjlenyomatokkal...)!\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = részlegesen megbízom benne\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = teljesen megbízom benne\n" @@ -3010,8 +3126,8 @@ msgid "Really sign? (y/N) " msgstr "Valóban aláírja? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "Aláírás sikertelen: %s\n" @@ -3020,20 +3136,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Ez a kulcs nem védett.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Az elsõdleges kulcs titkos részei nem elérhetõk.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Az elsõdleges kulcs titkos részei nem elérhetõk.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "A kulcs védett.\n" @@ -3050,7 +3166,7 @@ "Írja be az új jelszót ehhez a titkos kulcshoz!\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" @@ -3392,117 +3508,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Valóban frissítsem a preferenciákat? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Mentsem a változtatásokat? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Kilépjek mentés nélkül? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "Frissítés sikertelen: %s.\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Kivonat: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Jellemzõk: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Jelölés: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Ezt a kulcsot a következõ %s kulcs visszavonhatja: " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (érzékeny)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "%s nem hozható létre: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[visszavont] " -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Ez a kulcs tiltott." -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3510,19 +3626,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[visszavont] " -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3530,7 +3646,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3540,75 +3656,75 @@ "okozhatja,\n" " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Továbbra is hozzá akarja adni? (i/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Törli ezt a jó aláírást? (i/N/k)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Valóban törli ezt az önaláírást? (i/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nem töröltem semmit.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "érvénytelen páncél" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "\"%s\" felhasználói azonosítót visszavonták." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "\"%s\" felhasználói azonosítót visszavonták." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "\"%s\" felhasználói azonosítót visszavonták." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3618,266 +3734,272 @@ " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a " "kulcsot!\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 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:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 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:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Másodlagos kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 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:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Aláírás-jelölés: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Felülírjam (i/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Felhasználóazonosító: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Ez az aláírás lejárt %s idõpontban.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Biztos benne, hogy mégis visszavonja? (i/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " aláírva %08lX által %s%s idõpontban.\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " visszavonva %08lX által %s idõpontban.\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "A következõ aláírásokat fogja visszavonni:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "Nincs titkos kulcs.\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, 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:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "%c%lu preferencia kétszer szerepel!\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "Túl sok \"%c\" preferencia.\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "Túl sok \"%c\" preferencia.\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "Túl sok \"%c\" preferencia.\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "Sima aláírást írok.\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "Önaláírást írok.\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "Összefûzõ aláírást írok.\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Kulcsméret érvénytelen; %u bitet használok.\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Kulcsméretet felkerekítettem %u bitre.\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "adat titkosítása" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3890,109 +4012,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (csak titkosítás)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Kérem, adja meg, milyen kulcsot kíván:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA és ElGamal (alapértelmezés)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA és ElGamal (alapértelmezés)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (csak aláírás)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (csak titkosítás)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (csak aláírás)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (csak titkosítás)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (csak aláírás)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "A DSA kulcspár 1024 bites lesz.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Milyen kulcsméretet szeretne? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Milyen kulcsméretet szeretne? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "A kívánt kulcsméret %u bit.\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "Felkerekítve %u bitre.\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4008,7 +4125,7 @@ " m = a kulcs n hónapig érvényes\n" " y = a kulcs n évig érvényes\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4024,40 +4141,40 @@ " m = az aláírás n hónapig érvényes\n" " y = az aláírás n évig érvényes\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Meddig érvényes a kulcs? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Meddig érvényes az aláírás? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "Érvénytelen érték!\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s soha nem jár le.\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s soha nem jár le.\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s lejár: %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Az aláírás lejár: %s.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4065,12 +4182,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Ez így helyes (i/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4087,44 +4204,44 @@ " \"Heinrich Heine (a költõ) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Teljes név: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Érvénytelen karakter a névben!\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "A név lehet, hogy nem kezdõdhet számmal!\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "A név legalább 5 karakter kell legyen!\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-mail cím: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ez nem érvényes e-mail cím.\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Megjegyzés: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Érvénytelen karakter a megjegyzésben!\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, 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:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4135,7 +4252,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4150,24 +4267,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnMmEeRrKk" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Kérem, elõbb javítsa ki a hibát!\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4175,12 +4292,12 @@ "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4192,7 +4309,7 @@ "az \"--edit-key\" opcióval.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4204,50 +4321,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Kulcs létrehozása megszakítva.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "Írom a kulcsot a %s állományba.\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "Nem írható titkoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 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:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4257,46 +4374,46 @@ "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n" "teheti meg.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, 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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, 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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Valóban létrehozzam? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, 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:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n" @@ -4329,257 +4446,257 @@ msgid "Keyring" msgstr "Kulcskarika" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Elsõdlegeskulcs-ujjlenyomat:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Alkulcsujjlenyomat:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "Elsõdlegeskulcs-ujjlenyomat:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Alkulcsujjlenyomat:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Kulcs ujjlenyomata =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "FIGYELEM: 2 bizalmas információkat tartalmazó állomány van!\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s az eredeti példány.\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s az új példány.\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Kérem, oldja meg ezt a lehetséges biztonsági problémát!\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "Ellenõrzöm a(z) \"%s\" kulcskarikát.\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu kulcsot ellenõriztem (%lu aláírással).\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu kulcsot ellenõriztem (%lu aláírással).\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: Kulcskarikát létrehoztam.\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "FIGYELEM: \"%s\" opciói csak a következõ futáskor lesznek érvényesek!\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Érvénytelen export opciók!\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, 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:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, 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:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "Érvénytelen export opciók!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "kulcsszerverhiba" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "kulcsszerverhiba" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "" "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "" @@ -4737,62 +4854,62 @@ msgid "[uncertain]" msgstr "[bizonytalan]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " azaz \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Az aláírás lejárt: %s.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Az aláírás lejár: %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "Bináris" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "Szövegmódú" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "Ismeretlen módú" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Nem tudom ellenõrizni az aláírást: %s.\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "Nem különálló aláírás.\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "FIGYELEM: Többszörös aláírást érzékeltem. Csak az elsõt ellenõrzöm.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "0x%02x osztályú különálló aláírás.\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "Régi stílusú (PGP 2.x) aláírás.\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "Érvénytelen gyökércsomagot találtam a proc_tree() függvényben!\n" @@ -4833,62 +4950,67 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/misc.c:353 +#: g10/misc.c:458 +msgid "the IDEA cipher plugin is not present\n" +msgstr "Az IDEA rejtjelezõ bõvítés nincs jelen!\n" + +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 +#, fuzzy, c-format +msgid "please see %s for more information\n" +msgstr " i = további információkat kérek\n" + +#: g10/misc.c:475 #, fuzzy, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" "%s (%d) kivonatoló algoritmus használatának erõltetése ellentétes\n" "a címzett preferenciáival.\n" -#: g10/misc.c:459 -msgid "the IDEA cipher plugin is not present\n" -msgstr "Az IDEA rejtjelezõ bõvítés nincs jelen!\n" - -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:491 #, fuzzy, c-format -msgid "please see %s for more information\n" -msgstr " i = további információkat kérek\n" +msgid "NOTE: This feature is not available in %s\n" +msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n" -#: g10/misc.c:693 +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: Elavult opció: \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "FIGYELEM: \"%s\" elavult opció!\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "Kérem, ezt használja helyette: \"%s%s\"\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "FIGYELEM: \"%s\" elavult opció!\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "tömörítetlen" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "tömörítetlen" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "Lehet, hogy ez az üzenet használhatatlan a %s számára!\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n" @@ -4942,12 +5064,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonságos!\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "A %d típusú alcsomag kritikus bitje beállított.\n" @@ -5039,7 +5161,7 @@ msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5053,59 +5175,59 @@ "képet használ, a kulcsa is nagyon nagy lesz!\n" "A 240x288 körüli képméret jól használható.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Adja meg egy JPEG fájl nevét a fotóazonosítóhoz: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "Nem tudom megnyitni az állományt: %s.\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" nem JPEG állomány.\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Ez a fotó megfelelõ (i/N/k)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nincs megadva ok." -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "A kulcsot lecserélték." -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "A kulcs kompromittálódott." -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "A kulcs már nem használatos." -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "A felhasználói azonosító már nem érvényes." @@ -5128,89 +5250,89 @@ "Nincs megbízhatósági érték rendelve:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " azaz \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Ez a kulcs valószínûleg a jelzett tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Nem tudom\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NEM bízom benne\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = alapvetõen megbízom benne\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " f = visszatérés a fõmenübe\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " h = kulcs kihagyása\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " k = kilépés\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Mit választ? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Tényleg be akarja állítani ezt a kulcsot alapvetõen megbízhatóra? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Alapvetõen megbízható kulcshoz vezetõ igazolások:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Ez a kulcs valószínûleg a jelzett tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Ez a kulcs hozzánk tartozik.\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5222,110 +5344,110 @@ "a következõ kérdésre válaszolhat igennel.\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Mégis használjuk ezt a kulcsot? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "FIGYELEM: Nem bízunk a kulcsban, amit használunk!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "FIGYELEM: a kulcsot visszavonhatták (visszavonó kulcs nincs jelen).\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, 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:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Megjegyzés: Ez a kulcs le lett tiltva.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Megjegyzés: Ez a kulcs lejárt!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "FIGYELEM: NEM bízunk ebben a kulcsban!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Az aláírás valószínûleg HAMIS.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "FIGYELEM: Ez a kulcs nincs igazolva kellõképpen megbízható aláírással!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Nem biztos, hogy az aláírás a tulajdonoshoz tartozik.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: kihagyva: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: kihagyva: nyilvános kulcs már szerepel\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Nem adott meg felhasználói azonosítót! (Használhatja a \"-r\" opciót.)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5333,34 +5455,34 @@ "\n" "Adja meg a felhasználói azonosítót! Üres sorral fejezze be: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Nincs ilyen felhasználói azonosító.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" "Kihagyva: Nyilvános kulcs már be lett állítva alapértelmezett címzettnek.\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Nyilvános kulcs nincs engedélyezve.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "Kihagyva: Nyilvános kulcs már be lett állítva.\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: Kihagyva: Nyilvános kulcs nincs engedélyezve.\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "Nincsenek érvényes címzettek!\n" @@ -5428,7 +5550,7 @@ msgstr "MEGJEGYZÉS: A kulcsot visszavonták." #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet sikertelen: %s.\n" @@ -5451,11 +5573,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII-páncélozott kimenet kiválasztva.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet sikertelen: %s\n" @@ -5474,29 +5596,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "\"%s\" titkos kulcs nem található: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "A nyilvános kulcs nem passzol a titkos kulcshoz!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "Ismeretlen védelmi algoritmus!\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "MEGJEGYZÉS: Ez a kulcs nem védett.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5514,33 +5636,33 @@ "adathordozó olvashatatlanná válik. De vigyázat: az Ön gépének nyomtatási\n" "rendszere is tárolhatja az adatot, és mások esetleg hozzáférhetnek ehhez!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Kérem, válassza ki a visszavonás okát:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Mégsem" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Valószínûleg a(z) %d. lehetõséget akarja választani.)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Adjon meg egy nem kötelezõ leírást! Üres sorral fejezze be:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Visszavonás oka: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Nincs leírás.)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Ez így rendben van? " @@ -5617,48 +5739,48 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "FIGYELEM: %08lX aláíró alkulcson érvénytelen kereszthitelesítés van.\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the 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/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the 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/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "MEGJEGYZÉS: Aláíró kulcs (%08lX) lejárt: %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "Rossz aláírást feltételezek a %08lX kulcstól egy ismeretlen\n" "kritikus bit miatt.\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavonó csomaghoz.\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "%08lX kulcs: Nincs alkulcs az alkulcskötõ aláíráshoz!\n" @@ -5806,12 +5928,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "Bizalmi adatbázis %lu. rekord: írás sikertelen (n=%d): %s.\n" @@ -5855,84 +5977,85 @@ msgid "%s: trustdb created\n" msgstr "%s: Bizalmi adatbázis létrejött.\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "MEGJEGYZÉS: Bizalmi adatbázis nem írható.\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: Érvénytelen bizalmi adatbázis.\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: Hiba a verziórekord írásakor: %s.\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: Nem bizalmi adatbázis.\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: Verziórekord, rekordszám: %lu.\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: Érvénytelen állományverzió (%d).\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: Nem sikerült egy rekord nullázása: %s.\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: Nem sikerült egy rekord hozzáadása: %s.\n" #: g10/tdbio.c:1502 -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" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: Bizalmi adatbázis létrejött.\n" #: g10/textfilter.c:147 #, c-format @@ -5980,130 +6103,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "%lu bizalmi rekord nem a kért típusú (%d).\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[visszavont] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[lejárt] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "Ismeretlen módú" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "soha " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, 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:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "Ellenõrzöm a bizalmi adatbázist.\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "Nem találtam alapvetõen megbízható kulcsot.\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6365,47 +6496,47 @@ msgstr "Talált egy programhibát... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "igen" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "iI" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nem" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "kilépés|kilepes" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "kK" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6426,6 +6557,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(Lehet, hogy nem a megfelelõ programot használja a feladatra.)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "A DSA kulcspár 1024 bites lesz.\n" + +#~ 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" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "Nem tehet jelölõadatot a v3-as (PGP 2.x stílusú) aláírásokba!\n" @@ -6852,10 +6990,6 @@ #~ "\"\n" #~ "Helyileg aláírva az Ön %08lX kulcsával %s idõpontban.\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " aláírva %08lX által %s%s idõpontban.\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: Nem tudom elérni: %s.\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/id.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/id.gmo differ diff -Nru gnupg-1.4.9/po/id.po gnupg-1.4.10/po/id.po --- gnupg-1.4.9/po/id.po 2008-03-25 08:53:09.000000000 +0000 +++ gnupg-1.4.10/po/id.po 2009-09-02 17:19:39.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -40,13 +40,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "tidak dapat membuka `%s': %s\n" @@ -78,9 +77,10 @@ msgid "note: random_seed file not updated\n" msgstr "catatan: file random_seed tidak diupdate\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" @@ -134,176 +134,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "gagal membuat kembali cache keyring: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "" + +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "bagian kunci rahasia tidak tersedia\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Silakan pilih alasan untuk pembatalan:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "kesalahan penciptaan passphrase: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "gagal membaca keyblock: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: kesalahan membaca record bebas: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' sudah dikompresi\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "buat sepasang kunci baru" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "buat sepasang kunci baru" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s signature, algoritma digest %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "tidak ditemukan data OpenPGP yang valid.\n" @@ -390,176 +434,238 @@ "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang " "mengandung bug\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "kunci rahasia tidak tersedia" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "tidak dapat melakukan hal itu dalam mode batch\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Pilihan anda? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Tidak ada alasan diberikan" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "tidak diproses" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "tidak ada kunci publik yang sesuai: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "kesalahan menulis keyring `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "kesalahan membaca `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "kesalahan penciptaan : `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "perbarui preferensi" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "kesalahan: fingerprint tidak valid\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "tampilkan fingerprint" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "kesalahan: fingerprint tidak valid\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "tidak ditemukan data OpenPGP yang valid.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "kesalahan menulis keyring rahasia `%s': %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Keysize yang anda inginkan? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Keysize yang anda inginkan? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Keysize yang anda inginkan? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "dibulatkan hingga %u bit\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "kesalahan membaca keyblock rahasia `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "dilewati: kunci pribadi telah ada\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -567,192 +673,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Silakan pilih kunci yang anda inginkan:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Signature kadaluwarsa %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Pilihan tidak valid.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Silakan pilih alasan untuk pembatalan:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritma proteksi tidak dikenal\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Bagian rahasia kunci primer tidak tersedia.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "dilewati: kunci pribadi telah ada\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "kesalahan menulis keyring `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "berhenti dari menu ini" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "tampilkan bantuan" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Kunci tersedia di:" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "ubah tanggal kadaluarsa" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "ubah ownertrust" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "tampilkan fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "buat sepasang kunci baru" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Perintah> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "kunci rahasia tidak tersedia" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Ulangi passphrase: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "tidak dapat membuka `%s'\n" @@ -761,13 +876,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output tidak berfungsi untuk perintah ini\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -869,7 +984,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" @@ -1269,7 +1384,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cipher: " @@ -1277,7 +1392,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Kompresi: " @@ -1414,420 +1529,420 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "opsi impor tidak valid\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "URL signature kebijakan yang diberikan tidak valid\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent tidak tersedia untuk sesi ini\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s belum dapat dipakai dengan %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekripsi gagal: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "Ekspor kunci gagal: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "Pencarian keyserver gagal: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh keyserver gagal: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" @@ -1873,17 +1988,17 @@ 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:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n" @@ -1909,8 +2024,9 @@ msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaks: gpg [options] [files]\n" @@ -2713,12 +2829,12 @@ msgid "keyring `%s' created\n" msgstr "%s: keyring tercipta\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "kesalahan penciptaan : `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "gagal membuat kembali cache keyring: %s\n" @@ -2767,7 +2883,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2780,12 +2896,12 @@ "memeriksa fingerprint dari berbagai sumber...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Saya cukup percaya\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Saya sangat percaya\n" @@ -3026,8 +3142,8 @@ msgid "Really sign? (y/N) " msgstr "Ditandai? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "gagal menandai: %s\n" @@ -3036,20 +3152,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Kunci ini tidak diproteksi.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Bagian rahasia kunci primer tidak tersedia.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Bagian rahasia kunci primer tidak tersedia.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Kunci diproteksi.\n" @@ -3066,7 +3182,7 @@ "Masukkan passphrase baru untuk kunci rahasia ini.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" @@ -3408,117 +3524,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Update preferensi?" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Simpan perubahan? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Berhenti tanpa menyimpan? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "gagal memperbarui: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "gagal perbarui rahasia: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Fitur: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notasi: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revoked] " -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3526,19 +3642,19 @@ "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n" "kecuali anda memulai kembali program.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[revoked] " -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3546,7 +3662,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3556,75 +3672,75 @@ "dapat menyebabkan beberapa versi\n" " PGP menolak kunci ini.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Anda tetap ingin menambahkannya? (y/n) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Hapus signature baik ini? (y/T/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Hapus signature tidak valid ini? (y/T/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Hapus signature tidak dikenal ini? (y/T/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Yakin ingin menghapus self-signature ini? (y/T)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Tidak ada yang dihapus.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "armor tidak valid" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "User ID \"%s\" dibatalkan." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "User ID \"%s\" dibatalkan." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "User ID \"%s\" dibatalkan." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3634,269 +3750,275 @@ "designated dapat\n" "............menyebabkan beberapa versi PGP menolak kunci ini.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Masukkan user ID pihak yang ingin dibatalkan: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Silakan hapus pilihan dari kunci rahasia.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Silakan pilih maksimum satu kunci sekunder.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Merubah batas waktu untuk kunci sekunder.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Merubah batas waktu untuk kunci primer.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Tidak ada signature koresponden di ring rahasia\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notasi signature: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Ditimpa (y/T)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID user: " -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Anda tetap ingin membatalkannya? (y/n) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " ditandai oleh %08lX pada %s%s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " dibatalkan oleh %08lX pada %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Anda akan membatalkan signature ini:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Ingin membuat sertifikat pembatalan? (y/T)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "preferensi %c%lu ganda \n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "terlalu banyak preferensi `%c'\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "terlalu banyak preferensi `%c'\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "terlalu banyak preferensi `%c'\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "menulis signature direct\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "menulis self signature\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "menulis key binding signature\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize tidak valid; menggunakan %u bit\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize dibulatkan hingga %u bit\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "tandai" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "enkripsi data" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3909,109 +4031,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (hanya enkripsi)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Silakan pilih kunci yang anda inginkan:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA dan ElGamal (baku)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA dan ElGamal (baku)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (hanya menandai)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (hanya enkripsi)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (hanya menandai)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (hanya enkripsi)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (hanya menandai)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Keypair DSA akan memiliki 1024 bit.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Keysize yang anda inginkan? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Keysize yang anda inginkan? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Keysize yang diminta adalah %u bit\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "dibulatkan hingga %u bit\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4027,7 +4144,7 @@ " m = kunci berakhir dalam n bulan\n" " y = kunci berakhir dalam n tahun\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4043,40 +4160,40 @@ " m = signature berakhir dalam n bulan\n" " y = signature berakhir dalam n tahun\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Kunci valid untuk? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Signature valid untuk? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "nilai yang tidak valid\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s tidak pernah berakhir\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s tidak pernah berakhir\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s berakhir pada %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Signature kadaluarsa pada %s \n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4084,12 +4201,12 @@ "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n" "Namun, ia dapat menanganinya secara benar hingga 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Benar (y/t)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4105,44 +4222,44 @@ "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n" " \"Heinrich Heine (Der Dichter) \"\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nama sebenarnya: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Karakter tidak valid dalam nama\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Nama tidak boleh dimulai dengan digit\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Nama harus berukuran minimum 5 karakter\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Alamat email: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Bukan alamat email yang valid\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Komentar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Karakter tidak valid dalam komentar\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Anda menggunakan set karakter `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4152,7 +4269,7 @@ "Anda memilih USER-ID ini:\n" " \"%s\"\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4167,23 +4284,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKkEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Silakan perbaiki kesalahan ini dulu\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4191,12 +4308,12 @@ "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4209,7 +4326,7 @@ "menggunakan program ini dengan pilihan \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4221,50 +4338,50 @@ "selama pembuatan prima; ini akan memberi random number generator kesempatan\n" "yang baik untuk memperoleh entropi.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Pembuatan kunci dibatalkan.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "menulis kunci publik ke `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "kesalahan menulis keyring publik `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "kesalahan menulis keyring rahasia `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "kunci publik dan rahasia dibuat dan ditandai.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4274,45 +4391,45 @@ "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua " "untuk tujuan ini.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, 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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, 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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Ingin diciptakan? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n" @@ -4345,254 +4462,254 @@ msgid "Keyring" msgstr "Keyring" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Fingerprint kunci primer:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Fingerprint kunci primer =" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Fingerprint kunci =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s adalah yang tidak berubah\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s adalah yang baru\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "memeriksa keyring `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu kunci telah diperiksa (%lu signature)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu kunci telah diperiksa (%lu signature)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: keyring tercipta\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "URL signature kebijakan yang diberikan tidak valid\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opsi ekspor tidak valid\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "ditandai dengan kunci anda %08lX pada %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "opsi ekspor tidak valid\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "kesalahan keyserver" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "kesalahan keyserver" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n" @@ -4746,63 +4863,63 @@ msgid "[uncertain]" msgstr "[uncertain]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Signature kadaluwarsa %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Signature kadaluarsa pada %s \n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signature, algoritma digest %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "biner" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modeteks" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "tidak dikenal" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Tidak dapat memeriksa signature: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "bukan detached signature\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "kelas signature mandiri 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "signature model lama (PGP 2.X)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n" @@ -4841,60 +4958,65 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s signature, algoritma digest %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "plugin cipher IDEA tidak tersedia\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = beri saya informasi lebih banyak lagi\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent tidak tersedia untuk sesi ini\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "silakan gunakan \"%s%s\"\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Tidak dikompresi" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Tidak dikompresi" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "penerima baku tidak dikenal `%s'\n" @@ -4947,11 +5069,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "tidak dapat menangani algoritma kunci publik %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpaket tipe %d memiliki bit kritis terset\n" @@ -5039,7 +5161,7 @@ msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5055,59 +5177,59 @@ "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n" "Jagalah agar gambar mendekati ukuran 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Masukkan nama file JPEG sebagai ID foto: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "tidak dapat membuka file: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" bukan sebuah file JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Apakah foto ini benar (y/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "tidak dapat menampilkan photo ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Tidak ada alasan diberikan" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Kunci dilampaui" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Kunci ini telah dikompromikan" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Kunci tidak lagi digunakan" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "ID User tidak lagi valid" @@ -5130,89 +5252,89 @@ "Tidak ada nilai trust untuk:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alias \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Kunci ini mungkin milik pemiliknya\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Tidak tahu\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d: Saya TIDAK percaya\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Saya sangat percaya sekali\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = kembali ke menu utama\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = lewati kunci ini\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = berhenti\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Keputusan anda? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Kunci ini mungkin milik pemiliknya\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Kunci ini milik kita\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5224,110 +5346,110 @@ "pertanyaan berikut dengan ya\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Tetap gunakan kunci ini? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Catatan: Kunci ini telah ditiadakan\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Catatan: Kunci ini telah berakhir!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Tidak ada indikasi signature milik pemilik.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Signature mungkin palsu.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Tidak pasti signature milik pemilik.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: dilewati: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: dilewati: kunci publik telah ada\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5335,33 +5457,33 @@ "\n" "Masukkan user ID. Akhiri dengan baris kosong: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Tidak ada ID user tersebut.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Kunci publik dimatikan.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "dilewati: kunci publik telah diset\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "penerima baku tidak dikenal `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: dilewati: kunci publik dimatikan\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "tidak ada alamat yang valid\n" @@ -5428,7 +5550,7 @@ msgstr "CATATAN: kunci telah dibatalkan" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet gagal: %s\n" @@ -5451,11 +5573,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Buat sertifikat pembatalan untuk kunci ini?" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Pemaksaan output mode ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "gagal make_keysig_packet: %s\n" @@ -5474,29 +5596,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "kunci rahasia `%s' tidak ditemukan: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "tidak ada kunci publik yang sesuai: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "kunci publik tidak cocok dengan kunci rahasia!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Buat sertifikat pembatalan untuk kunci ini?" -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algoritma proteksi tidak dikenal\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "CATATAN: Kunci ini tidak diproteksi!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5516,34 +5638,34 @@ "pencetakan\n" "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Silakan pilih alasan untuk pembatalan:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Batal" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Mungkin anda ingin memilih %d di sini)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Alasan pembatalan: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Tidak diberikan deskripsi)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Ini oke? " @@ -5619,48 +5741,48 @@ "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang " "tidak valid\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "CATATAN: kunci signature %08lX berakhir %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak " "dikenal\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n" @@ -5806,12 +5928,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: gagal sync: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek gagal: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -5855,84 +5977,85 @@ msgid "%s: trustdb created\n" msgstr "%s: tercipta trustdb\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "CATATAN: trustdb tidak dapat ditulisi\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb tidak valid\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: gagal membuat hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: kesalahan memperbaharui catatan versi: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: kesalahan membaca catatan versi: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: kesalahan menulis catatan versi: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek gagal: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: bukan file trustdb\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: catatan versi dengan recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versi file %d tidak valid\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: kesalahan membaca record bebas: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: kesalahan menulis dir record: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: gagal mengosongkan record: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: gagal menambahkan record: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: tercipta trustdb\n" #: g10/textfilter.c:147 #, c-format @@ -5979,130 +6102,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "trust record %lu tidak dalam jenis yang diminta %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[revoked] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[expired] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "tidak dikenal" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "tidak pernah..." -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "pemeriksaan trustdb berikutnya pada %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, 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:626 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "kunci publik %08lX tidak ditemukan: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "lakukanlah --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "memeriksa trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, tipe %d: gagal menulis: %s\n" @@ -6364,47 +6495,47 @@ msgstr "anda menemukan kesalahan ...(%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "y|ya" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "n|t|tidak" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "tT" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "q|k|keluar" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "kK" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6426,6 +6557,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "Keypair DSA akan memiliki 1024 bit.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n" @@ -6853,10 +6991,6 @@ #~ "\"\n" #~ "ditandai secara lokal dengan kunci anda %08lX pada %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " ditandai oleh %08lX pada %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: tidak dapat mengakses: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/it.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/it.gmo differ diff -Nru gnupg-1.4.9/po/it.po gnupg-1.4.10/po/it.po --- gnupg-1.4.9/po/it.po 2008-03-25 08:53:09.000000000 +0000 +++ gnupg-1.4.10/po/it.po 2009-09-02 17:19:39.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -38,13 +38,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "impossibile aprire `%s': %s\n" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "nota: il file random_seed non è stato aggiornato\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "impossibile creare `%s': %s\n" @@ -135,176 +135,220 @@ "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n" "(Servono altri %d byte)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "parti della chiave segreta non sono disponibili\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Per favore scegli il motivo della revoca:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "errore leggendo il keyblock: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: errore durante la lettura del record libero: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' è già compresso\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "genera una nuova coppia di chiavi" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "genera una nuova coppia di chiavi" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "Firma %s, algoritmo di digest %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Non sono stati trovati dati OpenPGP validi.\n" @@ -391,177 +435,239 @@ "carattere quoted printable nell'armatura - probabilmente è stato usato\n" "un MTA buggato\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "la chiave segreta non è disponibile" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "impossibile fare questo in modo batch\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Questo comando non è permesso in modalità %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Cosa scegli? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "abilita" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "abilita" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Nessuna ragione specificata" # ??? (Md) -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "non esaminato" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "non c'è una chiave pubblica corrispondente: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "errore creando il portachiavi `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "errore creando `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "preferenze aggiornate" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "errore: impronta digitale non valida\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "mostra le impronte digitali" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "errore: impronta digitale non valida\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "Non sono stati trovati dati OpenPGP validi.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "errore scrivendo il portachiavi segreto `%s': %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Di che dimensioni vuoi la chiave? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Di che dimensioni vuoi la chiave? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Di che dimensioni vuoi la chiave? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "arrotondate a %u bit\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "errore leggendo il keyblock segreto `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "saltata: chiave pubblica già presente\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -569,192 +675,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Firma scaduta il %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Scelta non valida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Per favore scegli il motivo della revoca:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo di protezione sconosciuto\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Parti della chiave segreta non sono disponibili.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "saltata: chiave pubblica già presente\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "errore scrivendo il portachiavi `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "abbandona questo menù" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Chiave disponibile presso: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "cambia la data di scadenza" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "cambia il valore di fiducia" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra le impronte digitali" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "genera una nuova coppia di chiavi" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "la chiave segreta non è disponibile" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Ripeti la passphrase: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" @@ -763,13 +878,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non funziona con questo comando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -879,7 +994,7 @@ "forzare il cifrario simmetrico %s (%d) viola le preferenze\n" "del destinatario\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" @@ -1280,7 +1395,7 @@ msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cifrari: " @@ -1288,7 +1403,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compressione: " @@ -1426,416 +1541,416 @@ msgstr "" "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "opzioni di importazione non valide\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s non è un set di caratteri valido\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "l'URL della politica di firma indicato non è valido\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s non è un set di caratteri valido\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s non è un set di caratteri valido\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent non è disponibile in questa sessione\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s non funziona ancora con %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "esportazione della chiave fallita: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "ricerca nel keyserver fallita: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aggiornamento del keyserver fallito: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" @@ -1881,18 +1996,18 @@ 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:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" @@ -1918,8 +2033,9 @@ msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintassi: gpg [opzioni] [file]\n" @@ -2726,12 +2842,12 @@ msgid "keyring `%s' created\n" msgstr "portachiavi `%s' creato\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "errore creando `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "rebuild della cache del portachiavi fallito: %s\n" @@ -2780,7 +2896,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "Trovati %d user ID senza autofirme valide\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2793,12 +2909,12 @@ "impronte digitali da diverse fonti...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Mi fido marginalmente\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Mi fido completamente\n" @@ -3037,8 +3153,8 @@ msgid "Really sign? (y/N) " msgstr "Firmo davvero? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" @@ -3047,20 +3163,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Questa chiave non è protetta.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Parti della chiave segreta non sono disponibili.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Parti della chiave segreta non sono disponibili.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "La chiave è protetta.\n" @@ -3077,7 +3193,7 @@ "Inserisci la nuova passphrase per questa chiave segreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" @@ -3419,117 +3535,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Aggiorno davvero le preferenze? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Esco senza salvare? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Caratteristiche: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Nota: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Questa chiave può essere revocata dalla chiave %s " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sensibile)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "impossibile creare %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocata]" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Questa chiave è stata disabilitata" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3538,19 +3654,19 @@ "corretta\n" "finchè non eseguirai di nuovo il programma.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[revocata]" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3559,7 +3675,7 @@ " potrebbe fare diventare un altro user ID il primario " "predefinito.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3568,76 +3684,76 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Non è stato cancellato nulla.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "armatura non valida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "L'user ID \"%s\" è stato revocato." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "L'user ID \"%s\" è stato revocato." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "L'user ID \"%s\" è stato revocato." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3647,275 +3763,281 @@ " designato può causarne il rifiuto da parte di alcune versioni\n" " di PGP.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Inserisci l'user ID del revocatore designato: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature " "incrociata\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Devi selezionare esattamente un user ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Annotazione della firma: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Sovrascrivo (s/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non esportabile)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " firmata da %08lX il %s%s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (non esportabile)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocata da %08lX il %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Stai per revocare queste firme:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Creare davvero i certificati di revoca? (s/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "manca la chiave segreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "la preferenza %c%lu è doppia\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "ci sono troppe preferenze `%c'\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "ci sono troppe preferenze `%c'\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "ci sono troppe preferenze `%c'\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "scrittura della firma diretta\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "scrittura della autofirma\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "scrittura della firma di collegamento alla chiave\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "dimensione della chiave non valida; uso %u bit\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "dimensioni della chiave arrotondate a %u bit\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "cifra dati" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3928,109 +4050,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (cifra solo)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Per favore scegli che tipo di chiave vuoi:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA e ElGamal (default)\n" + +#: g10/keygen.c:1494 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA e ElGamal (default)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (firma solo)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (cifra solo)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (firma solo)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (cifra solo)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (firma solo)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "La coppia DSA avrà 1024 bit.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Di che dimensioni vuoi la chiave? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Di che dimensioni vuoi la chiave? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La dimensione richiesta della chiave è %u bit\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "arrotondate a %u bit\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4046,7 +4163,7 @@ " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4062,40 +4179,40 @@ " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Chiave valida per? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Firma valida per? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valore non valido\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s non ha scadenza\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s non ha scadenza\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s scadrà il %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Questa firma scadrà il %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4103,12 +4220,12 @@ "Il tuo sistema non può mostrare date oltre il 2038.\n" "Comunque, sarà gestita correttamente fino al 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "È giusto (s/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4125,44 +4242,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nome e Cognome: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Carattere non valido nel nome\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Il nome non può iniziare con una cifra\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Il nome deve essere lungo almeno 5 caratteri\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Indirizzo di Email: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "L'indirizzo di email non è valido\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Commento: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Carattere non valido nel commento\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Stai usando il set di caratteri `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4173,7 +4290,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4188,23 +4305,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Per favore correggi prima l'errore\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4212,12 +4329,12 @@ "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4229,7 +4346,7 @@ "programma con l'opzione \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4241,50 +4358,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Generazione della chiave annullata.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "scrittura della chiave pubblica in `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi segreto `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4294,12 +4411,12 @@ "il comando \"--edit-key\" per generare una chiave secondaria per questo " "scopo.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4307,7 +4424,7 @@ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4315,26 +4432,26 @@ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Crea davvero? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossibile creare `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chiave %08lX scaduta il %s\n" @@ -4367,162 +4484,162 @@ msgid "Keyring" msgstr "Portachiavi" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Impronta digitale della chiave primaria:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Impronta digitale della subchiave:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Impronta digitale della chiave primaria:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Impronta digitale della subchiave:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Impronta digitale =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s è quello non modificato\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s è quello nuovo\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Per favore risolvete questo possibile problema di sicurezza\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "controllo il portachiavi `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "Sono state controllate %lu chiavi (%lu firme)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "Sono state controllate %lu chiavi (%lu firme)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: portachiavi creato\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "l'URL della politica di firma indicato non è valido\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n" "esecuzione del programma\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opzioni di esportazione non valide\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" @@ -4530,94 +4647,94 @@ "firmata con la tua chiave %08lX il %s\n" "\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "opzioni di esportazione non valide\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "errore del keyserver" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "errore del keyserver" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n" @@ -4771,62 +4888,62 @@ msgid "[uncertain]" msgstr "[incerta]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Firma scaduta il %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Questa firma scadrà il %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "Firma %s, algoritmo di digest %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binario" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modo testo" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "sconosciuto" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "non è una firma separata\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "ATTENZIONE: trovate firme multiple. Sarà controllata solo la prima.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "firma solitaria di classe 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "firma vecchio stile (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "individuato un pacchetto radice non valido in proc_tree()\n" @@ -4866,61 +4983,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "Firma %s, algoritmo di digest %s\n" -#: g10/misc.c:353 -#, 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:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "il plugin per il cifrario IDEA non è presente\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = mostrami ulteriori informazioni\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, 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:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent non è disponibile in questa sessione\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d \"%s\" è una opzione deprecata\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "usa al suo posto \"%s%s\"\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Non compresso" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Non compresso" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "questo messaggio può non essere utilizzabile da %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "destinatario predefinito `%s' sconosciuto\n" @@ -4975,13 +5097,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "ATTENZIONE: la chiave di sessione cifrata simmetricamente è potenzialmente\n" "non sicura\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" @@ -5069,7 +5191,7 @@ msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5086,59 +5208,59 @@ "molto\n" "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Inserisci il nome del file JPEG per l'ID fotografico: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "impossibile aprire il file: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\": non è un file JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Questa foto è giusta? (s/N/q) " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "impossibile mostrare l'ID fotografico\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nessuna ragione specificata" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Questa chiave è stata sostituita" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Questa chiave è stata compromessa" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "La chiave non è più usata" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "L'user ID non è più valido" @@ -5161,89 +5283,89 @@ "Nessun valore di fiducia assegnato a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alias \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Questa chiave probabilmente appartiene al proprietario\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Non lo so\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NON mi fido\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Mi fido definitivamente\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = torna al menù principale\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = salta questa chiave\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = abbandona\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Cosa hai deciso? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificati che portano a chiavi definitivamente affidabili:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Questa chiave probabilmente appartiene al proprietario\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Questa chiave ci appartiene\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5255,112 +5377,112 @@ "rispondere sì alla prossima domanda.\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "ATTENZIONE: questa chiave può essere stata revocata (la chiave di revoca\n" "non è presente).\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Questo può significare che la firma è stata falsificata.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ATTENZIONE: questa subchiave è stata revocata dal proprietario!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Nota: questa chiave è stata disabilitata.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave è scaduta!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Non ci sono indicazioni che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " La firma è probabilmente un FALSO.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENZIONE: questa chiave non è certificata con firme abbastanza fidate!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Non è sicuro che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: saltata: chiave pubblica già presente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5368,33 +5490,33 @@ "\n" "Inserisci l'user ID. Termina con una riga vuota: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "saltata: chiave pubblica già impostata come destinatario predefinito\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "La chiave pubblica è disabilitata.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "saltata: chiave pubblica già impostata\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinatario predefinito `%s' sconosciuto\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: saltata: chiave pubblica disabilitata\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -5463,7 +5585,7 @@ msgstr "NOTA: la chiave è stata revocata" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet fallito: %s\n" @@ -5486,11 +5608,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Creare un certificato di revoca per questa chiave? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Forzato l'output con armatura ASCII.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet fallito: %s\n" @@ -5509,29 +5631,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "chiave segreta `%s' non trovata: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "non c'è una chiave pubblica corrispondente: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Creare un certificato di revoca per questa chiave? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algoritmo di protezione sconosciuto\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTA: Questa chiave non è protetta!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5551,33 +5673,33 @@ "disponibili\n" "ad altri!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Per favore scegli il motivo della revoca:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancella" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probabilmente volevi scegliere %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Motivo della revoca: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Non è stata data una descrizione)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Va bene così? " @@ -5660,17 +5782,17 @@ "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n" "non valida\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "la chiave pubblica %08lX è più recente della firma di %lu secondo\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "la chiave pubblica %08lX è più recente della firma di %lu secondi\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5678,7 +5800,7 @@ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5686,26 +5808,26 @@ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "si suppone una firma non valida della chiave %08lX a causa di un\n" "bit critico sconosciuto\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" "chiave %08lX: non c'è una subchiave per il pacchetto di revoca della " "subchiave\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5855,12 +5977,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync fallita: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek fallita: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n" @@ -5904,84 +6026,85 @@ msgid "%s: trustdb created\n" msgstr "%s: creato il trustdb\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: il trustdb non è scrivibile\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb non valido\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: creazione della tabella hash fallita: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: errore durante la lettura del record di versione: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: errore durante la scrittura del record di versione: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek fallita: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read fallita (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: non è un file di trustdb\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: record di versione con recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versione %d del file non valida\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: errore durante la lettura del record libero: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: errore durante la scrittura del dir record: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: azzeramento di un record fallito: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: accodatura a un record fallita: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: creato il trustdb\n" #: g10/textfilter.c:147 #, c-format @@ -6029,130 +6152,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "il trust record %lu non è del tipo richiesto %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[revocata]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[scaduta]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "sconosciuto" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" -msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" +msgstr "il prossimo controllo del trustdb sarà fatto il %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chiave pubblica %08lX non trovata: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "per favore usa --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "controllo il trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chiavi processate (%d conteggi di validità azzerati)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6415,47 +6546,47 @@ msgstr "hai trovato un bug... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "si|sì" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6476,6 +6607,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "La coppia DSA avrà 1024 bit.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n" @@ -6905,10 +7043,6 @@ #~ "firmata localmente con la tua chiave %08lX il %s\n" #~ "\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " firmata da %08lX il %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: impossibile acedere a: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/ja.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/ja.gmo differ diff -Nru gnupg-1.4.9/po/ja.po gnupg-1.4.10/po/ja.po --- gnupg-1.4.9/po/ja.po 2008-03-25 08:53:10.000000000 +0000 +++ gnupg-1.4.10/po/ja.po 2009-09-02 17:19:40.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -41,13 +41,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n" @@ -79,9 +78,10 @@ msgid "note: random_seed file not updated\n" msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¤·¤Þ¤»¤ó\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" @@ -134,173 +134,219 @@ "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n" "¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "»ØÌæ¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "À¸À®Æü¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "¸°¤ÎÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "±þÅú¤Ë¸ø³«¸°¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "±þÅú¤ËRSA¤ÎË¡(modulus)¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "±þÅú¤ËRSA¸ø³«»Ø¿ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, fuzzy, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "PIN [½ð̾ºÑ: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "PIN [½ð̾ºÑ: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN¥³¡¼¥ë¥Ð¥Ã¥¯¤¬¥¨¥é¡¼¤òÌᤷ¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "CHV%d¤ÎPIN¤¬Ã»¤¹¤®¤Þ¤¹¡£ºÇû¤Ç%d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "CHV%d¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ø¤Î¥¢¥¯¥»¥¹¤¬½é´üÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "¥«¡¼¥É¤«¤é¤ÎCHV¾õÂ֤θ¡º÷¤Ç¥¨¥é¡¼\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "¥«¡¼¥É¤¬±Êµ×¤Ë¥í¥Ã¥¯¤µ¤ì¤Þ¤¹!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "¥«¡¼¥É¤Î±Êµ×¥í¥Ã¥¯Á°¤Ë%d¤ÎAdmin PIN¤¬»î¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "PIN [½ð̾ºÑ: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "PIN [½ð̾ºÑ: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ø¤Î¥¢¥¯¥»¥¹¤¬½é´üÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "ÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "¼º¸ú¤ÎÍýͳ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "CHV%d¤ÎPIN¤¬Ã»¤¹¤®¤Þ¤¹¡£ºÇû¤Ç%d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 #, fuzzy msgid "|AN|New Admin PIN" msgstr "|A|¿·¤·¤¤Admin PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 #, fuzzy msgid "|N|New PIN" msgstr "¿·¤·¤¤PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "¿·¤·¤¤PIN¤Î¼èÆÀ¥¨¥é¡¼: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥Ç¡¼¥¿¤ÎÆɽФ·¥¨¥é¡¼\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "»ØÌæ¥Ç¡¼¥¿¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ÎÆɽФ·¥¨¥é¡¼\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "¸°¤Ï¤â¤¦¤¢¤ê¤Þ¤¹\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "´û¸¤Î¸°¤Ï¸ò´¹¤µ¤ì¤Þ¤¹\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "¿·¤·¤¤¸°¤òÀ¸À®\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "¿·¤·¤¤¸°¤òÀ¸À®\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, fuzzy, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "¸ø³«»Ø¿ô¤¬Â礭¤¹¤®¤Þ¤¹ (32¥Ó¥Ã¥È¤è¤êÂç)\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "¸°À¸À®¤Î´Ö¡¢¤ªÂÔ¤Á¤¯¤À¤µ¤¤ ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "¸°¤ÎÀ¸À®¤¬´°Î»¤·¤Þ¤·¤¿ (%dÉÃ)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "OpenPGP¥«¡¼¥É¤Ë̵¸ú¤Ê¹½Â¤ (¥Ç¡¼¥¿¡¦¥ª¥Ö¥¸¥§¥¯¥È 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "¤³¤ì¤Þ¤Ç¤ËºîÀ®¤µ¤ì¤¿½ð̾: %lu\n" -#: g10/app-openpgp.c:2140 -#, fuzzy, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "PIN [½ð̾ºÑ: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "%s¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó - ̵¸ú¤ÊOpenPGP¥«¡¼¥É?\n" @@ -385,163 +431,225 @@ "ÊñÁõ¤ÎÃæ¤Ëquoted printableʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë\n" "MTA¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP¥«¡¼¥É¤¬Ìµ¸ú¤Ç¤¹: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP¥«¡¼¥Éno. %s¤ò¸¡½Ð\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤Ç¤¹¡£\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "ÁªÂò¤Ï? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[̤ÀßÄê]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "ÃË" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "½÷" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "̵»ØÄê" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "̤½èÍý" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "¶¯À©" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "¥¨¥é¡¼¡§ ¤Î¤Ù¤¿¤ó¤ÎASCII¤À¤±¤¬º£¡¢µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "¥¨¥é¡¼: ¡È<¡Éʸ»ú¤Ï»È¤¨¤Þ¤»¤ó¡£\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "¥¨¥é¡¼: Æó½Å¤Î¶õÇò¤Ï¶Ø»ß¤Ç¤¹¡£\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ« (surname): " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾ (given name): " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "¥¨¥é¡¼: ¤Ä¤Ê¤¤¤À̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "¸ø³«¸°¤òõº÷¤¹¤ëURL: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "¥¨¥é¡¼: URL¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "¸°ÎØ¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "¥í¥°¥¤¥ó¡¦¥Ç¡¼¥¿ (¥¢¥«¥¦¥ó¥È̾): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "¥¨¥é¡¼: ¥í¥°¥¤¥ó¡¦¥Ç¡¼¥¿¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, fuzzy, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "¥¨¥é¡¼: URL¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "¸À¸ì¤ÎÁª¹¥: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "¥¨¥é¡¼: Áª¹¥Ê¸»úÎó¤ÎŤµ¤¬Ìµ¸ú¤Ç¤¹¡£\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "¥¨¥é¡¼: Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "À­ÊÌ ((M)ÃË¡¢(F)½÷¡¢¶õÇò): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "¥¨¥é¡¼: ̵¸ú¤Ê±þÅú¡£\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA¤Î»ØÌæ: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "¥¨¥é¡¼: ̵¸ú¤Ê·Á¼°¤Î»ØÌæ¡£\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "¸°¤ÏÁàºî¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "OpenPGP¥«¡¼¥É¤Ç¤¢¤ê¤Þ¤»¤ó" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "¸½¹Ô¸°¾ðÊó¤Î¼èÆÀ¥¨¥é¡¼: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "´û¸¤Î¸°¤ò¸ò´¹¤·¤Þ¤¹¤«? (y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡È%s¡É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "°Å¹æ¸°¤ò¥«¡¼¥É³°¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Þ¤¹¤«? (Y/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "´û¸¤Î¸°·²¤ò¸ò´¹¤·¤Þ¤¹¤«? (y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -552,138 +660,147 @@ " PIN = `%s' Admin PIN = `%s'\n" "¼¡¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÊѹ¹¤¹¤Ù¤­¤Ç¤¹ --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "À¸À®¤¹¤ë¸°¤Î·¿¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) ½ð̾¸°\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) °Å¹æ²½¸°\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) ǧ¾Ú¸°\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "¸°¤ÎÊݴɾì½ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "̤ÃΤθ°Êݸ¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "¸°¤ÎÈëÌ©Éôʬ¤¬Ìµ¸ú¤Ç¤¹\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤òɽ¼¨" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "Á´Í­¸ú¥Ç¡¼¥¿¤òɽ¼¨" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾Á°¤ÎÊѹ¹" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "¸°¤òõº÷¤¹¤ëURL¤ÎÊѹ¹" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "¥«¡¼¥ÉURL¤Ç»ØÄꤵ¤ì¤¿¸°¤Î°ú¤­½Ð¤·" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "¥í¥°¥¤¥ó̾¤ÎÊѹ¹" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "¸À¸ìÁª¹¥¤ÎÊѹ¹" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ­Ê̤ÎÊѹ¹" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "CA»ØÌæ¤ÎÊѹ¹" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "½ð̾¶¯À©PIN¥Õ¥é¥°¤òȿž" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "¿·¤·¤¤¸°·²¤òÀ¸À®" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "PIN¥Ö¥í¥Ã¥¯¤Î²ò½ü¤äÊѹ¹¤Î¥á¥Ë¥å¡¼" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "¥³¥Þ¥ó¥É> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "´ÉÍýÀìÍÑ¥³¥Þ¥ó¥É\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Èhelp¡É¤ò»²¾È)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "ÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "¥«¡¼¥É¤òÁÞÆþ¤·return¤òÂǤĤ«¡¢'c'¤Ç¼è¾Ã¤·: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -692,38 +809,38 @@ "º£¤Î¥«¡¼¥É¤òÈ´¤­¡¢¼¡¤ÎÄÌÈ֤Τ½¤ì¤òÆþ¤ì¤Æ¤¯¤À¤µ¤¤:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "ÍÑ°Õ¤·¤Æreturn¤òÂǤĤ«¡¢'c'¤Ç¼è¾Ã¤·: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Admin PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Admin PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "PIN¤òºÆÆþÎÏ: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó\n" @@ -732,13 +849,13 @@ msgid "--output doesn't work for this command\n" msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -834,7 +951,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "ÂоΰŹæË¡ %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "%s¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" @@ -1232,7 +1349,7 @@ msgid "Pubkey: " msgstr "¸ø³«¸°: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "°Å¹æË¡: " @@ -1240,7 +1357,7 @@ msgid "Hash: " msgstr "¥Ï¥Ã¥·¥å: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "°µ½Ì: " @@ -1377,401 +1494,401 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "Ãí°Õ: ÀΡ¢´ûÄê¤À¤Ã¤¿¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Ï¡¢Ìµ»ë¤µ¤ì¤Þ¤¹\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Ãí°Õ: ÉáÄÌ%s¤Ï»È¤¤¤Þ¤»¤ó!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æË¡³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURL¤ò²òÀÏÉÔǽ\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "»ØÄꤵ¤ì¤¿Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤Ã¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¥¹¥¿¥Ö¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ²½¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "̵¸ú¤Êdefault-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "̵¸ú¤Êmin-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæË¡¤ÎÁª¹¥\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s¤Ï%s¤Çµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¡Ö%s¡×¤ÎÂоΰŹæ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "--symmetric --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "--symmetric --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "--symmetric --sign --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "--symmetric --sign --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key ¥æ¡¼¥¶¡¼id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "¸°¤Î½ñ½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î²óÉü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ç¤¹\n" @@ -1815,17 +1932,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%s¤Ç¤¹\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "¸ø³«Éû¸°%s¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "Éû¸°%s¤ò¼ç¸°%s¤ËÂåÍѤ·¤Þ¤¹\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "¸°%s: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" @@ -1853,8 +1970,9 @@ msgstr "»È¤¤Êý: gpgv [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "¹½Ê¸: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" @@ -2645,12 +2763,12 @@ msgid "keyring `%s' created\n" msgstr "¸°ÎØ¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "¸°ÎØ¥­¥ã¥Ã¥·¥å¤ÎºÆ¹½Ãۤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -2699,7 +2817,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2710,12 +2828,12 @@ "¤¤\n" "(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤ò¸¡ºº¤·¤¿¤ê¡¢¤Ê¤É¤Ê¤É)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = ´°Á´¤Ë¿®ÍѤ¹¤ë\n" @@ -2928,8 +3046,8 @@ msgid "Really sign? (y/N) " msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -2938,20 +3056,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n" @@ -2968,7 +3086,7 @@ "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" @@ -3301,45 +3419,45 @@ msgid "Really update the preferences? (y/N) " msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤ÏÉÔÍפǤ¹¡£\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Í×Ìó: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "µ¡Ç½: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "̵½¤Àµ¸°¥µ¡¼¥Ð¡¼" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "" @@ -3347,71 +3465,71 @@ "¥ª¥×¥·¥ç¥ó:\n" " " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(¥Ç¥ê¥±¡¼¥È)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "ºîÀ®: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "¼º¸ú: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "ÍøÍÑË¡: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "¿®ÍÑ: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "Í­¸úÀ­: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "¥«¡¼¥ÉÈÖ¹æ: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3419,17 +3537,17 @@ "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n" "¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "¼º¸ú" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "Ëþλ" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3437,7 +3555,7 @@ "·Ù¹ð: ¼ç¤¿¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n" " ¥æ¡¼¥¶¡¼ID¤¬¼ç¤Ë¤Ê¤ë¤È²¾Äꤹ¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3446,75 +3564,75 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "̵¸ú¤ÊÊñÁõ¤Ç¤¹" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3523,253 +3641,258 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "¤³¤Î¸°¤Ï¼º¸ú¼Ô¤È¤·¤Æ¤â¤¦»Ø̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËǤ̿¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "·Ù¹ð: ½ð̾Éû¸°%s¤Ï¡¢Áê¸ß¾ÚÌÀ¤Ç¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "ËÜÅö¤Ë¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "ËÜÅö¤Ëºï½ü¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "½ð̾Ãí¼á: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "¾å½ñ¤­¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID:¡È%s¡É\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "%s¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (½ñ½Ð¤·ÉÔ²Ä)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹¡£\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë¸°%s¤Ç½ð̾¤·¤Þ¤·¤¿:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (¼º¸úÉÔ²Ä)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "¤¢¤Ê¤¿¤Î¸°%s¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s (Â礭¤µ%ld) ¤Î¸°%s (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "Áª¹¥¡Ö%s¡×¤Î½ÅÊ£\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "¿¤¹¤®¤ë°Å¹æË¡Áª¹¥\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "¿¤¹¤®¤ëÍ×ÌóÁª¹¥\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "¿¤¹¤®¤ë°µ½ÌÁª¹¥\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Ê¹àÌÜ¡Ö%s¡×¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "ľÀܽð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "¸°Âбþ¤Ø¤Î½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "̵¸ú¤Ê¸°Ä¹¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "¸°Ä¹¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Encrypt" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authenticate" @@ -3782,109 +3905,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "¸°%s¤Ë²Äǽ¤ÊÁàºî: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "º£¡¢²Äǽ¤ÊÁàºî: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) ½ð̾ÎϤÎȿž\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) °Å¹æÎϤÎȿž\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) ǧ¾ÚÎϤÎȿž\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) ´°Î»\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "¤´´õ˾¤Î¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA¤ÈElgamal (´ûÄê)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA¤ÈElgamal (´ûÄê)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (½ð̾¤Î¤ß)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (½ð̾¤Î¤ß)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (½ð̾¤Î¤ß)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 +#, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n" + +#: g10/keygen.c:1507 #, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n" -#: g10/keygen.c:1533 -#, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" - -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3900,7 +4018,7 @@ " m = ¸°¤Ï n ¤«·î´Ö¤ÇËþλ\n" " y = ¸°¤Ï n ǯ´Ö¤ÇËþλ\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3916,40 +4034,40 @@ " m = ½ð̾¤Ï n ¤«·î´Ö¤ÇËþλ\n" " y = ½ð̾¤Ï n ǯ´Ö¤ÇËþλ\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "½ð̾¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "̵¸ú¤ÊÃÍ\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s¤Ï%s¤ÇËþλ¤·¤Þ¤¹\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3957,11 +4075,11 @@ "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n" "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯¼è¤ê°·¤¨¤Þ¤¹¡£\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "¤³¤ì¤ÇÀµ¤·¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3977,44 +4095,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "ËÜ̾: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "¥³¥á¥ó¥È: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç¡Ö%s¡×¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4025,7 +4143,7 @@ " ¡È%s¡É\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n" @@ -4040,23 +4158,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4064,12 +4182,12 @@ "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4081,7 +4199,7 @@ "¤Î¡È--edit-key¡É¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4092,50 +4210,50 @@ "¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n" "Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤¤¤¿¤·¤Þ¤¹¡£\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "¸°¤ÎÀ¸À®¤¬¼è¤ê¾Ã¤µ¤ì¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "¡Ö%s¡×¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¥¹¥¿¥Ö¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸ø³«¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤ÊÈëÌ©¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "¸ø³«¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "ÈëÌ©¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºîÀ®¤·¡¢½ð̾¤·¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4144,42 +4262,42 @@ "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n" "¡È--edit-key¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "Ãí°Õ: v3¸°¤ÎÉû¸°¤ÎºîÀ®¤Ï¡¢OpenPGP¤ËŬ¹ç¤·¤Þ¤»¤ó\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "¥«¡¼¥É¤Ø¤Î¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "Ãí°Õ: ¥«¡¼¥É¸°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¡Ö%s¡×¤ØÊݸ¤µ¤ì¤Þ¤¹\n" @@ -4212,247 +4330,247 @@ msgid "Keyring" msgstr "¸°ÎØ" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "Éû¸°¤Î»ØÌæ:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " ¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Éû¸°¤Î»ØÌæ:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " »ØÌæ =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " ¥«¡¼¥É¤ÎÄÌÈÖ =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "¡Ö%s¡×¤«¤é¡Ö%s¡×¤Ø¤Î°ÜÆ°¤Ë¼ºÇÔ: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò¤â¤Ã¤¿2¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s¤ÏÊѹ¹¤Î¤Ê¤¤Êý¤Ç¤¹\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s¤Ï¿·¤·¤¤Êý¤Ç¤¹\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "¤³¤ÎÀøºßŪ¤Ê°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "¸°ÎØ¡Ö%s¡×¤ò¥­¥ã¥Ã¥·¥å¤·¤Þ¤¹\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¥­¥ã¥Ã¥·¥åºÑ (%lu¸Ä¤Î½ð̾)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu¸Ä¤Î¸°¤ò¥­¥ã¥Ã¥·¥åºÑ (%lu¸Ä¤Î½ð̾)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "·Ù¹ð: ¸°¥µ¡¼¥Ð¡¼¤Î¥ª¥×¥·¥ç¥ó¡Ö%s¡×¤Ï¡¢¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï»È¤¨¤Þ¤»¤ó\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "disabled" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "ÈÖ¹æ(s)¡¢N)¼¡¡¢¤Þ¤¿¤ÏQ)Ãæ»ß¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥×¥í¥È¥³¥ë¤Ç¤¹ (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "¸°¡È%s¡É¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "¸°¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "¸°%s¤ò%s¤«¤é¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "¸°%s¤ò%s¤ËÍ×µá\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "¸°%s¤ò%s¥µ¡¼¥Ð¡¼%s¤ØÁ÷¿®\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "¸°%s¤ò%s¤ØÁ÷¿®\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¢¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "·Ù¹ð: ÊÌÈÇ (%s) ¤ÎGnuPG¤Î¸°¥µ¡¼¥Ð¡¼¡¦¥Ï¥ó¥É¥é\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÏVERSION¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó (¥ª¥×¥·¥ç¥ó--keyserver¤ò»È¤¤¤Þ¤·¤ç¤¦)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "¤³¤Î¹½ÃۤǤϡ¢³°Éô¸°¥µ¡¼¥Ð¡¼¤Î¸Æ½Ð¤·¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×ÍѤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "Áàºî¡Ö%s¡×¤Ï¡¢¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, fuzzy, c-format msgid "%s does not support handler version %d\n" msgstr "gpgkeys_%s¤Ï¡¢¥Ï¥ó¥É¥é%dÈǤò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎÆâÉô¥¨¥é¡¼\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼ÄÌ¿®¥¨¥é¡¼: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "¡È%s¡É¸°ID¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1Ëܤθ°¤ò%s¤«¤é²óÉü\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%dËܤθ°¤ò%s¤«¤é²óÉü\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n" @@ -4606,62 +4724,62 @@ msgid "[uncertain]" msgstr "[ÉÔ³ÎÄê]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " ÊÌ̾¡È%s¡É" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾ %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "¥Ð¥¤¥Ê¥ê¡¼" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "̤ÃΤÎ" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "ʬΥ½ð̾¤Ç¤¢¤ê¤Þ¤»¤ó\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "·Ù¹ð: ¿½Å½ð̾¤Î¸¡½Ð¡£ºÇ½é¤Î¤â¤Î¤À¤±¸¡ºº¤·¤Þ¤¹¡£\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥ë¡¼¥È¡¦¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n" @@ -4700,59 +4818,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "·Ù¹ð: Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA°Å¹æË¡¤Î¥×¥é¥°¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "¾ÜºÙ¤Ïhttp://www.gnupg.org/faq.html¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "·Ù¹ð: Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¡È%s¡É\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "·Ù¹ð:¡È%s¡É¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "¡È%s%s¡É¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "·Ù¹ð:¡È%s¡É¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "̵°µ½Ì" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "̵°µ½Ì|¤Ê¤·" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢%s¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "¤¢¤¤¤Þ¤¤¤Ê¥ª¥×¥·¥ç¥ó¡Ö%s¡×\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¡Ö%s¡×\n" @@ -4804,11 +4927,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "·Ù¹ð: ÀøºßŪ¤Ë·õÆݤÊÂоΰŹ沽¥»¥Ã¥·¥ç¥ó¸°¤Ç¤¹\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "·¿%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" @@ -4894,7 +5017,7 @@ msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4908,58 +5031,58 @@ "¤¤¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£¤â¤·Â礭¤Ê¼Ì¿¿¤ò»È¤¦¤È¡¢¤¢¤Ê¤¿¤Î¸°¤âƱÍͤËÂ礭¤¯¤Ê¤ê\n" "¤Þ¤¹! 240x288¤¯¤é¤¤¤Ë¤ª¤µ¤Þ¤ëÂ礭¤µ¤Î²èÁü¤Ï¡¢»È¤¤¤è¤¤¤Ç¤·¤ç¤¦¡£\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "¥Õ¥©¥ÈIDÍѤÎJPEG¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "JPEG¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "¤³¤ÎJPEG¤Ï¡¢ËÜÅö¤ËÂ礭¤¤ (%d¥Ð¥¤¥È) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "ËÜÅö¤Ë»È¤¤¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "¡Ö%s¡×¤Ï¡¢JPEG¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "¤³¤Î¼Ì¿¿¤ÏÀµ¤·¤¤¤Ç¤¹¤« (y/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "¥Õ¥©¥ÈID¤¬É½¼¨ÉÔǽ!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Íýͳ¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "¸°¤Ï¤â¤¦ÉÔÍѤǤ¹" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó" @@ -4979,82 +5102,82 @@ msgid "No trust value assigned to:\n" msgstr "¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " ÊÌ̾¡È%s¡É\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "¤³¤Î¸°¤¬¤³¤Î¥æ¡¼¥¶¡¼¤ò¤Ê¤Î¤ëËܿͤΤâ¤Î¤«¤É¤¦¤«¡¢¤É¤ì¤¯¤é¤¤¿®ÍѤǤ­¤Þ¤¹¤«?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = ÃΤé¤Ê¤¤¡¢¤Þ¤¿¤Ï²¿¤È¤â¸À¤¨¤Ê¤¤\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = ¿®ÍѤ· ¤Ê¤¤\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = ¥á¡¼¥ó¡¦¥á¥Ë¥å¡¼¤ËÌá¤ë\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = ¤³¤Î¸°¤Ï¤È¤Ð¤¹\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = ½ªÎ»\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "¤³¤Î¸°¤ÎºÇ¾®¿®ÍÑ¥ì¥Ù¥ë: %s\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "¤¢¤Ê¤¿¤Î·èÄê¤Ï? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "ËÜÅö¤Ë¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ·¤Þ¤¹¤«? (y/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤Ø¤Î¾ÚÌÀ½ñ:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¤¢¤ê¤Þ¤»¤ó\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¾¯¤·¤·¤«¤¢¤ê¤Þ¤»¤ó\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "¤³¤Î¸°¤Ï¤¿¤Ö¤óËܿͤΤâ¤Î¤Ç¤¹\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "¤³¤Î¸°¤Ï¼«Ê¬¤Î¤â¤Î¤Ç¤¹\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5064,105 +5187,105 @@ "¤Þ¤»¤ó¡£º£¤«¤é¹Ô¤¦¤³¤È¤ò¡öËÜÅö¤Ë¡öÍý²ò¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢\n" "¼¡¤Î¼ÁÌä¤Ë¤Ïno¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? (y/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "·Ù¹ð: ¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤Ã¤Æ¤¤¤Þ¤¹!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹ (¼º¸ú¸°¤ÏÉÔºß)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï»Ø̾¼º¸ú¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½êÍ­¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " ½ð̾¤¬µ¶Êª¤Ê¤³¤È¤â¤¢¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤Ï½êÍ­¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Ãí°Õ: ¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " ¤³¤Î½ð̾¤¬½êÍ­¼Ô¤Î¤â¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " ¤³¤Î½ð̾¤¬½êÍ­¼Ô¤Î¤â¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ¥¹¥­¥Ã¥×: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¤â¤¦¤¢¤ê¤Þ¤¹\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó (¡È-r¡É¤ò»È¤¤¤Þ¤·¤ç¤¦) ¡£\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "º£¤Î¼õ¼è¿Í:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5170,33 +5293,33 @@ "\n" "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ¤â¤¦ÀßÄêºÑ¤ß¤Ç¤¹\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹¡£\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¤â¤¦ÀßÄêºÑ¤ß¤Ç¤¹\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "´ûÄê¤Î¼õ¼è¿Í¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "Í­¸ú¤Ê°¸À褬¤¢¤ê¤Þ¤»¤ó\n" @@ -5265,7 +5388,7 @@ msgstr "Ãí°Õ: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -5287,11 +5410,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "¤³¤Î¸°¤Ë¤¿¤¤¤¹¤ë»Ø̾¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCIIÊñÁõ½ÐÎϤò¶¯À©¤·¤Þ¤¹¡£\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -5310,28 +5433,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "ÈëÌ©¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "Âбþ¤¹¤ë¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬¾È¹ç¤·¤Þ¤»¤ó!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "¤³¤Î¸°¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "̤ÃΤÎÊݸ¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "Ãí°Õ: ¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5349,33 +5472,33 @@ "¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢¤´Ãí°Õ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n" "¤À¤ì¤Ç¤â¸«¤¨¤ë¾ì½ê¤Ë¥Ç¡¼¥¿¤ò¤ª¤¯¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "¼º¸ú¤ÎÍýͳ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "¥­¥ã¥ó¥»¥ë" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(¤³¤³¤Ç¤Ï¤¿¤Ö¤ó%d¤òÁª¤Ó¤Þ¤¹)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "ͽÈ÷¤ÎÀâÌÀ¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "¼º¸úÍýͳ: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(ÀâÌÀ¤Ï¤¢¤ê¤Þ¤»¤ó)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "¤è¤í¤·¤¤¤Ç¤¹¤«? (y/N) " @@ -5447,44 +5570,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "·Ù¹ð: ̵¸ú¤ÊÁê¸ß¾ÚÌÀ¤¬¡¢½ð̾Éû¸°%s¤Ë¤¢¤ê¤Þ¤¹\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "¸ø³«¸°%s¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "¸ø³«¸°%s¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "¸°%s¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "¸°%s¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "Ãí°Õ: ½ð̾¸°%s¤Ï%s¤ËËþλ¤Ç¤¹\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤Ë¤è¤ê¡¢¸°%s¤Î½ð̾¤òÉÔÀµ¤È¤ß¤Ê¤·¤Þ¤¹\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "¸°%s: Éû¸°¼º¸ú½ð̾¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "¸°%s: Éû¸°Âбþ¤Ø¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" @@ -5614,12 +5737,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (n=%d): %s\n" @@ -5663,85 +5786,85 @@ msgid "%s: trustdb created\n" msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¤Ç¤­¤Þ¤·¤¿\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "Ãí°Õ: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ̵¸ú¤Ê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ%luÈ֤ΥС¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: ¥ì¥³¡¼¥É¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ègpg --fix-trustdb¡É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/textfilter.c:147 #, c-format @@ -5788,131 +5911,139 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "¿®Íѥ쥳¡¼¥É%lu¤¬Í׵ᤵ¤ì¤¿·¿%d¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "̤ÃΤο®ÍÑ¥â¥Ç¥ë (%d) ¤Ï»È¤¨¤Þ¤»¤ó - %s¿®ÍÑ¥â¥Ç¥ë¤ò²¾Äê\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "%s¿®ÍÑ¥â¥Ç¥ë¤ò»ÈÍÑ\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "¼º¸ú" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "Ëþλ" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "̤ÃΤÎ" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 #, fuzzy msgid "[marginal]" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 #, fuzzy msgid "[ultimate]" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "̤ÄêµÁ" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "̵´ü¸Â" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "´°Á´" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "¼¡²ó¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "¸ø³«¸°%s¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%s¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "ºÇ¾®¤Î¡Ö¤¢¤ëÄøÅ٤ο®ÍÑ¡×%d¡¢ºÇ¾®¤Î¡ÖÁ´ÌÌŪ¿®ÍÑ¡×%d¡¢%s¿®ÍÑ¥â¥Ç¥ë\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, 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:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6174,47 +6305,47 @@ msgstr "¥Ð¥°¤òȯ¸« ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6234,6 +6365,18 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\n" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ègpg --fix-trustdb¡É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ" +#~ "¤¤¡£\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Admin PIN" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "Ãí¼á¥Ç¡¼¥¿¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/nb.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/nb.gmo differ diff -Nru gnupg-1.4.9/po/nb.po gnupg-1.4.10/po/nb.po --- gnupg-1.4.9/po/nb.po 2008-03-25 08:53:10.000000000 +0000 +++ gnupg-1.4.10/po/nb.po 2009-09-02 17:19:40.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian Bokmål \n" @@ -42,13 +42,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "venter på låsing av «%s» ...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "kan ikke åpne «%s»: %s\n" @@ -80,9 +79,10 @@ msgid "note: random_seed file not updated\n" msgstr "merk: random_seed-fila ble ikke oppdatert\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "kan ikke opprette «%s»: %s\n" @@ -136,171 +136,215 @@ "arbeid for å gi operativsystemet en sjanse til å samle mer entropy!\n" "(Trenger %d flere byter)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "klarte ikke å lagre fingeravtrykket: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "klarte ikke å lagre opprettelsesdatoen: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "lesing av offentlig nøkkel mislyktes: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "respons inneholder ikke data om offentlig nøkkel\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "respons inneholder ikke RSA-modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN-callback returnerte en feil: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN for CHV%d er for kort; minum lengde er %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "bekreftelse av CHV%d mislyktes: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "tilgang til admin-kommandoer er ikke konfigurert\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "feil ved henting av CHV-status fra kort\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "kort er permanent låst!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d Admin PIN-forsøk før kortet blir låst permanent\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "tilgang til admin-kommandoer er ikke konfigurert\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +msgid "Reset Code not or not anymore available\n" +msgstr "" + +#: g10/app-openpgp.c:2028 +msgid "||Please enter the Reset Code for the card" +msgstr "" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN for CHV%d er for kort; minum lengde er %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Ny Admin PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Ny PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "feil ved henting av ny PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "feil ved lesing av applikasjonsdata\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "feil ved lesing av fingeravtrykk DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "nøkkel finnes allerede\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "eksisterende nøkkel vil bli erstattet\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generere en ny nøkkel\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "generere en ny nøkkel\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "tidsstempel for opprettelse mangler\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA-modulus mangler eller har ikke en størrelse på %d bits\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "offentlig RSA-eksponent mangler eller er større enn %d bits\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA-primtall %s mangler eller har ikke en størrelse på %d bits\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "klarte ikke å lagre nøkkelen: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "vennligst vent mens nøkkel blir generert ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "nøkkelgenerering mislyktes\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "nøkkelgenerering fullført (%d sekunder)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "kortet støtter ikke digestalgoritme %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "signaturer opprettet så langt: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Vennligst tast inn PIN%%0A[signaturer utført: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "bekrefting av Admin PIN er foreløpig nektet gjennom denne kommandoen\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n" @@ -384,163 +428,225 @@ msgstr "" "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP-kortnummer %s oppdaget\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "kan ikke gjøre dette i batchmodus\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Ditt valg? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[ikke satt]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "mann" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "dame" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "uspesifisert" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "ikke tvunget" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "tvunget" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Feil: Tegnet «<» kan ikke brukes.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Feil: Doble mellomrom er ikke tillatt.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Kortholders etternavn: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Kortholders fornavn: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL for å hente offentlig nøkkel: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Feil: URL er for lang (grensa går ved %d tegn).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "feil ved opprettelse av nøkkelknippet «%s»: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "feil ved lesing av «%s»: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "feil med «%s»: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Logindata (kontonavn): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Feil: Logindata er for langt (grensa går ved %d tegn).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Privat DO-data: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Feil: Privat DO for lang (grensa går ved %d tegn).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Språkpreferanser:" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Feil: ugyldig lengde på preferansestrengen.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Feil: ugyldig tegn i preferansestrengen.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Kjønn ((M)ale, (F)emale eller mellomrom): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Feil: ugyldig respons.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA-fingeravtrykk: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Feil: ugyldig formattert fingeravtrykk.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "nøkkeloperasjonen er umulig: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "ikke et OpenPGP-kort" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "feil ved henting av nåværende nøkkelinfo: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Erstatte eksisterende nøkkel? (j/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Hvilken nøkkelstørrelse vil du ha? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Hvilken nøkkelstørrelse vil du ha? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Hvilken nøkkelstørrelse vil du ha? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rundet opp til %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "feil ved lesing av hemmelig nøkkelblokk «%s»: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "hemmelig nøkkel er allerede lagret på et kort\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Erstatte eksisterende nøkler? (j/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -551,139 +657,148 @@ " PIN = «%s» Admin PIN = «%s»\n" "Du bør endre dem med kommandoen --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Vennligst velg hvilken type nøkkel du vil generere:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Signaturnøkkel\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Krypteringsnøkkel\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Autentiseringsnøkkel\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ugyldig valg.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Vennligst velg hvor nøkkelen skal lagres:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "ukjent nøkkelbeskyttelsesalgoritme\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "hemmelige deler av nøkkelen er ikke tilgjengelig.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "hemmelig nøkkel er allerede lagret på et kort\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "feil ved skriving av nøkkelknippet «%s»: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "avslutte denne menyen" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "vise admin-kommandoer" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "vise denne hjelpen" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "vis alle tilgjengelige data" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "endre kortholders navn" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "endre URL for å hente nøkkel" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "hente nøkkelen angitt i URL som er lagret i kortet" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "endre loginnavnet" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "endre språkpreferansene" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "endre kortholders kjønn" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "vise et CA-fingeravtrykk" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "veksle tving-signatur-PIN-flagget" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "generere nye nøkler" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "meny for å endre eller fjerne blokkering av PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "bekrefte PIN og vise alle data" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Kommando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Admin-reservert kommando\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Admin-kommandoer er tillatt\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Admin-kommandoer er ikke tillatt\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Ugyldig kommando (prøv «help»)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "hemmelig nøkkel er ikke tilgjengelig" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Vennligst sett inn kortet og trykk på enter eller tast inn «c» for å avbryte: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "sleting av nøkkelblokk mislyktes: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -692,36 +807,36 @@ "Vennligst fjern det nåværende kortet og sett inn kortet med serienummeret:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Trykk på enter når du er klar eller tast «c» for å avbryte: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Tast inn ny Admin-PIN: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Tast inn ny PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Tast inn Admin-PIN: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Tast inn PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Gjenta denne PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN ble ikke gjentatt korrekt; prøv igjen" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "kan ikke åpne «%s»\n" @@ -730,13 +845,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output virker ikke for denne kommandoen\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "nøkkelen «%s» ble ikke funnet: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -840,7 +955,7 @@ msgstr "" "påtvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "du kan ikke bruke %s i %s modus\n" @@ -1231,7 +1346,7 @@ msgid "Pubkey: " msgstr "Offentlig nøkkel: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cipher: " @@ -1239,7 +1354,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Kompresjon: " @@ -1381,399 +1496,399 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "MERK: den gamle valgfila «%s» ble ignorert\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MERK: ingen standard valgfil «%s»\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "valgfil «%s»: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "leser valg fra «%s»\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MERK: %s er ikke for vanlig bruk!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "cipherutvidelse «%s» ble ikke lastet på grunn av utrygge rettigheter\n" # Tenk litt på denne du, Trond. -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "«%s» er ikke en gyldig signaturutgåelse\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "«%s» er ikke et gyldig tegnsett\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "kunne ikke parse nøkkelserverens URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ugyldige valg for nøkkelserver\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "ugyldige valg for nøkkelserver\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ugyldige importvalg\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "ugyldige importvalg\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ugyldige eksportvalg\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "ugyldige eksportvalg\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ugyldige listevalg\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "ugyldige listevalg\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ugyldige valg for bekreftelse\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "ugyldige valg for bekreftelse\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunne ikke sette exec-path til %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ugyldig auto-key-locate-liste\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "ADVARSEL: programmet kan opprette en corefil!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ADVARSEL: %s overstyrere %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s er ikke tillatt sammen med %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er ikke fornuftig med %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du må bruke filer (og ikke en pipe) når --pgp2 er påslått\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "valgt krypteringsalgoritme er ugyldig\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "valg digestalgoritme er ugyldig\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "valgt kompresjonsalgoritme er ugyldig\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed må være større enn 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-neede må være større enn 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth må være i intervallet fra 1 til 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig default-cert-level; må være 0, 1, 2 eller 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig min-cert-level; må være 0, 1, 2 eller 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MERK: enkel S2K-modus (0) er sterkt frarådet\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K-modus; må være 0, 1 eller 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "ugyldig standard preferanser\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "ugyldig personlig cipherpreferanser\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "ugyldig personlig digestpreferanser\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "ugyldig personlig kompresjonspreferanser\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s virker ikke ennå med %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke cipheralgoritmen «%s» i %s-modus\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke digestalgoritmen «%s» i %s-modus\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke kompresjonsalgoritmen «%s» i %s-modus\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "klarte ikke å initialisere tillitsdatabasen: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ADVARSEL: mottakere (-r) angitt uten å bruke offentlig nøkkelkryptering\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filnavn]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filnavn]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filnavn]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filnavn]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnavn]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key brukerid" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key brukerid" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key brukerid [kommandoer]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [brukerid] [nøkkelknippe]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "sending til nøkkelserver mislyktes: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "mottak fra nøkkelserver mislyktes: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "nøkkeleksport mislyktes: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "søk på nøkkelserver mislyktes: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh på nøkkelserver mislyktes: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hashalgoritme «%s»\n" @@ -1817,17 +1932,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "ingen hemmelig undernøkkel for offentlig undernøkkel %s - ignorerer\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nøkkel %s: hemmelig nøkkel uten offentlig nøkkel - hoppet over\n" @@ -1853,8 +1968,9 @@ msgstr "Bruksmåte: gpgv [valg] [filer] (-h for hjelp)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Bruksmåte: gpgv [valg] [filer]\n" @@ -2576,12 +2692,12 @@ msgid "keyring `%s' created\n" msgstr "nøkkelknippet «%s» ble opprettet\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "nøkkelblokkressurs «%s»: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" @@ -2630,7 +2746,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2641,12 +2757,12 @@ "andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n" "forskjellige kilder, osv.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Jeg stoler marginalt\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Jeg stoler fullt\n" @@ -2857,8 +2973,8 @@ msgid "Really sign? (y/N) " msgstr "Virkelig signere? (j/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "signering mislyktes: %s\n" @@ -2867,19 +2983,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Denne nøkkelen er ikke beskyttet.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Nøkkelen er beskyttet.\n" @@ -2894,7 +3010,7 @@ "\n" msgstr "Tast inn den nye passfrasen for denne hemmelige nøkklen.\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "passfrasen ble ikke gjentatt korrekt; prøv igjen" @@ -3197,460 +3313,465 @@ msgid "Really update the preferences? (y/N) " msgstr "Virkelig oppdatere preferansene? (j/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Lagre endringene? (j/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Avslutte uten å lagre? (j/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "oppdatering mislyktes: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "oppdatering av hemmelig mislyktes: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Særtrekk: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Notasjoner: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Denne nøkkelen ble opphevet den %s av %s med nøkkelen %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(sensitiv)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "opprettet: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "opphevet: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "utgikk: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "utgår: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "bruksmåte: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "tillit: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "gyldighet: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Denne nøkkelen har blitt utkoblet" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "opphevet" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "utgått" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Er du sikker på at du vil legge den til? (j/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Slette denne gode signaturen? (j/N/a)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettet %d signatur.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Slettet %d signaturer.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Ingen ble slettet.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "ugyldig" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "brukerid «%s»: allerede renset\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "nøkkel: %s: «%s» %d nye signaturer\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "nøkkel: %s: «%s» %d nye signaturer\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "brukerid «%s»: allerede renset\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "brukerid «%s»: allerede renset\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 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:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Er du fortsatt sikker på at du vil gjøre denne nøkkelen til en opphever? (j/" "N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Vennligst velg minst en undernøkkel.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "Undernøkkel %s er allerede opphevet.\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hopper over v3 selvsignatur for brukerid «%s»\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Er du sikker på at du vil erstatte den? (j/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Er du sikker på at du vil slette den? (j/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (ikke-eksporterbar)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Denne signaturen utgikk den %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (ikke-opphevbar)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "ingen hemmelig nøkkel\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "brukerid «%s» er allerede opphevet\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Nøkkelen %s er allerede opphevet.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Undernøkkel %s er allerede opphevet.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "preferansen %s er duplisert\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "for mange cipher-preferanser\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "for mange digest-preferanser\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "for mange kompresjons-preferanser\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "ugyldig oppføring «%s» i preferansestreng\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "skriver direkte signatur\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "skriver nøkkelbindende signatur\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "nøkkelstørrelsen er ugyldig; bruker %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nøkkelstørrelsen ble rundet opp til %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Signere" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Bekrefte" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Kryptere data" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autentisere" @@ -3667,109 +3788,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsKkAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr "" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Vennligst velg hvilken type nøkkel du vil ha:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA og ElGamal (standard)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA og ElGamal (standard)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (bare signering)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (sette dine egne muligheter)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (bare signering)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (bare kryptering)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (bare signering)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (bare kryptering)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (sette dine egne muligheter)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (sette dine egne muligheter)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA-nøkkelpar vil ha %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (sette dine egne muligheter)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Hvilken nøkkelstørrelse vil du ha? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +msgid "What keysize do you want? (%u) " +msgstr "Hvilken nøkkelstørrelse vil du ha? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ønsket nøkkelstørrelse er %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rundet opp til %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3785,7 +3901,7 @@ " m = nøkkelen utgår om n months\n" " y = nøkkelen utgår om n years\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3801,38 +3917,38 @@ " m = signaturen utgår om n months\n" " y = signaturen utgår om n years\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Nøkkelen er gyldig for? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Signaturen er gyldig for? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "ugyldig verdi\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Nøkkel utgår ikke i det hele tatt\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Signaturen utgår ikke i det hele tatt\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Nøkkel utgår den %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Signaturen utgår den %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3840,11 +3956,11 @@ "Systemet ditt kan ikke vise datoer etter 2038.\n" "Likevel vil det bli håndtert korrekt opp til 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Er dette korrekt (j/N)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3860,44 +3976,44 @@ " «Heinrich Heine (Der Dichter) »\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Fullt navn: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ugyldig tegn i navn\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Navnet kan ikke starte med et siffer\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Navnet må være minst 5 tegn langt\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Epostadresse: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ikke en gyldig epostadresse\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ugyldig tegn i kommentar\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du bruker tegnsettet «%s».\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3908,7 +4024,7 @@ " «%s»\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n" @@ -3924,23 +4040,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKeEeRrAa" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Vennligst korriger feilen først\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3948,12 +4064,12 @@ "Du trenger en passfrase for å beskytte din hemmelige nøkkel.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -3965,7 +4081,7 @@ "hjelp av dette programmet og valget «--edit-key».\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -3977,50 +4093,50 @@ "diskene jobbe) under primtallgenereringen; dette gir\n" "tilfeldig-tall-generatoren en bedre sjanse til å samle nok entropy.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Nøkkelgenereringen ble avbrutt.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentlig nøkkel til «%s»\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "skriver foreløpig hemmelig nøkkel til «%s»\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemmelig nøkkel til «%s»\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "ingen skrivbart offentlig nøkkelknippe ble funnet: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "ingen skrivbart hemmelig nøkkelknippe ble funnet: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "feil ved skriving av offentlig nøkkelknippe «%s»: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "feil ved skriving av hemmelig nøkkelknippe «%s»: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4029,13 +4145,13 @@ "kanskje å bruke kommandoen «--edit-key» for å generere en\n" "sekundærnøkkel for dette formålet.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Nøkkelgenerering mislyktes: %s\n" # Er dette entallsformen av denne strengen? -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4044,7 +4160,7 @@ "klokkeproblem)\n" # Er dette flertallsformen av denne og den forrige strengen? -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4052,27 +4168,27 @@ "nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp eller " "klokkeproblem)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "MERK: opprettelse av undernøkler for v3-nøkler er ikke i samsvar med " "OpenPGP\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Virkelig opprette? (j/N)" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "lagring av nøkkel på kort mislyktes: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" @@ -4105,246 +4221,246 @@ msgid "Keyring" msgstr "Nøkkelknippe" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Fingeravtrykk for primærnøkkel:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Fingeravtrykk for undernøkkel:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Fingeravtrykk for primærnøkkel:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Fingeravstrykk for undernøkkel:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Nøkkelfingeravtrykk =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Serienummer for kort =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "omdøping fra «%s» til «%s» mislyktes: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "cacher nøkkelknippet «%s»\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu nøkler cachet så langt (%lu signaturer)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu nøkler cachet (%lu signaturer)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "ADVARSEL: nøkkelserver-valget «%s» er ikke i bruk på denne plattformen\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "utkoblet" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "nøkkelen «%s» ble ikke funnet på nøkkelserveren\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "nøkkelen ble ikke funnet på nøkkelserver\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "ber om nøkkelen %s fra %s server %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "ber om nøkkel %s fra %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "søke etter navn fra %s server %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "søker etter navn fra %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "søke etter «%s» fra %s server %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "søker etter «%s» fra %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "ingen handling for nøkkelserver!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "nøkkelserver sendte ikke VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "nøkkelserver svarte ikke tidsnok\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "intern feil ved nøkkelserver\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "kommunikasjonsfeil med nøkkelserver: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ADVARSEL: klarte ikke å oppfriske nøkkel %s via %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "oppfrisker 1 nøkkel fra %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "oppfrisker %d nøkler fra %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "ADVARSEL: klarte ikke å parse URI %s\n" @@ -4498,62 +4614,62 @@ msgid "[uncertain]" msgstr "[usikker]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " aka «%s»" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Signatur utgått %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Signatur utgår %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signatur, digestalgoritme %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binær" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "tekstmodus" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "ukjent" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -4592,59 +4708,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "ADVARSEL: digestalgoritmen «%s» er avlegs\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "vennligst se %s for mer informasjon\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "ADVARSEL: digestalgoritmen «%s» er avlegs\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "flertydig valg «%s»\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "ukjent valg «%s»\n" @@ -4696,11 +4817,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -4786,7 +4907,7 @@ msgid "Repeat passphrase: " msgstr "Gjenta passfrase: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4795,58 +4916,58 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "kan ikke åpne JPEG-fil «%s»: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Er du sikker på at du vil bruke den? (j/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "«%s» er ikke et JPEG-fil\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "" -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Ingen grunn er angitt" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Nøkkelen er overgått" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Nøkkelen har blitt kompromittert" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Nøkkelen er ikke lengre i bruk" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Brukerid er ikke lengre gyldig" @@ -4866,87 +4987,87 @@ msgid "No trust value assigned to:\n" msgstr "Ingen tillitsverdi tilordnet til:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " aka «%s»\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "Hvor mye stoler du på at denne nøkkelen faktisk tilhører den angitte " "brukeren?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Jeg vet ikke eller vil ikke uttale meg\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Jeg stoler IKKE på den\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Jeg stoler fullstendig på den\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = tilbake til hovedmenyen\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = hopp over denne nøkkelen\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = avslutt\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Valget ditt? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Vil du virkelig sette denne nøkkelen til fullstendig tillit? (j/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Sertifikater som fører til en fullstendig betrodd nøkkel:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Det finnes ingen indikasjon på at denne nøkkelen faktisk tilhører den " "angitte eieren\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Det er begrenset indikasjon på at denne nøkkelen faktisk tilhører den " "angitte eieren\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Denne nøkkelen tilhører sannsynligvis den angitte eieren\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "denne nøkkelen tilhører oss\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -4956,110 +5077,110 @@ "brukeriden. Dersom du *virkelig* vet hva du gjør, kan du besvare det\n" "neste spørsmålet med ja.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Bruke denne nøkkelen likevel? (j/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "ADVARSEL: Bruker ubetrodd nøkkel!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "ADVARSEL: Denne nøkkelen har blitt opphevet av den utpekte oppheveren!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ADVARSEL: Denne nøkkelen har blitt opphevet av dens eier!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Dette kan bety at signaturen er falsk.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "ADVARSEL: Denne undernøkkelen har blitt opphevet av eieren!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Merk: Denne nøkkelen har blitt utkoblet.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Merk: Denne nøkkelen er utgått!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ADVARSEL: Denne nøkkelen er ikke sertifisert med en betrodd signatur!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Det er ingen indikasjon på at signaturen tilhører eieren.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "ADVARSEL: Vi stoler IKKE på denne nøkkelen!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Signaturen er sannsynligvis et FALSKNERI.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ADVARSEL: Denne nøkkelen er ikke sertifisert med tilstrekkelige betrodde " "signaturer!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Det er ikke sikkert at signaturen tilhører brukeren.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: hoppet over: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Du oppga ikke en brukerid. (Du kan bruke «-r»)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5067,33 +5188,33 @@ "\n" "Tast inn brukeriden. Avslutt med en blank linje: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Det finnes ingen slik brukerid.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "hoppet over: offentlig nøkkel allerede satt som standard mottaker\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Offentlig nøkkel er utkoblet.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "hoppet over: offentlig nøkkel er allerede satt\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "ukjent standardmottaker «%s»\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: hoppet over: offentlig nøkkel er utkoblet\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "ingen gyldige adressater\n" @@ -5161,7 +5282,7 @@ msgstr "" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "" @@ -5183,11 +5304,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Lage et utpekt opphevingssertifikat for denne nøkkelen? (j/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "" @@ -5206,28 +5327,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Lage et opphevingssertifikat for denne nøkkelen? (j/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5238,33 +5359,33 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Er dette i orden? (j/N) " @@ -5338,18 +5459,18 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "" # Er dette entallsformen av denne strengen? -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5358,7 +5479,7 @@ "klokkeproblem)\n" # Er dette flertallsformen av denne og den forrige strengen? -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5366,22 +5487,22 @@ "nøkkel %s ble opprettet %lu sekunder i fremtiden (time warp eller " "klokkeproblem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTIS: signaturnøkkelen %s utgikk %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n" @@ -5509,12 +5630,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5558,83 +5679,83 @@ msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgid "Error: The trustdb is corrupted.\n" msgstr "" #: g10/textfilter.c:147 @@ -5682,126 +5803,134 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ opphevet]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ utgått]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ ukjent]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ udef ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "fant ikke offentlig nøkkel %s: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6057,47 +6186,47 @@ msgstr "du fant en feil ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ja" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nei" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "avslutt" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "aA" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6117,5 +6246,11 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha brukt feil program for denne oppgaven)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA-nøkkelpar vil ha %u bits.\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Admin PIN" + #~ msgid "DSA requires the use of a 160 bit hash algorithm\n" #~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/nl.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/nl.gmo differ diff -Nru gnupg-1.4.9/po/nl.po gnupg-1.4.10/po/nl.po --- gnupg-1.4.9/po/nl.po 2008-03-25 08:53:10.000000000 +0000 +++ gnupg-1.4.10/po/nl.po 2009-09-02 17:19:40.000000000 +0100 @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.6\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2007-03-05 10:27+0100\n" "Last-Translator: Ivar Snaaijer\n" "Language-Team: none\n" @@ -62,13 +62,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "wacht op vrijkomen van ‘%s’...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "kan ‘%s’ niet openen: %s\n" @@ -102,9 +101,10 @@ msgid "note: random_seed file not updated\n" msgstr "noot: ’random_seed’ bestand wordt niet aangepast\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "kan ‘%s’ niet aanmaken: %s\n" @@ -158,175 +158,221 @@ "Er zijn nog niet genoeg willekeurge gegevens. Ga alstublieft een ander\n" "programma gebruiken om het OS de kans te geven nog %d bytes te verzamelen\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Het was niet mogelijk de vingerafdruk op te slaan: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "Het was niet mogelijk de aanmaakdatum op te slaan: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "het lezen van de publieke sleutel is mislukt: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "de teruggekregen informatie bevat geen publieke sleutel gegevens\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "de teruggekregen informatie bevat geen RSA modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "de teruggekregen informatie bevatten geen RSA publiek exponent\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN reactie gaf een fout: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "controle CHV%d heeft gefaalt: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "toegang tot beheerders commando's is niet geconfigureerd\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "Ophalen van de CHV status geeft een fout\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "kaart is permanent geblokkeerd!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" "%d beheerder PIN pogingen resteren voordat de kaart permanent geblokkeerd " "wordt\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Beheerders PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "toegang tot beheerders commando's is niet geconfigureerd\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "secret key parts are not available\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Please select the reason for the revocation:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Nieuwe beheerders PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Nieuwe PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "fout met nieuwe PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "fout bij het lezen van programma gegevens\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "fout bij het lezen van de vingerafdruk DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "de sleutel bestaat reeds\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "de bestaande sleutel zal worden vervangen\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "aanmaken nieuwe sleutel\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "aanmaken nieuwe sleutel\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "aanmaaktijd informatie mist\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA modulus is niet aanwezig of heeft niet %d bits\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA publieke exponent is niet aanwezig of is groter dan %d bits\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA priemgetal %s is niet aanwezig of heeft niet %d bits\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "het is mislukt om de sleutel op te slaan: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "wacht terwijl de sleutel wordt aangemaakt ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "aanmaken van de sleutel is mislukt\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "het aanmaken van de sleutel is voltooid (in %d seconden)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "verkeerde structuur van de OpenPGP kaart (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "de kaart ondersteund het samenvattings algortime %s niet\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "momenteel gegenereerde ondertekeningen: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "controleren van de beheerders PIN is momenteel niet toegestaan met dit " "commando\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kan %s niet benaderen - ongeldige OpenPGP kaart?\n" @@ -411,168 +457,230 @@ "’quoted printable’ teken gevonden in versleutelings gegevens - \n" "mogelijk heeft de verzender een slecht gemaakt email programma gebruikt\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP kaart is niet beschikbaar: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP kaart nummer %s gevonden\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "dit is niet mogelijk in automatische modus\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Dit commando is niet toegestaan in %s modus.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Uw keuze? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[niet ingesteld]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "man" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "vrouw" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "niet gespecifiseerd" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "niet geforceerd" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "geforceerd" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Fout: Alleen platte ASCII is hier toegestaan.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Fout: U mag het “<†teken hier niet gebruiken.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Fout: U mag geen dubbele spatie gebruiken.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Achternaam van de kaarthouder: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Voornaam van de kaarthouder: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Fout: Gecombineerde naam is te lang (de limiet is %d tekens).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL om de publieke sleutel op te halen: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Fout: URL is te lang (de limiet is %d tekens).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "fout bij het aanmaken van de sleutelring ‘%s’: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "fout tijdens het lezen van ‘%s’: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "error creating ‘%s’: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Aanlog gegevens (Login naam): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Fout: Aanlog gegevens zijn te lang (de limiet is %d tekens).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Geheime DO-gegevens: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Fout: Geheime DO is te lang (de limiet is %d tekens).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Taal voorkeur: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Fout: verkeerde lengte van de voorkeursgegevens.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Fout: ongeldige tekens in voorkeursgegevens.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Geslacht ((M)Man, (F)Vrouw of spatie): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Fout: Ongeldige invoer.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA vingerafdruk: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Fout: ongeldig vormgegeven vingerafdruk.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "sleutel actie is niet mogelijk: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "geen OpenPGP kaart" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "fout bij het ophalen van sleutel gegevens: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Vervangen bestaande sleutel? (j/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Welke sleutellengte wilt u? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Welke sleutellengte wilt u? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Welke sleutellengte wilt u? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "afgerond naar %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "Fout bij het lezen van geheim sleutelblok “%sâ€: %s\n" + +#: g10/card-util.c:1361 #, fuzzy msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" "Moet er een externe reservekopie van de versleutel gegevens gemaakt worden? " "(J/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "geheime sleutel staat reeds op de kaart\n" + +#: g10/card-util.c:1378 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Vervangen bestaande sleutels? (j/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -583,137 +691,146 @@ " PIN = ‘%s’ Beherder PIN = ‘%s’\n" "U wordt aangeraden deze te wijzigen met het commando --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Selecteer het sleutel type:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Handtekening sleutel\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Codeer sleutel\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Authorisatie sleutel\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ongeldige selectie.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Selcteer waar de sleutel moet worden opgeslagen:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "onbekend beveiligings algoritme\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "geheime delen van de sleutel zijn niet beschikbaar\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "geheime sleutel staat reeds op de kaart\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "fout bij het schrijven naar sleutelring ‘%s’: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "afsluiten van dit menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "tonen beheerder commando's" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "toon deze hulp" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "toon alle beschikbare gegevens" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "verander de naam van de kaarthouder" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "verander de URL van de sleutel" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "download de sleutel van de kaart URL" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "verander de aanlog naam" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "verander de taal voorkeur" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "verander de sexe van de kaarthouder" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "verander een CA vingerafdruk" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "wissel de ondertekening forceer PIN vlag" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "genereer nieuwe sleutels" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "keuzelijst voor het deblokkeren of veranderen van de PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "controleer de PIN en toon alle gegevens" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Commando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Beheerder commando\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Beheerder commando's zijn toegestaan\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Beheerder commando's zijn niet toegestaan\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Ongeldig commando (probeer “helpâ€)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "kaartlezer is niet beschikbaar\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Plaats de kaart en druk op return (of ‘c‘ om te stoppen): " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "Selecteren van OpenPGP is mislukt: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -722,36 +839,36 @@ "Verwijder de huidige kaart en plaats de kaart terug met serienummer :\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Druk op return of ‘c‘ om te stoppen: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Geeft nieuwe beheerders PIN: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Geef nieuwe PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Geef beheerders PIN: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Geef PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Herhaal de PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "de tweede PIN is niet gelijk, probeer opnieuw" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "kan ‘%s’ niet openen\n" @@ -760,13 +877,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output werkt niet voor dit commando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "sleutel ‘%s‘ niet gevonden: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -874,7 +991,7 @@ "het forceren van het symetrisch versleutelalgoritme %s (%d) gaat\n" "tegen de wens van de ontvanger in\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "U mag %s niet gebruiken in combinatie met %s\n" @@ -1267,7 +1384,7 @@ msgid "Pubkey: " msgstr "Publike sleutel: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Versleutel algoritme: " @@ -1275,7 +1392,7 @@ msgid "Hash: " msgstr "Samenvattings algoritme: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compressie: " @@ -1423,413 +1540,413 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "Noot: oude standaard optie ‘%s‘ genegeerd\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Noot: geen standaard optie bestand ‘%s’\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "optie bestand ‘%s’: %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "lezen van opties uit ‘%s’\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Noot: %s is niet voor normaal gebruik!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "versleutelalgoritme uitbreiding ‘%s’ is niet geladen door onveilige\n" "instellingen\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’ is geen geldige ondertekening vervaldatum\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ is geen geldige tekenset\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "het was niet mogelijk de sleutel server URL te lezen\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ongeldige sleutel server opties\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "ongeldige sleutel server opties\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ongeldige importeer opties\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "ongeldige importeer opties\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ongeldige exporteer opties\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "ongeldige exporteer opties\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ongeldige lijst opties\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "ongeldige lijst opties\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "tonen foto ID tijdens ondertekening controle" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "toon procedure URL tijdens ondertekening controle" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "toon alle opmerkingen tijdens ondertekening controle" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "toon IETF opmerkingen tijdens ondertekening controle" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "toon gebruiker opmerkingen tijdens ondertekening controle" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "toon voorkeurs sleutel server tijdens ondertekening controle" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "toon gebruiker ID geldigheid tijdens ondertekening controle" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "" "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "Controleer ondertekeningen met PKA gegevens" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" "Verhoog het vertrouwen van ondertekeningen met goedgekeurde PKA gegevens" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ongeldige controle opties\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "ongeldige controle opties\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "het is onmogelijk het programma start pad aan te passen naar %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ongeldige auto-key-locate lijst\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "ongeldige auto-key-locate lijst\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "Waarschuwing: het programma kan een core bestand genereren!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "Waarschuwing: %s overschrijft %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s mag niet gebruikt worden met %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s klopt niet samen met %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "Noot: %s is niet beschikbaar in deze versie\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "werkt niet met onveilig geheugen door %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "allen ontkoppelde of platte tekst ondertekeningen zijn mogelijk in --pgp2 " "modus\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "het is niet mogelijk tegelijk te ondertekenen en versleutelen in --pgp2 " "modus\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "U moet bestanden (en geen pipe) gebruiken in --pgp2 modus.\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "versleutelen in --pgp2 modus heeft het IDEA versleutelalgoritme nodig\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "ongeldig versleutelalgoritme gekozen\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "ongeldig samenvatting algoritme gekozen\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "ongeldige compressie gekozen\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "ongeldig certificaat samenvatting algoritme gekozen\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed moet groter zijn dan 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed moet groter zijn dan 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth moet vallen tussen dan 1 en 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ongeldige default-cert-level; moet 0, 1, 2, of 3 zijn\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ongeldige min-cert-level; moet 1, 2, of 3 zijn\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Noot: eenvoudige S2K modus (0) wordt sterk afgeraden\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ongeldige S2K modus; moet 0, 1 of 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "ongeldige standaard voorkeuren\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "ongeldig persoonlijk versleutelalgoritme voorkeur\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "ongeldig persoonlijk samenvattings algoritme voorkeur\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "ongeldig persoonlijk compressie algoritme voorkeur\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s werkt nog niet met %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "U mag versleutelalgoritme ‘%s’ niet gebruiken in %s modus\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "U mag samenvattings algoritme ‘%s’ niet gebruiken in %s modus\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "U mag compressie algoritme ‘%s’ niet gebruiken in %s modus\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "initialiseren van TrustDB is mislukt: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Waarschuwing: er zijn ontvangers (-r) opgegeven zonder publieke sleutel " "versleuteling\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [bestandsnaam]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [bestandsnaam]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symetrische versleuteling van ‘%s’ is mislukt: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [bestandsnaam]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [bestandsnaam]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" "U kunt --symmetric --encrypt niet gebruiken met --s2k-mode 0 instelling\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "U kunt --symmetric --encrypt niet in %s modus gebruiken\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [bestandsnaam]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [bestandsnaam]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [bestandsnaam]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" "U kunt --symmetric --sign --encrypt niet gebruiken met --s2k-mode 0 " "instelling\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "U kunt --symmetric --sign --encrypt niet in %s modus gebruiken\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [bestandsnaam]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [bestandsnaam]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [bestandsnaam]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key gebruiker-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key gebruiker-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key gebruiker-id [commando's]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [gebruiker-id] [sleutelringbestand]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "sleutelserver verzending is mislukt: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "sleutelserver opvraging is mislukt: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "sleutel exporteren is mislukt: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "sleutelserver zoekvraag is mislukt: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "sleutelserver verversing is mislukt: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "verwijderen van versleuteling is mislukt: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "plaatsen van versleuteling is mislukt: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ongeldig berichtsamenvattings algoritme ‘%s’\n" @@ -1874,19 +1991,19 @@ msgstr "" "Ongeldeige sleutel %s is geldig gemaakt met --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "geen geheime sub-sleutel voor publieke sub-sleutel %s - overgeslagen\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "" "er wordt gebruik gemaakt van sub-sleutel %s in plaats an primaire sleutel %" "s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "sleutel %s: geheime sleutel zonder publiek deel - overgeslagen\n" @@ -1912,8 +2029,9 @@ msgstr "Gebruik: gpgv [opties] [bestanden] (-h voor hulp)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Gebruik: gpg [opties] [bestanden]\n" @@ -1940,7 +2058,7 @@ "ultimately trusted\n" msgstr "" "Om het netwerk-van-vertrouwen op te bouwen moet GnuPG weten welke sleutels\n" -"U volledig vertrouwd. Dit zijn normaalgesproken de sleutels waarvoor u ook\n" +"U ultiem vertrouwd. Dit zijn normaalgesproken de sleutels waarvoor u ook\n" "toegang heeft tot het geheime deel. Antwoord dan Yes op de vraag of deze " "sleutel\n" "volledig wordt vertrouwd.\n" @@ -2727,12 +2845,12 @@ msgid "keyring `%s' created\n" msgstr "sleutelring ‘%s’ is aangemaakt\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "sleutelblok bronnen ‘%s’: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "het is mislukt om de cache van de sleutelring te herbouwen: %s\n" @@ -2781,7 +2899,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d gebruiker ID's zonder zelf-handtekening gevonden\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2794,12 +2912,12 @@ "vingerafdrukken\n" " van verschillende bronnen vergeleken.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Ik vertrouw het maar matig\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Ik vertrouw het volledig\n" @@ -3030,8 +3148,8 @@ msgid "Really sign? (y/N) " msgstr "Weet u het zeker? (j/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "ondertekenen is mislukt: %s\n" @@ -3042,19 +3160,19 @@ "Deze sleutel bestaat alleen uit een verwijzing -\n" "er is geen geheime zin om te veranderen.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Geheime delen van primaire sleutels zijn niet beschikbaar.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Geheime delen van primaire sleutels zijn opgeslagen op een kaart.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Sleutel is beveiligd.\n" @@ -3071,7 +3189,7 @@ "Geef de nieuwe 'geheime zin' voor deze geheime sleutel.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "de geheime zin is niet twee keer hetzelfde; probeer opnieuw" @@ -3407,115 +3525,115 @@ msgid "Really update the preferences? (y/N) " msgstr "De voorkeuren aanpassen? (j/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Aanpassingen opslaan? (j/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Stoppen zonder opslaan? (j/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "update failed: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "aanpassen van geheimen is mislukt: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Sleutel is niet aangepast, dus er is geen verbetering nodig.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Samenvatting: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Eigenschappen: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Sleutelserver is niet wijzigbaar" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Voorkeur sleutelserver: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Opmerkingen: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Er zijn geen voorkeuren in een PGP 2.x Gebruiker ID.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Deze sleutel is ingetrokken op %s door %s sleutel %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Deze sleutel kan zijn ingetrokken door %s sleutel %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(gevoelig)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "aangemaakt: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "ingetrokken: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "verlopen: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "vervaldatum: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "gebruik: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "vertrouwen: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "geldigheid: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Deze sleutel is uitgeschakeld" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "kaart nummer: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3524,17 +3642,17 @@ "mogelijk\n" "incorrect is tot U de applicatie herstart.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "ingetrokken" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "verlopen" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3542,7 +3660,7 @@ "Waarschuwing: Er is gene primaire sleutel opgegeven. Dit commando kan\n" " er een andere Gebruiker ID gebruikt wordt dan verwacht.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3551,79 +3669,79 @@ "Waarschuwing: Dit is een PGP2 sleutel. Het toevoegen van een foto ID kan er\n" " voor zorgen dat deze sleutel niet meer in PGP2 wordt herkend.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Weet U zeker dat U dit wilt toevoegen? (j/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "U kan geen foto ID toevoegen op een PGP2 sleutel.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 #, fuzzy msgid "Delete this good signature? (y/N/q)" msgstr "Deze correcte ondertekening verwijderen? (j/N/s)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 #, fuzzy msgid "Delete this invalid signature? (y/N/q)" msgstr "Deze ongeldige ondertekening verwijderen? (j/N/s)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 #, fuzzy msgid "Delete this unknown signature? (y/N/q)" msgstr "Deze onbekende ondertekening verwijderen? (j/N/s)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 #, fuzzy msgid "Really delete this self-signature? (y/N)" msgstr "Deze zelf ondertekening verwijderen? (j/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Ondertekening %d verwijderd.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Ondertekeningen %d verwijderd.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Niets verwijderd.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "ongeldig" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Gebruiker ID “%s†is gecomprimeerd: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Gebruiker ID “%sâ€: %d ondertekening verwijderd\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Gebruiker ID “%sâ€: %d ondertekeningen verwijderd\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "Gebruiker ID “%sâ€: reeds geminimaliseerd\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "Gebruiker ID “%sâ€: reeds opgeschoond\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3633,35 +3751,35 @@ " alternative intrekker kan er voor zorgen dat het niet altijd werkt " "met PGP.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "U kan geen alternative intrekker toevoegen aan een PGP 2.x sleutel.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Geef de Gebruiker ID van de alternative intrekker: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "Het is niet mogelijk een PGP 2.x sleutel te gebruiken als alternative\n" "intrekker\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "Het is niet mogelijk de eigen sleutel te gebruiken als alternative\n" "intrekker\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "deze sleutel is al opgegeven als alternative intrekker\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Waarschuing: een alternative intrekker kan niet ontkoppeld worden!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3669,227 +3787,232 @@ "Weet U zeker dat u deze sleutel op wilt geven als alternative intrekker? (j/" "N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Haal de gekozen onderdelen uit de geheime sleutel.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Selecteer een (1) sub-sleutel.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Verander de vervaldatum van de sub-sleutel.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Verander de vervaldatum voor de primaire sleutel.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "U kan de vervaldatum van een v3 sleutel niet veranderen\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Er is geen overeenkomstige ondertekening in de geheime sleutel\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "ondertekening sub-sleutel %s is reeds bevestigd\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "sub-sleutel %s ondertekend niet en hoeft dus niet bevestigd te zijn\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Selecteer een (1) Gebruiker ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "v3 zelf-ondertekening op Gebruiker ID “%s†overgeslagen\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Geef de URL van de sleutelserver van uw voorkeur: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Weet u zeker dat U deze wilt vervangen? (j/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Weet u zeker dat u deze wilt verwijderen? (j/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Geef de notatie: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Doorgaan? (j/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Er is geen Gebruiker ID met index %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Er is geen Gebruiker ID met hash %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Er is geen subsleutel met index %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "Gebruiker ID: “%sâ€\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "Ondertekend met uw sleutel %s op %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (niet exporteerbaar)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Deze ondertekening is verlopen op %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Weet u zeker dat u deze wilt intrekken? (j/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Aanmaken intrekkingscertificaat voor deze ondertekening? (j/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "U heeft deze Gebruiker IDs ondertekend op sleutel %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (niet intrekbaar)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "ingetrokken door uw sleutel %s op %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "U gaat deze ondertekeningen intrekken:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Wilt u deze intrekcertificaten maken? (j/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "geen geheime sleutel\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Gebruiker ID “%s†is reeds ingetrokken\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "Waarschuwing: een Gebruiker ID is %d seconden in de toekomst gedateerd\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Sleutel %s is reeds ingetrokken.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Sub-sleutel %s is reeds ingetrokken.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Tonen %s foto ID van formaat %ld voor sleutel %s (Gebruiker ID %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "voorkeur ‘%s’ overgenomen\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "te veel versleutelalgoritme voorkeuren\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "te veel samenvattingsalgoritme voorkeuren\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "te veel compressie voorkeuren\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "ongeldige waarde ‘%s’ in voorkeursinstellingen\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "directe ondertekening schrijven\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "zelf-ondertekening schrijven\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "sleutel koppel ondertekening schrijven\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "sleutellengte is ongeldig; %u bits worden gebruikt\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "sleutellengte vergroot tot %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Ondertekenen (Sign)" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Certificeren" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Versleutelen (Encrypt)" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Authenticeren" @@ -3902,109 +4025,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "OoVvAaSs" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Mogelijke acties voor een %s sleutel: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Momenteel toegestane acties: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Onderteken mogelijkheid omschakelen\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Versleutel mogelijkheid omschakelen\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Authenticatie mogelijkheid omschakelen\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Voltooid\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Selecteer het soort sleutel dat u wilt:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA en Elgamal (default)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA en Elgamal (default)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (alleen ondertekenen)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (eigen mogelijkheden instellen)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (alleen ondertekenen)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (alleen versleutelen)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (alleen ondertekenen)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (encrypt only)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (eigen mogelijkheden instellen)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (eigen mogelijkheden instellen)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA sleutelpaar krijgt %u bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (eigen mogelijkheden instellen)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s sleutels moeten tussen %u en %u bits lang zijn.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Welke sleutellengte wilt u? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n" +msgid "What keysize do you want? (%u) " +msgstr "Welke sleutellengte wilt u? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Gevraagde sleutellengte is %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "afgerond naar %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4020,7 +4138,7 @@ " m = sleutel verloopt na n maanden\n" " y = sleutel verloopt na n jaar\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4036,38 +4154,38 @@ " m = ondertekening verloopt na n maanden\n" " y = ondertekening verloopt na n jaar\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Is de sleutel geldig voor? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Is de ondertekening geldig voor? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "ongeldige waarde\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Sleutel verloopt niet\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Ondertekening verloopt niet\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Sleutel is verlopen na %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Ondertekening is verlopen na %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4075,12 +4193,12 @@ "Uw systeem kan geen datum weergeven na 2038.\n" "Het wordt echter wel juist afgehandeld tot 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Is dit correct? (j/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4096,44 +4214,44 @@ " “Henri Koot (Directeur van het cijfer) â€\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Werkelijke naam: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ongeldig teken in de naam\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Naam mag niet met een cijfer beginnen\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Naam moet minimaal 5 tekens lang zijn\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Email adres: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Geen geldig email adres\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Opmerking: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ongeldig teken in het commentaar\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "U gebruikt de ‘%s’ tekenreeks.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4144,7 +4262,7 @@ " “%sâ€\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Plaats het email adres alstublieft niet in het Naam of Commentaar veld\n" @@ -4160,23 +4278,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (S)toppen? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (O)kay/(S)toppen? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Verbeter eerst de fout\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4184,12 +4302,12 @@ "U moet een geheime zin opgeven om uw geheime sleutel te beschermen.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4201,7 +4319,7 @@ "gebruik hiervoor de optie “--edit-keyâ€.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4212,50 +4330,50 @@ "nu even iets anders gaat doen op de computer (met de muis of harde schijf)\n" "terwijl dit gebeurd, hierdoor ontstaat meer gewenste willekeur.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Het aanmaken van de sleutel is onderbroken.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "Publieke sleutel wordt opgeslagen in ‘%s’\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "Geheime sleutel verwijzing wordt opgeslagen in ‘%s’\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "Geheime sleutel wordt opgeslagen in ‘%s’\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "geen schrijfbare publieke sleutelring gevonden: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "geen schrijfbare geheime sleutelring gevonden: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "schrijven publieke sleutelring ‘%s’ mislukt: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "schrijven geheime sleutelring ‘%s’ mislukt: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "publieke en geheime sleutel zijn aangemaakt en ondertekened.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4263,12 +4381,12 @@ "Deze sleutel kan niet gebruikt worden voor versleuteling. U kunt hiervoor\n" "met het commando “--edit-key†een subsleutel aanmaken.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Sleutel aanmaken is mislukt: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4276,7 +4394,7 @@ "sleutel is %lu seconde in de toekomst gemaakt (tijd ruimte lus of problemen " "met de klok)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4284,26 +4402,26 @@ "sleutel is %lu seconden in de toekomst gemaakt (tijd ruimte lus of problemen " "met de klok)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "Noot: v3 subsleutels zijn niet toegestaan in de OpenPGP standaard\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Werkelijk aanmaken? (j/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "sleutel is niet op de kaart opgeslagen: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan reservebestand ‘%s’ niet maken: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "Noot: reserve bestand van de kaart sleutel opgeslagen als ‘%s’\n" @@ -4336,249 +4454,249 @@ msgid "Keyring" msgstr "Sleutelring" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Vingerafdruk van de primaire sleutel:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Vingerafdruk van de Sub-Sleutel:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Vingerafdruk van de primaire sleutel:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Vingerafdruk van de Sub-Sleutel:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Vingerafdruk van de Sleutel =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Serienummer van de kaart =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "hernoemen van ‘%s’ naar ‘%s’ is mislukt: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Waarschuwing: er zijn twee bestanden met vertrouwlijke informatie.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s is de ongewijzigde\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s is de nieuwe\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Los dit beveiligingsprobleem alstublieft op\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "inlezen sleutelring ‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu sleutels tot nu toe ingelezen (%lu ondertekeningen)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu sleutels ingelezen (%lu ondertekeningen)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: sleutelring aangemaakt\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "toon ook ingetrokken sleutels" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "zoek ook op sub-sleutels als een sleutel ID wordt gezocht" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" "gebruik tijdelijke bestanden om gegevens naar de sleutelsever te sturen" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "tijdelijke bestanden laten staan na gebruik" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "Sleutels automatische ophalen bij het controleren van ondertekeningen" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "gebruik de voorkeur sleutelserver zoals vermeld bij de sleutel" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "gebruik het de PKA informatie bij het ophalen van de sleutel" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "Waarschuwing: sleutelserver optie '%s' is niet geldig op dit platform\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "uitgeschakeld" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Geef getallen, Volgende(N) , of Stoppen(Q) > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ongeldig sleutelserver protocol (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "sleutel '%s' niet gevonden op de sleutelserver\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "sleutel niet gevonden op de sleutelserver\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "opvragen sleutel %s van %s sleutelserver %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "opvragen sleutel %s van %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "namen zoeken van %s server %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "namen zoeken van %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "versturen van sleutel %s naar %s server %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "versturen van sleutel %s naar %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "zoeken naar '%s' van de %s server %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "zoeken naar '%s' van de %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "geen sleutelserver actie!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "Waarschuwing: sleutelserver code is van een andere GnuPG versie (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "sleutelserver verstuurde geen versie informatie\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "er is geen sleutelserver bekend (gebruik commando --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "externe sleutelservers zijn niet beschikbaar in deze versie\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "geen afhandeling mogelijk van sleutelserver configuratie ‘%s’\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" "de actie ‘%s’ is niet ondersteund in de sleutelserver configuratie ‘%s’\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s ondersteund de code met versie %d niet\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "sleutelserver reageert te langzaam\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "sleutelserver geeft een interne fout\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "communicatie fout met de sleutelserver: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s†is geen sleutel ID: overgeslagen\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" "Waarschuwing: het is niet mogelijk sleutel %s via %s te verversen: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 sleutel ververst vanuit %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d sleutels ververst vanuit %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "Waarschuwing: het is niet mogelijk de URI %s te benaderen: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "Waarschuwing: leesfout in URI %s\n" @@ -4733,64 +4851,64 @@ msgid "[uncertain]" msgstr "[onzeker]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " ook bekend als “%sâ€" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Ondertekening verlopen %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Ondertekening verloopt op %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s ondertekeningen, samenvattings algoritme %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binair" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "tekst" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "onbekend" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan ondertekening niet controleren: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "geen ontkoppelde ondertekening\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "Waarschuwing: meerdere ondertekeningen gevonden. Alleen de eerste wordt " "gecontroleerd.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "alleenstaande onderteklening van klasse 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "PGP 2.x ondertekening\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "ongeldig stam pakket gevonden in proc_tree()\n" @@ -4832,59 +4950,64 @@ msgstr "" "Waarschuwing: U gebruikt een expirimenteel samenvattings algoritme %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "het IDEA versleutelalgoritme is niet beschikbaar\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "lees %s voor meer informatie\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "Noot: %s is niet beschikbaar in deze versie\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: afgeraden optie “%sâ€\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "Waarschuwing: “%s†is een afgeraden optie\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "U kunt beter “%s%s†gebruiken\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "Waarschuwing: “%s†is een afgeraden comando - gebruik het niet\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Ongecomprimeerd" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "ongecomprimeerd|geen" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "dit bericht kan mogelijk niet gebruikt worden door %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "dubbelzinnige optie ‘%s’\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "onbekende optie ‘%s’\n" @@ -4937,12 +5060,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "kan publieke sleutel algoritme %d niet verwerken\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "Waarschuwing: mogelijk onveilig symetrisch versleutelde sessie sleutel\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "sub-pakket van type %d heeft het kritieke vlag gezet\n" @@ -5028,7 +5151,7 @@ msgid "Repeat passphrase: " msgstr "Herhaal geheime zin: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5044,60 +5167,60 @@ "sleutel!\n" "Houd het formaat ongeveer 240x288 voor optimaal resultaat.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Geef JPEG bestand voor foto ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "kan JPEG bestand ‘%s’ niet openen: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "dit JPEG bestand is erg groot (%d bytes) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Weet U zeker dat U deze wilt gebruiken? (j/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "‘%s’ is geen JPEG bestand\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 #, fuzzy msgid "Is this photo correct (y/N/q)? " msgstr "Is deze foto goed (j/N/s)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "geen programma geslecteerd om de foto te tonen\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "het is niet mogelijk de foto ID te tonen!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Geen reden opgegeven" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Sleutel is vervangen" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Sleutel is niet meer te vertrouwen" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Sleutel is niet meer in gebruik" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Gebruiker ID is niet meer geldig" @@ -5117,46 +5240,46 @@ msgid "No trust value assigned to:\n" msgstr "Er is geen vertrouwenswaarde opgegeven aan:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " ook bekend als “%sâ€\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "In hoeverre vertrouwd U er op dat deze sleutel werkelijk bij deze persoon " "hoort?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" -msgstr " %d = Weet ik nier / Wil ik niet zeggen\n" +msgstr " %d = Weet ik niet / Wil ik niet zeggen\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Ik vertrouw het niet\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" -msgstr " %d = Ik vertrouw het volledig\n" +msgstr " %d = Ik vertrouw het ultiem\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = terug naar het hoofdmenu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = sla deze sleutel over\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = stoppen\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5165,42 +5288,42 @@ "Het minimale vertrouwensniveau voor deze sleutel is: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Uw keuze? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " -msgstr "Vertrouwd U deze sleutel werkelijk volledig? (j/N) " +msgstr "Vertrouwd U deze sleutel werkelijk ultiem? (j/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "Certificaten die leiden tot een volledig vertrouwde sleutel:\n" +msgstr "Certificaten die leiden tot een ultiem vertrouwde sleutel:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Er is geen zekerheid dat deze sleutel werkelijk van de genoemde persoon " "is\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Er is beperkte zekerheid dat deze sleutel werkelijk van de genoemde " "persoon is\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Deze sleutel is waarschijnlijk van de genoemde persoon\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Deze sleutel is van ons\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5211,112 +5334,112 @@ "in de gebruikers ID. Als U echter HEEL zeker weet wat U doet,\n" "kan u op de volgende vraag Ja beantwoorden.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Deze sleutel echt gebruiken? (j/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "Waarschuwing: U gebruikt een onbetrouwbare sleutel!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "Waarschuwing: deze sleutel kan ingetrokken zijn (maar de intrekkingssleutel " "is niet beschikbaar)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "" "Waarschuwing: Deze sleutel is ingetrokken door de bevoegde intrekker!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "Waarschuwing: Deze sleutel is ingetrokken door de eigenaar!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Dit kan betekenen dat de ondertekening is vervalst.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "Waarschuwing: Deze sub-sleutel is ingetrokken door de eigenaar!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Noot: Deze sleutel is uitgeschakeld.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Noot: Het gecontroleerde adres van de ondertekenaar is ‘%s’\n" # TODO -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "trustlevel adjusted to FULL due to valid PKA info\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "trustlevel adjusted to NEVER due to bad PKA info\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Note: This key has expired!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNING: This key is not certified with a trusted signature!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " There is no indication that the signature belongs to the owner.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNING: We do NOT trust this key!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " The signature is probably a FORGERY.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " It is not certain that the signature belongs to the owner.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: skipped: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: skipped: public key already present\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "You did not specify a user ID. (you may use “-râ€)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Current recipients:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5324,33 +5447,33 @@ "\n" "Enter the user ID. End with an empty line: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "No such user ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "skipped: public key already set as default recipient\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Public key is disabled.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "skipped: public key already set\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "unknown default recipient “%sâ€\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: skipped: public key is disabled\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "no valid addressees\n" @@ -5417,7 +5540,7 @@ msgstr "NOTE: key has been revoked" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet failed: %s\n" @@ -5440,11 +5563,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Create a designated revocation certificate for this key? (j/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII versleutelde uitvoer geforceerd.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet failed: %s\n" @@ -5463,29 +5586,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "secret key “%s†not found: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "no corresponding public key: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "public key does not match secret key!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Create a revocation certificate for this key? (j/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "unknown protection algorithm\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTE: This key is not protected!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5503,33 +5626,33 @@ "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" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Please select the reason for the revocation:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Cancel" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probably you want to select %d here)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Enter an optional description; end it with an empty line:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Reason for revocation: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(No description given)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Is this okay? (j/N) " @@ -5603,46 +5726,46 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "WARNING: signing subkey %s has an invalid cross-certification\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "public key %s is %lu second newer than the signature\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "public key %s is %lu seconds newer than the signature\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu second in the future (time warp or clock problem)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTE: signature key %s expired %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "assuming bad signature from key %s due to an unknown critical bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "key %s: no subkey for subkey revocation signature\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "key %s: no subkey for subkey binding signature\n" @@ -5778,12 +5901,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync failed: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek failed: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -5827,84 +5950,85 @@ msgid "%s: trustdb created\n" msgstr "%s: trustdb created\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTE: trustdb not writable\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: invalid trustdb\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: failed to create hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error updating version record: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error reading version record: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error writing version record: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek failed: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: not a trustdb file\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: version record with recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: invalid file version %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error reading free record: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error writing dir record: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: failed to zero a record: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: failed to append a record: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "the trustdb is corrupted; please run “gpg --fix-trustdbâ€.\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: trustdb created\n" #: g10/textfilter.c:147 #, c-format @@ -5951,127 +6075,135 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "trust record %lu is not of requested type %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "using %s trust model\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ revoked]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ expired]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ unknown]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ undef ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginal]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ full ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ultimate]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "undefined" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "never" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "full" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ultimate" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "no need for a trustdb check\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "next trustdb check due at %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no need for a trustdb check with ‘%s’ trust model\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no need for a trustdb update with ‘%s’ trust model\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "public key %s not found: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "please do a --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "checking the trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d keys processed (%d validity counts cleared)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "no ultimately trusted keys found\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "public key of ultimately trusted key %s not found\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "unable to update trustdb version record: write failed: %s\n" @@ -6330,47 +6462,47 @@ msgstr "you found a bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes|ja" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yYjJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nee" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "stoppen" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6390,6 +6522,15 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(you may have used the wrong program for this task)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA sleutelpaar krijgt %u bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "the trustdb is corrupted; please run “gpg --fix-trustdbâ€.\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Beheerders PIN" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "can't put notation data into v3 (PGP 2.x style) signatures\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/pl.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/pl.gmo differ diff -Nru gnupg-1.4.9/po/pl.po gnupg-1.4.10/po/pl.po --- gnupg-1.4.9/po/pl.po 2008-03-25 08:53:10.000000000 +0000 +++ gnupg-1.4.10/po/pl.po 2009-09-02 17:19:40.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg-1.4.8\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2007-12-12 18:41+0100\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -50,13 +50,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "oczekiwanie na blokadê ,,%s''...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "nie mo¿na otworzyæ ,,%s'': %s\n" @@ -89,9 +88,10 @@ msgid "note: random_seed file not updated\n" msgstr "uwaga: plik random_seed nie jest uaktualniony\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "nie mo¿na utworzyæ ,,%s'': %s\n" @@ -151,174 +151,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "nie mo¿na zapisaæ odcisku: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "nie mo¿na zapisaæ daty utworzenia: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "nie mo¿na odczytaæ klucza publicznego: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "odpowied¼ nie zawiera klucza publicznego\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "odpowied¼ nie zawiera wspó³czynników RSA\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "odpowied¼ nie zawiera publicznego eksponentu RSA\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Proszê podaæ PIN%%0A[podpisano: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Proszê podaæ PIN%%0A[podpisano: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "wywo³anie zwrotne PIN zwróci³o b³±d: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN CHV%d zbyt krótki; minimalna d³ugo¶æ to %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "sprawdzenie CHV%d nie powiod³o siê: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "dostêp do komend administracyjnych nie jest skonfigurowany\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "b³±d przy pobieraniu statusu CHV z karty\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "karta jest nieodwracalnie zablokowana!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" "pozosta³o %d prób(y/a) wprowadzenia PIN-u administracyjnego przed\n" "nieodwracaln± blokad± karty\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|PIN administracyjny" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Proszê podaæ PIN%%0A[podpisano: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Proszê podaæ PIN%%0A[podpisano: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "dostêp do komend administracyjnych nie jest skonfigurowany\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "klucz publiczny jest ju¿ niedostêpny" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Proszê wybraæ powód uniewa¿nienia:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN CHV%d zbyt krótki; minimalna d³ugo¶æ to %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Nowy PIN administracyjny" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Nowy PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "b³±d podczas pobierania PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "b³±d odczytu danych aplikacji karty: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "b³±d odczytu DO odcisku\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "klucz ju¿ istnieje\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "istniej±cy klucz zostanie zast±piony\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "tworzenie nowego klucza\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "tworzenie nowego klucza\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "brak znacznika czasu utworzenia\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "brak wspó³czynnika RSA lub nie jest d³ugo¶ci %d bitów\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "brak publicznego eksponentu RSA lub jest d³u¿szy niz %d bitów\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "brak liczby pierwszej %s dla RSA, lub nie jest d³ugo¶ci %d bitów\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "zapis klucza nie powiód³ sie: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "prosze czekaæ na stworzenie klucza...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "tworzenie klucza nie powiod³o siê\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "tworzenie klucza zakoñczone (trwa³o %d s.)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "karta nie obs³uguje algorytmu skrótu %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "podpisów z³o¿onych do tej chwili: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Proszê podaæ PIN%%0A[podpisano: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "w tej chwili nie wolno sprawdzac PIN-u administracyjnego tym poleceniem\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nie ma dostêpu do %s - niepoprawna karta OpenPGP?\n" @@ -402,163 +448,225 @@ "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n" "przek³amanie wprowadzone przez serwer pocztowy\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "brak karty w standardzie OpenPGP: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "Karta OpenPGP numer %s\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "nie dzia³a w trybie wsadowym\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "To polecenie nie jest dostêpne w trybie %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Twój wybór? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[brak]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "mê¿czyzna" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "kobieta" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "bez odpowiedzi" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "nie wymuszone" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "wymuszone" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "B³±d: dozwolone s± tylko znaki z zestawu ASCII.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "B³±d: nie mo¿na u¿ywæ znaku ,,<''.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "B³±d: podwójne spacje s± niedozwolone.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Nazwisko w³a¶ciciela karty: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Imiê w³a¶ciciela karty: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "B³±d: pe³ne dane (imiê + nazwisko) zbyt d³ugie (limit %d znaków).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL ¼ród³a klucza publicznego:" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Blad: URL zbyt d³ugi (maksymalnie %d znaków).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "b³±d tworzenia zbioru kluczy `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "b³±d odczytu ,,%s'': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "b³±d tworzenia `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Dane do autoryzacji (nazwa konta): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "B³±d: dane autoryzacyjne zbyt d³ugie (maksymalnie %d znaków).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Prywatne dane DO: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "B³±d: prywatne dane DO zbyt d³ugie (maksymalnie %d znaków).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Ustawienia jêzyka: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "B³±d: niepoprawna d³ugo¶æ tekstu ustawieñ,\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "B³±d: niew³a¶ciwe znaki w tek¶cie ustawieñ.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Plec: M - mê¿czyzna, F - kobieta, lub spacja: " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "B³±d: niepopawna odpowied¼.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "Odcisk klucza Centrum Certyfikacji: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "B³±d: niew³a¶ciwy format odcisku klucza.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "u¿ycie klucza niemo¿liwe: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "nie jest kart± OpenPGP" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "b³±d przy pobieraniu opisu klucza: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Zast±piæ istniej±cy klucz? (t/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "zaokr±glono do %u bitów\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "Klucze %s mog± mieæ d³ugo¶æ w zakresie %u-%u bitów.\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "b³±d odczytu bloku klucza tajnego ,,%s'': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Utworzyæ poza kart± kopiê zapasow± klucza? (T/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "klucz tajny ju¿ jest zapisany na karcie\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Zast±piæ istniej±ce klucze? (t/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -569,177 +677,186 @@ " PIN = ,,%s'' PIN administacyjny = ,,%s''\n" "Nale¿y je zmieniæ komend± --change--pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Proszê wybraæ rodzaj klucza:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr "" " (1) Klucz do podpisywania\n" "\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Klucz do szyfrowania\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Klucz do autoryzacji\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Niew³a¶ciwy wybór.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Proszê wybraæ gdzie zapisaæ klucz:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "nieznany algorytm ochrony klucza\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "czê¶ci tajne klucza s± niedostêpne\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "klucz tajny ju¿ jest zapisany na karcie\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "b³±d zapisu zbioru kluczy '%': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "wyj¶cie z tego menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "polecenia administracyjne" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "wszystkie dostêpne dane" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "zmiana nazwiska w³a¶ciciela karty" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "zmiana URL-a klucza" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "pobranie klucza z URL-a na karcie" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "zmiana nazwy konta" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "zmiana ustawieñ jêzyka" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "zmiana p³ci w³a¶ciciela karty" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "zmiana odcisku centrum certyfikacji" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "prze³±czenie wymuszania PIN przy podpisywaniu" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "tworzenie nowych kluczy" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "menu zmiany lub odblokowania PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "sprawdzenie PIN-u i okazanie wszystkich danych" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Polecenie> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Polecenie dostêpne tylko w trybie administracyjnym\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Polecenia administracyjne s± dozwolone\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Polecenia administracyjne s± niedozwolone\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (spróbuj \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "czytnik niedostêpny\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Proszê w³o¿yæ kartê do czytnika i nacisn±æ ENTER,\n" "lub wprowadziæ ,,c'' aby anulowaæ operacjê: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "wybór ustawieñ openpgp nie powiód³ siê: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "Proszê zmieniæ kartê w czytniku na kartê o numerze %.*s.\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Wci¶nij ENTER kiedy karta jest gotowa, lub podaj ,,c'' aby anulowaæ: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Wprowad¼ nowy PIN administracyjny: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Wprowad¼ nowy PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Wprowad¼ PIN administracyjny: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Wprowad¼ PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Powtórz PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN nie zosta³ poprawnie powtórzony; jeszcze jedna próba" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "nie mo¿na otworzyæ ,,%s''\n" @@ -748,13 +865,13 @@ msgid "--output doesn't work for this command\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -857,7 +974,7 @@ msgid "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:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" @@ -1247,7 +1364,7 @@ msgid "Pubkey: " msgstr "Asymetryczne: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Symetryczne: " @@ -1255,7 +1372,7 @@ msgid "Hash: " msgstr "Skrótów: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Kompresji: " @@ -1401,404 +1518,404 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "UWAGA: stary domy¶lny plik opcji ,,%s'' zosta³ zignorowany\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji ,,%s''\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji ,,%s'': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z ,,%s''\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "modu³ szyfru ,,%s'' nie za³adowany z powodu niebezpiecznych praw dostêpu\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr ",,%s'' nie jest poprawn± dat± wygasania wa¿no¶ci podpisu\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr ",,%s'' nie jest poprawn± nazw± zestawu znaków\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d niepoprawne opcje serwera kluczy\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "niepoprawne opcje serwera kluczy\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: niepoprawne opcje listy kluczy\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "niepoprawne opcje listy kluczy\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "okazywanie zdjêæ podczas sprawdzania podpisu" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "okazywanie URL-i do regulaminów podczas sprawdzania podpisu" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisu" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "pokazywanie adnotacji standardu IETF przy sprawdzaniu podpisu" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "pokazywanie adnotacji u¿ytkownika przy sprawdzaniu podpisu" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "pokazywanie URL-i wybranych serwerów kluczy" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "pokazywanie poziomów zaufania przy sprawdzaniu podpisu" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" "okazywanie uniewa¿nionych i wygas³ych identyfikatorów przy sprawdzaniu " "podpisu" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "pokazywanie tylko g³ównego identyfikatora przy sprawdzaniu podpisu" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "sprawdzanie podpisów z u¿yciem danych PKA" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "podnoszenie zaufania do podpisów na podstawie danych PKA" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d niepoprawne opcje sprawdzania\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "niepoprawne opcje sprawdzania\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, 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/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d niepoprawna lista auto-key-locate\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "niepoprawna lista auto-key-locate\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u¿ywaæ %s z %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po³±czeniu z %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "UWAGA: %s nie jest dostêpny w tej wersji\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "z powodu %s nie bêdzie wykonane w niezabezpieczonej pamiêci\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "wybrany algorytm kompresji jest niepoprawny\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "niew³a¶ciwe domy¶lne ustawienia\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "niew³a¶ciwe ustawienia szyfrów\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "niew³a¶ciwe ustawienia skrótów\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s jeszcze nie dzia³a z %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "b³±d odszyfrowywania: ,,%s'': %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [plik]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "w trybie --s2k-mode 0 nie mo¿na u¿yæ --symmetric --encrypt\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "w trybie %s nie mo¿esz u¿yæ --symmetric --encrypt\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [plik]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "w trybie --s2k-mode 0 nie mo¿esz u¿yæ --symmetric --sign --encrypt\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "w trybie %s nie mo¿esz u¿yæ --symmetric --sign --encrypt\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "eksport kluczy nie powiód³ siê: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n" @@ -1843,17 +1960,17 @@ msgstr "" "Opcja --allow-non-selfsigned-uid wymusi³a uznanie za poprawny klucza %s\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "brak prywatnego odpowiednika podklucza publicznego %s - zignorowany\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "u¿ywany jest podklucz %s zamiast klucza g³ównego %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "klucz %s: klucz tajny bez klucza jawnego - pominiêty\n" @@ -1879,8 +1996,9 @@ msgstr "Wywo³anie: gpgv [opcje] [pliki] (-h podaje pomoc)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sk³adnia: gpgm [opcje] [pliki]\n" @@ -2678,12 +2796,12 @@ msgid "keyring `%s' created\n" msgstr "zbiór kluczy ,,%s'' zosta³ utworzony\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "blok klucza ,,%s'': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "nie powiod³a siê odbudowa bufora bazy: %s\n" @@ -2733,7 +2851,7 @@ msgstr "" "wykryto %d identyfikatorów u¿ytkownika niepodpisanych tym samym kluczem\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2744,12 +2862,12 @@ "to¿samo¶ci innych u¿ytkowników (czy sprawdzi on odciski kluczy pobrane\n" "z ró¿nych ¼róde³, dokumenty potwierdzaj±ce to¿samo¶æ, itd.).\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = mam ograniczone zaufanie\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = mam pe³ne zaufanie\n" @@ -2969,8 +3087,8 @@ msgid "Really sign? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n" @@ -2981,19 +3099,19 @@ "Atrapa klucza, lub szkielet klucza z karty - brak has³a które mo¿naby " "zmieniæ.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Ten klucz nie jest chroniony.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Czê¶ci tajne g³ównego znajduj± siê na karcie.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Klucz jest chroniony.\n" @@ -3010,7 +3128,7 @@ "Wprowad¼ nowe d³ugie, skomplikowane has³o dla tego klucza tajnego.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" @@ -3330,113 +3448,113 @@ msgid "Really update the preferences? (y/N) " msgstr "Czy na pewno uaktualniæ ustawienia? (t/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Zapisaæ zmiany? (t/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Wyj¶æ bez zapisania zmian? (t/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "zapis zmian nie powiód³ siê: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "zapis zmian na kluczu prywatnym nie powiód³ siê: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Skrót: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Ustawienia: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Klucz nie bêdzie modyfikowany na serwerze" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Domy¶lny serwer kluczy: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Adnotacje: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Klucz zosta³ uniewa¿niony %s przez %s kluczem %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr " (poufne)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "utworzony: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "uniewa¿niony: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "wygasa: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "wygasa: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "wykorzystanie: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "zaufanie: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "wiarygodno¶æ: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Ten klucz zosta³ wy³±czony z u¿ytku" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "numer karty: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3444,17 +3562,17 @@ "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n" "dopóki program nie zostanie uruchomiony ponownie.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "uniewa¿niony" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "wygas³y" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3463,7 +3581,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3472,74 +3590,74 @@ "OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n" " niektóre wersje przestan± go rozumieæ.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Czy dalej chcesz je dodaæ? (t/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Usun±æ ten poprawny podpis? (t/N/w) " -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) " -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Usun±æ ten nieznany podpis? (t/N/w) " -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) " -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d podpis usuniêty.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d podpisów usuniêtych.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nic nie zosta³o usuniête.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "niepoprawny" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ upakowany %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Identyfikator u¿ytkownika ,,%s'': %d podpis usuniêty\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Identyfikator u¿ytkownika ,,%s'' %d podpisy(ów) usuniête(ych)\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "Identyfikator u¿ytkownika ,,%s'': ju¿ jest upakowany\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "Identyfikator u¿ytkownika ,,%s'': jest ju¿ oczyszczony\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3549,254 +3667,260 @@ " uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n" " go rozumieæ.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "klucz zosta³ ju¿ ustawiony jako uniewa¿niaj±cy\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Proszê wybraæ tylko jeden podklucz.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Zmiana daty wa¿no¶ci podklucza.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "podklucz podpisuj±cy %s jest ju¿ skro¶nie podpisany\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" "podklucz %s nie s³u¿y do podpisywania, wiêc nie trzeba go podpisywac " "skro¶nie\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Podaj URL preferowanego serwera kluczy: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Czy na pewno chcesz go zast±piæ? (t/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Czy na pewno chcesz go usun±æ? (t/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Adnotacje podpisu: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "Kontynuowaæ? (t/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Brak identyfikatora u¿ytkownika ze skrótem %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Brak podklucza o numerze %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "Identyfikator u¿ytkownika ,,%s''\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podpisany Twoim kluczem %s w %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr "podpisany przez %08lX w %s%s\n" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te identyfikatory klucza %s s± podpisane przez Ciebie:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (podpis nieuniewa¿nialny) " -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "uniewa¿niony przez %s w %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "brak klucza tajnego\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Klucz %s zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Podklucz %s zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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 %s (id %d).\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "ustawienie %s powtarza siê\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "zbyt wiele ustawieñ szyfrów\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "zbyt wiele ustawieñ skrótów\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "zbyt wiele ustawieñ kompresji\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "niepoprawny napis ,,%s'' w tek¶cie ustawieñ\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "zapis podpisu bezpo¶redniego\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "zapis podpisu klucza nim samym\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "zapis podpisu wi±¿±cego klucz\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "niew³a¶ciwa d³ugo¶æ klucza; wykorzystano %u bitów\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "rozmair klucza zaokr±glony do %u bitów\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Podpisywanie" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Po¶wiadczanie" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Szyfrowanie" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autoryzacja" @@ -3809,109 +3933,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "PpSsAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Mo¼liwe wykorzystanie klucza %s: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Dozwolone dzia³ania: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Prze³±czenie mo¿liwo¶ci podpisywania\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Prze³±czenie mo¿liwo¶ci szyfrowania\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Prze³±czenie mo¿liwo¶ci autoryzacji\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Koniec\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Proszê wybraæ rodzaj klucza:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (tylko do podpisywania)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (z dowolnie wybranymi funkcjami)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (tylko do podpisywania)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (tylko do podpisywania)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (tylko do szyfrowania)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (z dowolnie wybranymi funkcjami)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (z dowolnie wybranymi funkcjami)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Para kluczy dla DSA bêdzie mia³a %u bity/ów d³ugo¶ci.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (z dowolnie wybranymi funkcjami)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "Klucze %s mog± mieæ d³ugo¶æ od %u do %u bitów.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "Klucze %s mog± mieæ d³ugo¶æ w zakresie %u-%u bitów.\n" +msgid "What keysize do you want? (%u) " +msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "¯±dana d³ugo¶æ klucza to %u bitów.\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "zaokr±glono do %u bitów\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3927,7 +4046,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:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3943,38 +4062,38 @@ " 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:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Okres wa¿no¶ci klucza ? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Okres wa¿no¶ci podpisu? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "niepoprawna warto¶æ\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Klucz bez daty wygasania\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Podpis bez daty wygasania\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Klucz wygasa %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Wa¿no¶æ podpisu wygasa %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3982,11 +4101,11 @@ "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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Czy wszystko siê zgadza? (t/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4002,44 +4121,44 @@ " ,,Tadeusz ¯eleñski (Boy) ''\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Imiê i nazwisko: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Adres poczty elektronicznej: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "To nie jest poprawny adres poczty elektronicznej\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Komentarz: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Niew³a¶ciwy znak w komentarzu\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "U¿ywasz zestawu znaków %s.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4050,7 +4169,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4067,37 +4186,37 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "IiKkEeDdWw" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Najpierw trzeba poprawiæ ten b³±d\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 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:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4109,7 +4228,7 @@ "\"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4125,50 +4244,50 @@ "ilo¶ci\n" "entropii.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Procedura generacji klucza zosta³a anulowana.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujê klucz publiczny w '%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisujê szkielet klucza tajnego w ,,%s''\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "b³±d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "klucz publiczny i prywatny (tajny) zosta³y utworzone i podpisane.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4176,12 +4295,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4189,7 +4308,7 @@ "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4197,26 +4316,26 @@ "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Czy na pewno utworzyæ? (t/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "zapis klucza na karcie nie powiód³ siê: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "nie mo¿na utworzyæ kopii zapasowej ,,%s'': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "UWAGA: kopia klucza z karty zosta³a zapisana w ,,%s''\n" @@ -4249,250 +4368,250 @@ msgid "Keyring" msgstr "Zbiór kluczy" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Odcisk klucza g³ównego:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Odcisk klucza g³ównego:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Odcisk klucza =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "Numer seryjny karty =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod³a siê: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "OSTRZE¯ENIE: Istniej± dwa pliki z poufnymi informacjami.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s pozosta³ bez zmian\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s zosta³ utworzony\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "buforowanie zbioru kluczy ,,%s''\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu kluczy zbuforowanych (%lu podpisów)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu kluczy zbuforowano (%lu podpisów)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: zbiór kluczy utworzony\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "w³±czenie uniewa¿nionych kluczy do wyników wyszukiwania" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "uwzglêdnienie podkluczy do wyszukiwania po numerze klucza" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" "wykorzystanie plików tymczasowych do komunikacji z programami pomocniczymi" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "bez kasowania plików tymczasowych po u¿yciu" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "automatyczne pobieranie brakuj±cych kluczy przy sprawdzaniu podpisów" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "uwzgldnienie ustawienia serwera kluczy na kluczu przy jego pobieraniu" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "uwzglêdnienie ustawienia PKA na kluczu przy jego pobieraniu" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "OSTRZE¯ENIE: opcja serwera ,,%s'' nie dzia³a na tym systemie\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "wy³±czone" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Podaj numer opcji, (N)Dalej, lub (Q)Wyjscie > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "niepoprawny protokó³ dostêpu do serwera kluczy (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "brak klucza ,,%s'' w serwerze\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "brak klucza w serwerze\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "zapytanie o klucz %s w serwerze %s %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "zapytanie o klucz %s w %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "szukanie nazw w serwerze %s %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "szukanie nazw w serwerze %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "wysy³anie klucza %s do serwera %s %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "wysy³anie klucza %s do %s\"\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "zapytanie o ,,%s'' w serwerze %s %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "zapytanie o ,,%s'' w serwerze %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "brak polecenia dla serwera kluczy!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" "OSTRZE¯ENIE: program obs³ugi serwera kluczy pochodzi z innej wersji GnuPG (%" "s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "serwer kluczy nie wys³a³ VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" "ta kompilacja nie obs³uguje zewnêtrznych proigramów do komunikacji z " "serwerami\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "brak programu obs³uguj±cego protokó³ ,,%s''\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "nie mo¿na zrobiæ ,,%s'' przy po³±czeniu protoko³em ,,%s''\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s nie obs³uguje programu pomocniczego w wersji %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "przekroczenie limitu czasu po³±czenia z serwerem kluczy\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "b³±d serwera kluczy\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "b³±d ³±czno¶ci z serwerem kluczy: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s nie jest poprawnym identyfikatorem klucza, pominiêty\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "OSTRZE¯ENIE: od¶wie¿yæ klucza %s przez %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "od¶wie¿anie klucza z %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "od¶wie¿anie %d kluczy z %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "OSTRZE¯ENIE: nie mo¿na pobraæ URI %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "OSTRZE¯ENIE: niezrozumia³y URI %s\n" @@ -4645,63 +4764,63 @@ msgid "[uncertain]" msgstr "[niepewne]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " \\alias ,,%s''" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Wa¿no¶æ podpisu wygas³a %s.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Wa¿no¶æ podpisu wygasa %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "podpis %s, skrót %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binarny" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "tekstowy" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "nieznany" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Nie mo¿na sprawdziæ podpisu: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "nie jest oddzielonym podpisem.\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "OSTRZE¯ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "oddzielony podpis klasy 0x%02x.\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starego typu (PGP 2.x).\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" @@ -4740,59 +4859,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "OSTRZE¯ENIE: u¿ywany jest eksperymentalny algorytm skrótu %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "OSTRZE¯ENIE: algorytm skrótu %s jest przestarza³y\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "modu³ szyfru IDEA nie jest dostêpny\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "wiêcej informacji mo¿na znale¼æ w %s\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "OSTRZE¯ENIE: algorytm skrótu %s jest przestarza³y\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "UWAGA: %s nie jest dostêpny w tej wersji\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d jest przestarza³± opcj± ,,%s''\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "OSTRZE¯ENIE: ,,%s'' jest przestarza³± opcj±.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "w jej miejsce nale¿y u¿yæ ,,%s%s''\"\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "OSTRZE¯ENIE: ,,%s'' jest przestarza³± opcj± -- nie nale¿y jej u¿ywaæ\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Nieskompresowany" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "Nieskompresowany|brak" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "ta wiadomo¶æ mo¿e nie daæ siê odczytaæ za pomoc± %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "niejednoznaczna opcja ,,%s''\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "nieznana opcja ,,%s''\n" @@ -4844,13 +4968,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "nie mo¿na obs³u¿yæ tego algorytmu klucza publicznego: %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "OSTRZE¯ENIE: symetrycznie zaszyfrowany klucz sesyjny mo¿e nie byæ " "bezpieczny\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" @@ -4936,7 +5060,7 @@ msgid "Repeat passphrase: " msgstr "Powtórz has³o: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4950,58 +5074,58 @@ "publicznym. Je¶li bêdzie du¿y, powiêkszy to tak¿e rozmiar Twojego klucza!\n" "Dobry rozmiar to oko³o 240 na 288 pikseli.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Nazwa pliku ze zdjêciem w formacie JPEG: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "nie mo¿na otworzyæ pliku JPEG ,,%s'': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Bardzo du¿y plik JPEG (%d bajtów)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Czy na pewno chcesz go u¿yæ? (t/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr ",,%s'' nie jest plikiem JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Czy zdjêcie jest w porz±dku? (t/N/w) " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "brak ustawienia przegl±darki do zdjêæ\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "nie mo¿na wy¶wietliæ zdjêcia!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nie podano przyczyny" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Klucz zosta³ zast±piony" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Klucz zosta³ skompromitowany" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "klucz nie jest ju¿ u¿ywany" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Identyfikator u¿ytkownika przesta³ byæ poprawny" @@ -5021,44 +5145,44 @@ msgid "No trust value assigned to:\n" msgstr "Brak warto¶ci zaufania dla:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " alias ,,%s''\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Jak bardzo ufasz, ¿e ten klucz nale¿y do tej osoby?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = nie wiem, albo nie powiem\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NIE ufam mu\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = ufam absolutnie\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = powrót do g³ównego menu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " p = pominiêcie klucza\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " w = wyj¶cie\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5067,37 +5191,37 @@ "Minimalny poziom zaufania do tego klucza wynosi %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Twoja decyzja? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Czy na pewno chcesz obdarzyæ ten klucz absolutnym zaufaniem? (t/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certyfikaty prowadz±ce do ostatecznie zaufanego klucza:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: Nie ma pewno¶ci co do to¿samo¶ci w³a¶ciciela klucza.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: Jest ograniczona pewno¶æ co do to¿samo¶ci w³a¶ciciela klucza.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Ten klucz prawdopodobnie nale¿y do tej osoby.\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Ten klucz nale¿y do nas\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5107,111 +5231,111 @@ "Je¶li nie masz co do tego ¿adnych w±tpliwo¶ci i *naprawdê* wiesz co robisz,\n" "mo¿esz odpowiedzieæ ,,tak'' na nastêpne pytanie.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "U¿yæ tego klucza pomimo to? (t/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "OSTRZE¯ENIE: u¿ywany jest klucz nie obdarzony zaufaniem!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "OSTRZE¯ENIE: ten klucz móg³ zostaæ uniewa¿niony\n" " (brak klucza uniewa¿niaj±cego aby to sprawdziæ)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony kluczem uniewa¿niaj±cym!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony przez w³a¶ciciela!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " To mo¿e oznaczaæ ¿e podpis jest fa³szerstwem.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "OSTRZE¯ENIE: Ten podklucz zosta³ uniewa¿niony przez w³a¶ciciela!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Uwaga: Ten klucz zosta³ wy³±czony z u¿ytku\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Uwaga: sprawdzony adres sygnatariusza to ,,%s''\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "Uwaga: adres sygnatariusza ,,%s'' nie zgadza siê z DNS\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "poziom zaufania zmieniony na PE£EN z powodu poprawnego PKA\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "poziom zaufania zmieniony na NIGDY z powodu niepoprawnego PKA\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Uwaga: wa¿no¶æ tego klucza wygas³a!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony zaufanym podpisem!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Nie ma pewno¶ci co do to¿samo¶ci osoby która z³o¿y³a podpis.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "OSTRZE¯ENIE: NIE UFAMY temu kluczowi!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Ten podpis prawdopodobnie jest FA£SZYWY.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "OSTRZE¯ENIE: Tego klucza nie po¶wiadczaj± wystarczaj±co zaufane podpisy!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Nie ma pewno¶ci co do to¿samo¶ci osoby która z³o¿y³a ten " "podpis.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: pominiêty: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: pominiêty: zosta³ ju¿ wybrany w innej opcji\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Nie zosta³ podany identyfikatora u¿ytkownika (np za pomoc± ,,-r'')\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Obecnie wybrani adresaci:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5219,33 +5343,33 @@ "\n" "Identyfikator u¿ytkownika (pusta linia oznacza koniec): " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Brak takiego identyfikatora u¿ytkownika.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "pominiêty: klucz publiczny ju¿ jest domy¶lnym adresatem\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Klucz publiczny wy³±czony z u¿ycia.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "pominiêty: zosta³ ju¿ wybrany w innej opcji\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "nieznany domy¶lny adresat ,,%s''\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ytku\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "brak poprawnych adresatów\n" @@ -5313,7 +5437,7 @@ msgstr "UWAGA: klucz zosta³ uniewa¿niony" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "wywo³anie funkcji build_packet nie powiod³o siê: %s\n" @@ -5335,11 +5459,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego klucza? (t/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "wymuszono opakowanie ASCII wyniku.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "wywo³anie funkcji make_keysig_packet nie powiod³o siê: %s\n" @@ -5358,28 +5482,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "brak odpowiadaj±cego klucza publicznego: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Utworzyæ certyfikat uniewa¿nienia tego klucza? (t/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "nieznany algorytm ochrony\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "UWAGA: Ten klucz nie jest chroniony!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5403,33 +5527,33 @@ "komputerów mog± zachowaæ tre¶æ wydruku i udostêpniæ j± osobom " "nieupowa¿nionym.\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Proszê wybraæ powód uniewa¿nienia:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Anuluj" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Prawdopodobnie chcesz tu wybraæ %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Wprowad¼ opis (nieobowi±zkowy) i zakoñcz go pust± lini±:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Powód uniewa¿nienia: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(nie podano)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Informacje poprawne? (t/N) " @@ -5507,17 +5631,17 @@ msgstr "" "OSTRZE¯ENIE: podklucz podpisuj±cy %s jest niepoprawnie skro¶nie podpisany\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "klucz publiczny %s jest o %lu sekundê m³odszy od podpisu\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "klucz publiczny %s jest o %lu sekund(y) m³odszy od podpisu\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5525,7 +5649,7 @@ "klucz %s zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5533,24 +5657,24 @@ "klucz %s zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "UWAGA: klucz podpisuj±cy %s przekroczy³ datê wa¿no¶ci %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "podpis z³o¿ony kluczem %s uznany za niewa¿ny z powodu nieznanego bitu " "krytycznego\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "klucz %s: brak podklucza, którego dotyczy uniewa¿nienie\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "klucz %s: brak podklucza dowi±zywanego podpisem\n" @@ -5690,12 +5814,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "baza zaufania: synchronizacja nie powiod³a siê %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod³a siê: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "baza zaufania, wpis %lu: zapis nie powiód³ siê (n=%d): %s\n" @@ -5739,85 +5863,85 @@ msgid "%s: trustdb created\n" msgstr "%s: baza zaufania utworzona\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "UWAGA: nie mo¿na zapisywaæ bazy zaufania\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: niepoprawny plik bazy zaufania\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: tworzenie tablicy skrótów nie powiod³o siê: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: b³±d przy uaktualnianiu numeru wersji: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: b³±d odczytu numeru wersji: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: b³±d zapisu numeru wersji: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "baza zaufania: funkcja lseek() zawiod³a: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "baza zaufania: funkcja read() (n=%d) zawiod³a: %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: to nie jest plik bazy zaufania\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: wpis wersji z numerem %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: niew³a¶ciwa wersja pliku %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: b³±d odczytu pustego wpisu: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: b³±d zapisu wpisu katalogowego: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: zerowanie rekordu nie powiod³o siê: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: dopisanie rekordu nie powiod³o siê: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: baza zaufania utworzona\n" #: g10/textfilter.c:147 #, c-format @@ -5864,120 +5988,128 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "wpis zaufania %lu jest typu innego ni¿ poszukiwany %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "nie mo¿na u¿yæ nieznanego modelu zaufania %d, zostaje przyjêty %s\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "model zaufania %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "16" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ uniewa¿niony ]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ wygas³y ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ nieznany ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[niezdefiniowany]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ marginalny ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ pe³ny ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ ostateczny ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "niezdefiniowany" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "nigdy" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginalny" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "pe³ny" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ostateczny" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne przy modelu ,,%s''\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "aktualizacja bazy jest niepotrzebna przy modelu ,,%s''\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "klucz publiczny %s nie odnaleziony: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "sprawdzanie bazy zaufania\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "brak absolutnie zaufanych kluczy\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "potrzeba %d marginalny(ch), %d zupe³ny(ch), model zaufania %s\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5985,7 +6117,7 @@ "g³êboko¶æ: %d wa¿nych: %3d podpisanych %3d zaufanych %d-, %dq, %dn, %dm, %" "df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "zapis aktualizacji bazy zaufania nie powiód³ siê: %s\n" @@ -6244,47 +6376,47 @@ msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "tak" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "tT" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nie" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "wyj¶cie" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "wW" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "ok|OK" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "anuluj|Anuluj" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "aA" @@ -6304,6 +6436,16 @@ 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 "DSA keypair will have %u bits.\n" +#~ msgstr "Para kluczy dla DSA bêdzie mia³a %u bity/ów d³ugo¶ci.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|PIN administracyjny" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "" #~ "nie mo¿na umie¶ciæ adnotacji w podpisach sk³adanych kluczami PGP 2.x\n" @@ -6745,10 +6887,6 @@ #~ "\"\n" #~ "lokalnie podpisano Twoim kluczem %08lX w %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr "podpisany przez %08lX w %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: dostêp niemo¿liwy: %s\n" @@ -7465,9 +7603,6 @@ #~ msgid "can't lock keyring `%': %s\n" #~ msgstr "nie mo¿na zablokowaæ zbioru kluczy publicznych: %s\n" -#~ msgid "error writing keyring `%': %s\n" -#~ msgstr "b³±d zapisu zbioru kluczy '%': %s\n" - #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" #~ msgstr "" #~ "UWAGA: wpis podpisu %lu[%d] znajduje siê w li¶cie domy¶lnej %lu,\n" @@ -7505,9 +7640,6 @@ #~ msgid "Too many preference items" #~ msgstr "Zbyt wiele pozycji w ustawieniach" -#~ msgid "public key not anymore available" -#~ msgstr "klucz publiczny jest ju¿ niedostêpny" - #~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" #~ msgstr "" #~ "identyfikator %08lX.%lu/%02X%02X: ma zdublowany katalog %lu,\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/pt_BR.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/pt_BR.gmo differ diff -Nru gnupg-1.4.9/po/pt_BR.po gnupg-1.4.10/po/pt_BR.po --- gnupg-1.4.9/po/pt_BR.po 2008-03-25 08:53:11.000000000 +0000 +++ gnupg-1.4.10/po/pt_BR.po 2009-09-02 17:19:40.000000000 +0100 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2007-10-23 11:33+0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -45,13 +45,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "escrevendo certificado privado para `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "impossível abrir `%s': %s\n" @@ -84,9 +83,10 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar %s: %s\n" @@ -138,176 +138,221 @@ "para que o sistema possa coletar mais entropia!\n" "(São necessários mais %d bytes)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "Digite o identificador de usuário: " + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "a chave pública não está mais disponível" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "rev- revogações de chaves incorreta\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "erro na criação da frase secreta: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: erro lendo registro livre: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "%lu chaves processadas\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "gerar um novo par de chaves" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "gerar um novo par de chaves" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "assinatura %s de: %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenhum dado OpenPGP válido encontrado.\n" @@ -394,177 +439,238 @@ "caractere \"quoted printable\" na armadura - provavelmente um MTA com bugs " "foi usado\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "chave secreta não disponível" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, 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:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +msgid "This command is only available for version 2 cards\n" +msgstr "" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Sua opção? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "não processado(s)" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "escrevendo certificado público para `%s'\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "erro na escrita do chaveiro `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "erro na leitura de `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "lista preferências" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Caractere inválido no nome\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Caractere inválido no nome\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "erro: impressão digital inválida\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "Impressão digital:" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "erro: impressão digital inválida\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Realmente assinar? " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Que tamanho de chave você quer? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Que tamanho de chave você quer? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Que tamanho de chave você quer? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "arredondado para %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "erro na leitura de `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ignorado: a chave secreta já está presente\n" + +#: g10/card-util.c:1378 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Realmente assinar? " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -572,196 +678,205 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Esta chave não é protegida.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, fuzzy msgid "secret parts of key are not available\n" msgstr "chave secreta não disponível" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "erro na escrita do chaveiro `%': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "escrevendo certificado privado para `%s'\n" # help ou ajuda ??? -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "chave secreta não disponível" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 #, fuzzy msgid "Enter New Admin PIN: " msgstr "Digite o identificador de usuário: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 #, fuzzy msgid "Enter New PIN: " msgstr "Digite o identificador de usuário: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 #, fuzzy msgid "Enter PIN: " msgstr "Digite o identificador de usuário: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Repita a frase secreta: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" @@ -770,13 +885,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -876,7 +991,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "" @@ -1281,7 +1396,7 @@ msgid "Pubkey: " msgstr "" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "" @@ -1289,7 +1404,7 @@ msgid "Hash: " msgstr "" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 #, fuzzy msgid "Compression: " msgstr "Comentário: " @@ -1427,420 +1542,420 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "chaveiro inválido" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 #, fuzzy msgid "invalid import options\n" msgstr "armadura inválida" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inválido" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "armadura inválida" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "a URL de política dada é inválida\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "chaveiro inválido" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "chave RSA não pode ser usada nesta versão\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 #, fuzzy msgid "invalid default preferences\n" msgstr "lista preferências" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista preferências" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista preferências" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista preferências" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descriptografia falhou: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, 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/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" @@ -1888,17 +2003,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %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:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -1931,7 +2046,7 @@ #: g10/gpgv.c:102 #, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxe: gpgm [opções] [arquivos]\n" @@ -2667,12 +2782,12 @@ msgid "keyring `%s' created\n" msgstr "%s: chaveiro criado\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "%s: erro de leitura de bloco de chaves: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" @@ -2721,7 +2836,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d IDs de usuários sem auto-assinaturas válidas detectados\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2740,12 +2855,12 @@ " 4 = Eu confio completamente\n" " s = Mostrar mais informações\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr "%s: não é um banco de dados de confiabilidade\n" @@ -2964,8 +3079,8 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -2974,21 +3089,21 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 #, fuzzy msgid "Secret parts of primary key are not available.\n" msgstr "chave secreta não disponível" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "chave secreta não disponível" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "A chave é protegida.\n" @@ -3005,7 +3120,7 @@ "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" @@ -3351,489 +3466,495 @@ msgid "Really update the preferences? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvar alterações? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem salvar? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "atualização falhou: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "atualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma atualização é necessária.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notação: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr "trust" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr "trust" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Esta chave foi desativada" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 #, 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:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Deletar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deletar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deletar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "armadura inválida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 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:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Digite o tamanho da chave" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleções das chaves secretas.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Por favor selecione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Modificando a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, 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:4139 +#: g10/keyedit.c:4147 #, 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:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notação: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Sobrescrever (s/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuário: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 #, 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:4651 +#: g10/keyedit.c:4659 #, 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:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " assinado por %08lX em %s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr "assinar uma chave localmente" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Você está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "ignorado `%s': duplicado\n" # muitas ou demais ??? -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "Preferências demais" # muitas ou demais ??? -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "Preferências demais" # muitas ou demais ??? -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "Preferências demais" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 #, fuzzy msgid "writing direct signature\n" msgstr "escrevendo auto-assinatura\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "escrevendo auto-assinatura\n" # key binding ??? -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "escrevendo assinatura ligada a uma chave\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "criptografar dados" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3846,109 +3967,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA e ElGamal (padrão)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA e ElGamal (padrão)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) ElGamal (apenas criptografia)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1460 -#, fuzzy, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) DSA (apenas assinatura)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "O par de chaves DSA terá 1024 bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Que tamanho de chave você quer? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Que tamanho de chave você quer? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "arredondado para %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3964,7 +4080,7 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 #, fuzzy msgid "" "Please specify how long the signature should be valid.\n" @@ -3981,40 +4097,40 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "A chave não expira nunca\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "A chave não expira nunca\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "A chave expira em %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Esta chave não é protegida.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4022,12 +4138,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4044,44 +4160,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 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:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Endereço de correio eletrônico: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Endereço eletrônico inválido\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Caractere inválido no comentário\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4092,7 +4208,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" @@ -4107,24 +4223,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 #, 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4132,12 +4248,12 @@ "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4149,7 +4265,7 @@ "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4161,50 +4277,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "escrevendo certificado público para `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "impossível bloquear chaveiro secreto: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4213,12 +4329,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4226,7 +4342,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4234,26 +4350,26 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Realmente criar? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossível criar %s: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chave secreta %08lX expirou %s\n" @@ -4290,258 +4406,258 @@ msgid "Keyring" msgstr "" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 #, fuzzy msgid "Primary key fingerprint:" msgstr "listar as chaves e as impressões digitais" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 #, fuzzy msgid " Primary key fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Impressão digital:" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: existem 2 arquivos com informações confidenciais.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o não modificado\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Por favor conserte este possível furo de segurança\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "listar as chaves e as assinaturas" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "listar as chaves e as assinaturas" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: chaveiro criado\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "a URL de política dada é inválida\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "chaveiro inválido" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "exportar chaves para um servidor" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "lendo opções de `%s'\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "assinado com sua chave %08lX em %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "exportar chaves para um servidor" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "lendo opções de `%s'\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "chaveiro inválido" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "erro geral" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "erro geral" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, 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:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "%s: novo arquivo de opções criado\n" @@ -4698,64 +4814,64 @@ msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " ou \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Esta chave não é protegida.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Esta chave não é protegida.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "assinatura %s de: %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 #, fuzzy msgid "unknown" msgstr "versão desconhecida" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossível verificar assinatura: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 #, fuzzy msgid "not a detached signature\n" msgstr "fazer uma assinatura separada" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura isolada da classe 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" @@ -4794,61 +4910,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "assinatura %s de: %s\n" -#: g10/misc.c:353 -#, 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:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, 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:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "chave RSA não pode ser usada nesta versão\n" + +#: g10/misc.c:748 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/misc.c:719 +#: g10/misc.c:774 #, fuzzy msgid "Uncompressed" msgstr "não processado(s)" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "não processado(s)" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "destinatário padrão desconhecido `%s'\n" @@ -4901,11 +5022,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossível manipular algoritmo de chave pública %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" @@ -4996,7 +5117,7 @@ msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5005,63 +5126,63 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "impossível abrir arquivo: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 #, fuzzy msgid "Is this photo correct (y/N/q)? " msgstr "Está correto (s/n)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 #, fuzzy msgid "unable to display photo ID!\n" msgstr "impossível abrir %s: %s\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 #, fuzzy msgid "Key is superseded" msgstr "A chave é protegida.\n" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 #, fuzzy msgid "Key has been compromised" msgstr "Esta chave foi desativada" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "" @@ -5086,87 +5207,87 @@ "Nenhum valor de confiança designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " ou \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr "" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr "%08lX: Nós NÃO confiamos nesta chave\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = voltar ao menu principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr "chave %08lX: subchave ignorada\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = sair\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Sua decisão? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Você realmente quer remover esta chave? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr " Não há indicação de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr " Não há indicação de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Esta chave pertence a nós\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5178,148 +5299,148 @@ "sim à próxima pergunta\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Usa esta chave de qualquer modo? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: Usando chave não confiável!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a assinatura é falsificada.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 #, fuzzy msgid "Note: This key has been disabled.\n" msgstr "Esta chave foi desativada" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Não há indicação de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: Nós NÃO confiamos nesta chave!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura é provavelmente uma FALSIFICAÇÃO.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: Esta chave não está certificada com assinaturas suficientemente\n" " confiáveis!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Não se tem certeza de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ignorado: a chave pública já está presente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 #, fuzzy msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Você não especificou um identificador de usuário. (pode-se usar \"-r\")\n" "\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " msgstr "" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Identificador de usuário inexistente.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "ignorado: chave pública já marcada como destinatário padrão\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "A chave pública está desativada.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 #, fuzzy msgid "skipped: public key already set\n" msgstr "%s: ignorado: a chave pública já está presente\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinatário padrão desconhecido `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ignorado: a chave pública está desativada\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "nenhum endereço válido\n" @@ -5388,7 +5509,7 @@ msgstr "chave %08lX: a chave foi revogada!\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, fuzzy, c-format msgid "build_packet failed: %s\n" msgstr "atualização falhou: %s\n" @@ -5411,11 +5532,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, fuzzy, c-format msgid "make_keysig_packet failed: %s\n" msgstr "enumeração de blocos de chaves falhou: %s\n" @@ -5435,32 +5556,32 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, fuzzy, c-format msgid "no corresponding public key: %s\n" msgstr "escrevendo certificado público para `%s'\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 #, fuzzy msgid "public key does not match secret key!\n" msgstr "lid %lu não tem chave\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 #, fuzzy msgid "unknown protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/revoke.c:541 +#: g10/revoke.c:539 #, fuzzy msgid "NOTE: This key is not protected!\n" msgstr "Esta chave não é protegida.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5471,34 +5592,34 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Usa esta chave de qualquer modo? " @@ -5576,17 +5697,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "a chave pública é %lu segundo mais nova que a assinatura\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "a chave pública é %lu segundos mais nova que a assinatura\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5594,7 +5715,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5602,22 +5723,22 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: chave de assinatura %08lX expirou %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" @@ -5754,12 +5875,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "banco de dados de confiabilidade: sincronização falhou: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n" @@ -5803,86 +5924,85 @@ msgid "%s: trustdb created\n" msgstr "%s: banco de dados de confiabilidade criado\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: banco de dados de confiabilidade inválido\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erro atualizando registro de versão: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erro lendo registro de versão: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erro escrevendo registro de versão: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "banco de dados de confiabilidade: lseek falhou: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registro de versão com recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versão de arquivo inválida %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro lendo registro livre: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro escrevendo registro de diretório: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: falha ao zerar um registro: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: falha ao anexar um registro: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"O banco de dados de confiabilidade está danificado; por favor rode\n" -"\"gpg --fix-trust-db\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: banco de dados de confiabilidade criado\n" #: g10/textfilter.c:147 #, c-format @@ -5930,132 +6050,140 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "registro de confiança %lu: remoção falhou: %s\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "expire" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 #, 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública não encontrada" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 #, fuzzy msgid "checking the trustdb\n" msgstr "muda os valores de confiança" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6320,49 +6448,49 @@ msgstr "você encontrou um bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 #, fuzzy msgid "yes" msgstr "sim" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "não" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" # INICIO MENU #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "sair" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6385,6 +6513,15 @@ msgstr "(você pode ter usado o programa errado para esta tarefa)\n" #, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "O par de chaves DSA terá 1024 bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "O banco de dados de confiabilidade está danificado; por favor rode\n" +#~ "\"gpg --fix-trust-db\".\n" + +#, fuzzy #~ msgid "" #~ "a notation name must have only printable characters or spaces, and end " #~ "with an '='\n" @@ -6771,10 +6908,6 @@ #~ "\"\n" #~ "assinado com sua chave %08lX em %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " assinado por %08lX em %s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: impossível acessar: %s\n" @@ -7467,9 +7600,6 @@ #~ msgid "Too many preference items" #~ msgstr "Muitos itens de preferência" -#~ msgid "public key not anymore available" -#~ msgstr "a chave pública não está mais disponível" - # trauzir sombra ??? #~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n" #~ msgstr "" @@ -7503,9 +7633,6 @@ #~ msgid "can't lock keyring `%': %s\n" #~ msgstr "impossível bloquear chaveiro `%': %s\n" -#~ msgid "error writing keyring `%': %s\n" -#~ msgstr "erro na escrita do chaveiro `%': %s\n" - #~ msgid "writing keyblock\n" #~ msgstr "escrevendo bloco de chaves\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/pt.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/pt.gmo differ diff -Nru gnupg-1.4.9/po/pt.po gnupg-1.4.10/po/pt.po --- gnupg-1.4.9/po/pt.po 2008-03-25 08:53:11.000000000 +0000 +++ gnupg-1.4.10/po/pt.po 2009-09-02 17:19:40.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -41,13 +41,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "a escrever chave privada para `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "impossível abrir `%s': %s\n" @@ -80,9 +79,10 @@ msgid "note: random_seed file not updated\n" msgstr "nota: ficheiro random_seed não actualizado\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar `%s': %s\n" @@ -133,176 +133,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "partes da chave secreta não disponíveis\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "motivo da revocação: " + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "erro na criação da frase secreta: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "erro na leitura do bloco de chave: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: erro ao ler registo livre: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "%s' já comprimido\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "gerar um novo par de chaves" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "gerar um novo par de chaves" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "assinatura %s de: \"%s\"\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenhum dado OpenPGP válido encontrado.\n" @@ -389,176 +433,238 @@ "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs " "foi usado\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "chave secreta não disponível" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, 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:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Este comando não é permitido no modo %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Opção? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Nenhum motivo especificado" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "não processado" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "a escrever chave pública para `%s'\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "erro ao criar porta-chaves `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "erro ao criar `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "preferências actualizadas" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, 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:814 +#: g10/card-util.c:1019 #, 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:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "mostra impressão digital" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Qual o tamanho de chave desejado? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Qual o tamanho de chave desejado? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Qual o tamanho de chave desejado? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "arredondado para %u bits\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "erro na leitura do bloco de chave secreto `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ignorado: a chave secreta já está presente\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -566,192 +672,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, fuzzy msgid "Please select where to store the key:\n" msgstr "motivo da revocação: " -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "erro na escrita do porta-chaves `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "comandos em conflito\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "chave secreta não disponível" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Repita a frase secreta: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" @@ -760,13 +875,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output não funciona para este comando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -871,7 +986,7 @@ msgstr "" "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" @@ -1271,7 +1386,7 @@ msgid "Pubkey: " msgstr "Chave pública: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cifra: " @@ -1279,7 +1394,7 @@ msgid "Hash: " msgstr "Dispersão: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compressão: " @@ -1416,415 +1531,415 @@ 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/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opções `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "opções de exportação inválidas\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opções de importação inválidas\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opções de exportação inválidas\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "opções de importação inválidas\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "a URL de política de assinatura dada é inválida\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "opções de exportação inválidas\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, 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/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrepõe %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "o gpg-agent não está disponível nesta sessão\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado é inválido\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 #, 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/gpg.c:3129 +#: g10/gpg.c:3128 #, 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferências por omissão inválidas\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferências pessoais de cifra inválidas\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferências pessoais de 'digest' inválidas\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferências pessoais de compressão inválidas\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifragem falhou: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispersão inválido `%s'\n" @@ -1870,17 +1985,17 @@ 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:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %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:2667 +#: g10/getkey.c:2703 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -1912,7 +2027,7 @@ #: g10/gpgv.c:102 msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" @@ -2707,12 +2822,12 @@ msgid "keyring `%s' created\n" msgstr "porta-chaves `%s' criado\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "erro ao criar `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "falha ao criar 'cache' do porta-chaves: %s\n" @@ -2761,7 +2876,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d IDs de utilizadores sem auto-assinaturas válidas detectados\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2774,12 +2889,12 @@ "(vendo passaportes, verificando impressões digitais...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Confio moderadamente\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Confio plenamente\n" @@ -3018,8 +3133,8 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -3028,20 +3143,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Componentes secretas da chave primária não disponíveis.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Componentes secretas da chave primária não disponíveis.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "A chave é protegida.\n" @@ -3058,7 +3173,7 @@ "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" @@ -3404,117 +3519,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Realmente actualizar as preferências?" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gravar alterações? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem gravar? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "actualização falhou: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma actualização é necessária.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "'Digest': " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notação: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Esta chave pode ser revogada pela chave %s " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr " (sensível)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Esta chave foi desactivada" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3522,25 +3637,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3549,76 +3664,76 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Apagar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Apagar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Apagar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "armadura inválida" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Utilizador \"%s\" está revocado." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Utilizador \"%s\" está revocado." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Utilizador \"%s\" está revocado." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3627,266 +3742,272 @@ "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:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Insira o ID de utilizador do revogador escolhido: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 #, 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as selecções das chaves secretas.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Por favor seleccione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "A modificar a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Modificar a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Seleccione exactamente um identificador de utilizador.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, 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:4139 +#: g10/keyedit.c:4147 #, 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:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notação de assinatura: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Escrever por cima (s/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de utilizador: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (não-exportável)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " assinado por %08lX em %s%s\n" + +#: g10/keyedit.c:4716 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (não-exportável)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente criar os certificados de revogação? (s/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "preferência %c%lu duplicada\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "demasiadas preferências `%c'\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "demasiadas preferências `%c'\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "demasiadas preferências `%c'\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "caracter inválido na cadeia de caractéres da preferência\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "a escrever a assinatura directa\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "a escrever a auto-assinatura\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "a escrever a assinatura ligada a uma chave\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamanho de chave inválido; a utilizar %u bits\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamanho da chave arredondado para %u bits\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "cifrar dados" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3899,109 +4020,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (apenas cifragem)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA e ElGamal (por omissão)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA e ElGamal (por omissão)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (apenas cifragem)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (apenas assinatura)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas cifragem)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (apenas assinatura)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "O par de chaves DSA terá 1024 bits.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Qual o tamanho de chave desejado? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Qual o tamanho de chave desejado? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "arredondado para %u bits\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4017,7 +4133,7 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4033,40 +4149,40 @@ " m = assinatura expira em n meses\n" " y = assinatura expira em n anos\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "A assinatura é valida por? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "A %s não expira nunca\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "A %s não expira nunca\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "%s expira em %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4074,12 +4190,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4097,44 +4213,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caracter inválido no nome\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 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:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Endereço de correio eletrónico: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Endereço eletrónico inválido\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Caracter inválido no comentário\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4145,7 +4261,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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 " @@ -4162,23 +4278,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Por favor corrija primeiro o erro\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4186,12 +4302,12 @@ "Você precisa de uma frase secreta para proteger a sua chave.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4203,7 +4319,7 @@ "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4215,50 +4331,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "a escrever chave pública para `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4267,12 +4383,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4280,7 +4396,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4288,26 +4404,26 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Realmente criar? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossível criar `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chave secreta %08lX expirou em %s\n" @@ -4340,254 +4456,254 @@ msgid "Keyring" msgstr "Porta-chaves" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Impressão da chave =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: existem 2 ficheiros com informações confidenciais.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o não modificado\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Por favor conserte esta possível falha de segurança\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "a verificar o porta chaves `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu chave verificadas (%lu assinaturas)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu chave verificadas (%lu assinaturas)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: porta-chaves criado\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "a URL de política de assinatura dada é inválida\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opções de exportação inválidas\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "assinado com a sua chave %08lX em %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, 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:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "opções de exportação inválidas\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" @@ -4743,65 +4859,65 @@ msgid "[uncertain]" msgstr "[incerto]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " ou \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "assinatura %s de: \"%s\"\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 #, fuzzy msgid "unknown" msgstr "versão desconhecida" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossível verificar assinatura: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "não é uma assinatura separada\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "AVISO: várias assinaturas detectadas. Apenas a primeira será verificada.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura de classe 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" @@ -4842,63 +4958,68 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "assinatura %s de: \"%s\"\n" -#: g10/misc.c:353 +#: g10/misc.c:458 +msgid "the IDEA cipher plugin is not present\n" +msgstr "o 'plugin' com a cifra IDEA não está presente\n" + +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 +#, fuzzy, c-format +msgid "please see %s for more information\n" +msgstr " i = mostrar mais informações\n" + +#: g10/misc.c:475 #, fuzzy, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" "forçar o algoritmo de 'digest' %s (%d) viola as preferências do " "destinatário\n" -#: g10/misc.c:459 -msgid "the IDEA cipher plugin is not present\n" -msgstr "o 'plugin' com a cifra IDEA não está presente\n" - -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:491 #, fuzzy, c-format -msgid "please see %s for more information\n" -msgstr " i = mostrar mais informações\n" +msgid "NOTE: This feature is not available in %s\n" +msgstr "o gpg-agent não está disponível nesta sessão\n" -#: g10/misc.c:693 +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opção depreciada \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: \"%s\" é uma opção depreciada\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "por favor utilize \"%s%s\" em vez dela\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVISO: \"%s\" é uma opção depreciada\n" -#: g10/misc.c:719 +#: g10/misc.c:774 #, fuzzy msgid "Uncompressed" msgstr "não processado" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "não processado" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "esta mensagem poderá não ser utilizável pelo %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "destinatário por omissão desconhecido `%s'\n" @@ -4951,11 +5072,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "impossível manipular algoritmo de chave pública %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" @@ -5045,7 +5166,7 @@ msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5054,61 +5175,61 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "" -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "%s: não é um base de dados de confiança\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 #, fuzzy msgid "Is this photo correct (y/N/q)? " msgstr "Está correto (s/n)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 #, fuzzy msgid "unable to display photo ID!\n" msgstr "não foi possível alterar o exec-path para %s\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nenhum motivo especificado" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "A chave foi substituída" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "A chave foi comprometida" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "A chave já não é utilizada" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "O identificador do utilizador já não é válido" @@ -5131,89 +5252,89 @@ "Nenhum valor de confiança designado para:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " ou \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Não sei\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Eu NÃO confio\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Confio de forma total\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = voltar ao menu principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = saltar esta chave\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " q = sair\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Decisão? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Tem a certeza que quer confiar totalmente nesta chave?" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Esta chave provavelmente pertence ao dono\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Esta chave pertence-nos\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5225,113 +5346,113 @@ "sim à próxima pergunta\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Usar esta chave de qualquer modo? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVISO: A utilizar uma chave que não é de confiança!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 #, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não " "presente.\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 #, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, fuzzy msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a assinatura é falsificada.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Nota: Esta chave foi desactivada.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Nota: Esta chave expirou!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Não há indicação de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVISO: Nós NÃO confiamos nesta chave!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " A assinatura é provavelmente uma FALSIFICAÇÃO.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVISO: Esta chave não está certificada com assinaturas suficientemente\n" " confiáveis!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Não se tem certeza de que a assinatura pertence ao dono.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: ignorado: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: ignorado: a chave pública já está presente\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Não especificou um identificador de utilizador. (pode usar \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5339,33 +5460,33 @@ "\n" "Insira o identificador do utilizador. Termine com uma linha vazia: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Identificador de utilizador inexistente.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "ignorado: chave pública já colocada como destinatário por omissão\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "A chave pública está desativada.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "ignorado: a chave pública já está presente\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinatário por omissão desconhecido `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: ignorado: a chave pública está desactivada\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "nenhum endereço válido\n" @@ -5432,7 +5553,7 @@ msgstr "NOTA: a chave foi revogada" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, fuzzy, c-format msgid "build_packet failed: %s\n" msgstr "actualização falhou: %s\n" @@ -5455,11 +5576,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, fuzzy, c-format msgid "make_keysig_packet failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" @@ -5479,31 +5600,31 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, fuzzy, c-format msgid "no corresponding public key: %s\n" msgstr "a escrever chave pública para `%s'\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 #, fuzzy msgid "unknown protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/revoke.c:541 +#: g10/revoke.c:539 #, fuzzy msgid "NOTE: This key is not protected!\n" msgstr "Esta chave não é protegida.\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5514,37 +5635,37 @@ "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:633 +#: g10/revoke.c:631 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "motivo da revocação: " -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:686 +#: g10/revoke.c:684 #, fuzzy msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "\n" "Insira o identificador do utilizador. Termine com uma linha vazia: " -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "motivo da revocação: " -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Usar esta chave de qualquer modo? " @@ -5621,17 +5742,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "a chave pública %08lX é %lu segundo mais nova que a assinatura\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "a chave pública %08lX é %lu segundos mais nova que a assinatura\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5639,7 +5760,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5647,24 +5768,24 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTA: chave de assinatura %08lx expirou %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "assumindo assinatura incorrecta na chave %08lX devido a um bit crítico " "desconhecido\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "chave %08lX: sem subchave para o pacote revocação de subchave\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" @@ -5805,12 +5926,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "base de dados de confiança: sincronização falhou: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "base de dados de confiança rec %lu: lseek falhou: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "base de dados de confiança rec %lu: escrita falhou (n=%d): %s\n" @@ -5854,86 +5975,85 @@ msgid "%s: trustdb created\n" msgstr "%s: base de dados de confiança criada\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: não é possível escrever na trustdb\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de dados de confiança inválida\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: falha ao criar tabela de dispersão: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erro a actualizar registo de versão: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erro ao ler registo de versão: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erro ao escrever registo de versão: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de dados de confiança: lseek falhou: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: não é um base de dados de confiança\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registo de versão com recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro ao ler registo livre: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro ao escrever registo de diretório: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: falha ao zerar um registo: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: falha ao anexar um registo: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"A base de dados de confiança está danificada; por favor execute\n" -"\"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: base de dados de confiança criada\n" #: g10/textfilter.c:147 #, c-format @@ -5982,132 +6102,140 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "registo de confiança %lu não é do tipo pedido %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "expire" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública %08lX não encontrada: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "a verificar a base de dados de confiança\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 #, 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:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6369,48 +6497,48 @@ msgstr "você encontrou um bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 #, fuzzy msgid "yes" msgstr "sim" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "sS" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "não" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "sair" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6432,6 +6560,15 @@ msgstr "(você pode ter usado o programa errado para esta tarefa)\n" #, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "O par de chaves DSA terá 1024 bits.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "A base de dados de confiança está danificada; por favor execute\n" +#~ "\"gpg --fix-trustdb\".\n" + +#, fuzzy #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" @@ -6852,10 +6989,6 @@ #~ "\"\n" #~ "assinada localmente com a sua chave %08lX em %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " assinado por %08lX em %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: impossível aceder: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/ro.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/ro.gmo differ diff -Nru gnupg-1.4.9/po/ro.po gnupg-1.4.10/po/ro.po --- gnupg-1.4.9/po/ro.po 2008-03-25 08:53:11.000000000 +0000 +++ gnupg-1.4.10/po/ro.po 2009-09-02 17:19:41.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -42,13 +42,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "scriu cheia secretã în `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "nu pot deschide `%s': %s\n" @@ -82,9 +81,10 @@ msgid "note: random_seed file not updated\n" msgstr "notã: fiºierul random_seed nu a fost actualizat\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "nu pot crea `%s': %s\n" @@ -140,172 +140,218 @@ "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:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "am eºuat sã stochez amprenta: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "am eºuat sã stochez data creãrii: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "citirea cheii publice a eºuat: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "rãspunsul nu conþine datele cheii publice\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "rãspunsul nu conþine modulul RSA\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "rãspunsul nu conþine exponentul public RSA\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "apelul PIN a returnat eroare: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimã este %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "verificarea CHV%d a eºuat: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "accesul la comenzile de administrare nu este configuratã\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "eroare la recuperarea stãrii CHV de pe card\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "cardul este încuiat permanent!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d încercãri PIN Admin rãmase înainte de a încuia cardul permanent\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|PIN Admin" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "accesul la comenzile de administrare nu este configuratã\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "pãrþi ale cheii secrete nu sunt disponibile\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Vã rugãm selectaþi motivul pentru revocare:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimã este %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|PIN Admin Nou" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|PIN Nou" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "eroare la obþinere noului PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "eroare la citirea datelor aplicaþiei\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "eroare la citirea amprentei DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "cheia existã deja\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "cheia existentã va fi înlocuitã\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "generez o nouã cheie\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "generez o nouã cheie\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "timestamp-ul de creare lipseºte\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "modulus-ul RSA lipseºte sau nu are %d biþi\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, fuzzy, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "exponentul public RSA lipseºte sau are mai mult de %d biþi\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "prime-ul RSA %s lipseºte sau nu are %d biþi\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "am eºuat sã stochez cheia: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "vã rugãm aºteptaþi câtã vreme este creatã noua cheie ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "generarea cheii a eºuat\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "generarea cheii este completã (%d secunde)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "structurã invalidã a cardului OpenPGP (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "semnãturã %s, algoritm rezumat %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "semnãturi create pânã acum: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Vã rugãm introduceþi PIN%%0A[semnãturi fãcute: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "verificarea PIN-ului Admin este deocamdatã interzisã prin aceastã comandã\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nu pot accesa %s - card OpenPGP invalid?\n" @@ -390,163 +436,225 @@ "caracter printabil în ghilimele în armurã - probabil a fost folosit un MTA " "cu bug-uri\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "cardul OpenPGP nu e disponibil: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "cardul OpenPGP nr. %s detectat\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "nu pot face acest lucru în modul batch\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Aceastã comandã nu este permisã în modul %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Selecþia d-voastrã? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[nesetat(ã)]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "masculin" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "feminin" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "nespecificat(ã)" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "neforþat(ã)" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "forþat(ã)" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Eroare: Deocamdatã sunt permise numai caractere ASCII.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Eroare: Spaþiile duble nu sunt permise.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Numele de familie al proprietarului cardului: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Prenumele proprietarului cardului: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL pentru a aduce cheia publicã: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Eroare: URL prea lung (limita este de %d caractere).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "eroare la crearea inelului de chei `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "eroare la citire `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "eroare la creearea `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Date login (nume cont): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Date DO personale: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Preferinþe limbã: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Eroare: lungime invalidã pentru ºir preferinþe.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Eroare: caractere invalide în ºir preferinþe.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Sex ((M)asculin, (F)eminin sau spaþiu): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Eroare: rãspuns invalid.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "Amprenta CA: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Eroare: amprentã formatatã invalid.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "operaþia pe cheie nu e posibilã: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "nu este un card OpenPGP" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "eroare la obþinerea informaþiei pentru cheia curentã: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Înlocuiesc cheia existentã? (d/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Ce lungime de cheie doriþi? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Ce lungime de cheie doriþi? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Ce lungime de cheie doriþi? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rotunjitã prin adaos la %u biþi\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "dimensiunile cheii %s trebuie sã fie în intervalul %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "eroare la citire keyblock secret \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Creez copie de rezervã a cheii de cifrare în afara cardului? (d/N) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "cheia secretã deja stocatã pe un card\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Înlocuiesc cheile existente? (d/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -557,140 +665,149 @@ " PIN = `%s' PIN Admin = `%s'\n" "Ar trebui sã le schimbaþi folosind comanda --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Vã rugãm selectaþi tipul de cheie de generat:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Cheie de semnare\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Cheie de cifrare\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Cheie de autentificare\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Selecþie invalidã.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Vã rugãm selectaþi unde sã fie stocatã cheia:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "algoritm de protecþie a cheii necunoscut\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "pãrþi secrete ale cheii nu sunt disponibile\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "cheia secretã deja stocatã pe un card\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "eroare la scrierea inelului de chei `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ieºi din acest meniu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "aratã comenzi administrare" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "afiºeazã acest mesaj" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "afiºeazã toate datele disponibile" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "schimbã numele purtãtorului cardului" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "schimbã URL-ul de unde sã fie adusã cheia" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "adu cheia specificatã de URL-ul de pe card" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "schimbã numele de login" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "schimbã preferinþele de limbã" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "schimbã sexul purtãtorului cardului" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "schimbã o amprentã CA" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "comutã fanionul PIN de forþare a semnãturii" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "genereazã noi chei" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "meniu pentru a schimba sau debloca PIN-ul" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "verificã PIN-ul ºi listeazã toate datele" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Comandã> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Comandã numai-administrare\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Sunt permise comenzi administrare\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Nu sunt permise comenzi administrare\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Comandã invalidã (încercaþi \"ajutor\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "cheia secretã nu e disponibilã" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Vã rugãm introduceþi cardul ºi apãsaþi return sau apãsaþi 'c' pentru a " "renunþa: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "stergere keyblock a eºuat: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -699,36 +816,36 @@ "Vã rugãm scoateþi cardul curent ºi introducaþi unul cu numãr de serie:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Apãsaþi return când sunteþi gata sau apãsaþi 'c' pentru a renunþa: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Introduceþi noul PIN Admin: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "introduceþi noul PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Introduceþi PIN Admin: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Introduceþi PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Repetaþi acest PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN-ul nu a fost repetat corect; mai încercaþi o datã" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "nu pot deschide `%s'\n" @@ -737,13 +854,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output nu merge pentru aceastã comandã\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "cheia \"%s\" nu a fost gãsitã: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -847,7 +964,7 @@ msgid "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:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" @@ -1242,7 +1359,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Cifru: " @@ -1250,7 +1367,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Compresie: " @@ -1403,411 +1520,411 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTÃ: fisier opþiuni implicite vechi `%s' ignorat\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTÃ: nici un fiºier opþiuni implicit `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "fiºier opþiuni `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "citesc opþiuni din `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' nu este expirare de semnãturã validã\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' nu este un set de carectere valid\n" # -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "nu am putut interpreta URL-ul serverului de chei\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opþiuni server de chei invalide\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "opþiuni server de chei invalide\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "opþiuni import invalide\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "opþiuni export invalide\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opþiuni enumerare invalide\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "opþiuni enumerare invalide\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "`%s' nu este expirare de semnãturã validã\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "URL-ul serverului de chei preferat furnizat este invalid\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "`%s' nu este expirare de semnãturã validã\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "`%s' nu este expirare de semnãturã validã\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opþiuni verificare invalide\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "opþiuni verificare invalide\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nu pot seta cale-execuþie ca %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: opþiuni verificare invalide\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTISMENT: %s înlocuieºte %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s nu este permis cu %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nu are sens cu %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "NOTÃ: %s nu este disponibil în aceastã sesiune\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "nu va rula cu memorie neprotejatã (insecure) pentru cã %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "algoritm rezumat selectat este invalid\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "algoritm compresie selectat este invalid\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritm rezumat certificare selectat este invalid\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed trebuie sã fie mai mare decât 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed trebuie sã fie mai mare decât 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth trebuie sã fie în intervalul de la 1 la 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "preferinþe implicite invalide\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "preferinþe cifrare personale invalide\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "preferinþe rezumat personale invalide\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "preferinþe compresie personale invalide\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s nu merge încã cu %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [nume_fiºier]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [nume_fiºier]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "cifrarea simetricã a lui `%s' a eºuat: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [nume_fiºier]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [nume_fiºier]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "nu puteþi folosi --symmetric --encrypt cu --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nu puteþi folosi --symmetric --encrypt câtã vreme în modul %s\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [nume_fiºier]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [nume_fiºier]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "nu puteþi folosi --symmetric --sign --encrypt cu --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nu puteþi folosi --symmetric --sign --encrypt câtã vreme în modul %s\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nume_fiºier]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [nume_fiºier]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [nume_fiºier]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id-utilizator" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizator" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizator [comenzi]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "trimitere server de chei eºuatã: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepþie server de chei eºuatã: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "export cheie eºuat: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "cãutare server de chei eºuatã: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualizare server de chei eºuatã: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminarea armurii a eºuat: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "punerea armurii a eºuat: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritm hash invalid `%s'\n" @@ -1851,17 +1968,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Cheia invalidã %s fãcutã validã de --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "nici o subcheie secretã pentru subcheia publicã %s - ignoratã\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "folosim subcheia %s în loc de cheia primarã %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "cheia %s: cheie secretã fãrã cheie publicã - sãritã\n" @@ -1887,8 +2004,9 @@ msgstr "Folosire: gpgv [opþiuni] [fiºiere] (-h pentru ajutor)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxã: gpg [opþiuni] [fiºiere]\n" @@ -2699,12 +2817,12 @@ msgid "keyring `%s' created\n" msgstr "inelul de chei `%s' creat\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "resursã keyblock `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "am eºuat sã reconstruiesc cache-ul inelului de chei: %s\n" @@ -2753,7 +2871,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "am gãsit %d ID-uri utilizator fãrã auto-semnãturi valide\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2764,12 +2882,12 @@ "pentru a verifica cheile altor utilizatori (folosind paºapoarte,\n" "verificând amprentele din diferite surse, etc.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Am o încredere marginalã\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Am toatã încrederea\n" @@ -2988,8 +3106,8 @@ msgid "Really sign? (y/N) " msgstr "Doriþi cu adevãrat sã semnaþi? (d/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "semnarea a eºuat: %s\n" @@ -3000,19 +3118,19 @@ "Cheia are numai articole de cheie sau talon (stub) pe card - nici o frazã " "parolã de schimbat.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Aceastã cheie nu este protejatã.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Pãrþile secrete ale cheii primare nu sunt disponibile.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Pãrþi secrete ale cheii primare sunt stacate pe card.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Cheia este protejatã.\n" @@ -3029,7 +3147,7 @@ "Introduceþi noua frazã-parolã pentru acestã cheie secretã.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" @@ -3349,114 +3467,114 @@ msgid "Really update the preferences? (y/N) " msgstr "Doriþi într-adevãr sã actualizaþi preferinþele? (d/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Salvaþi schimbãrile? (d/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Terminaþi fãrã a salva? (d/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "actualizarea a eºuat: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "actualizarea secretului a eºuat: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Rezumat: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Capabilitãþi: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Server de chei no-modify" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Server de chei preferat: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notaþie:" -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Aceastã cheie a fost revocatã pe %s de %s cheia %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Aceastã cheie poate fi revocatã de %s cheia %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr " (senzitiv)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "creatã: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "revocatã: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "expiratã: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "expirã: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "folosire: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "încredere: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "validitate: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Aceastã cheie a fost deactivatã" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "nr-card: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3465,17 +3583,17 @@ "corectã dacã nu reporniþi programul.\n" # -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "revocatã" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "expiratã" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3484,7 +3602,7 @@ " Aceastã comandã poate cauza ca un alt ID utilizator\n" " sã devinã ID-ul utilizator primar presupus.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3493,74 +3611,74 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Am ºters %d semnãturi.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Am ºters %d semnãturi.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Nu am ºters nimic.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "invalid(ã)" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "ID utilizator \"%s\" a fost revocat." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "ID utilizator \"%s\" a fost revocat." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "ID utilizator \"%s\" a fost revocat." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "ID-ul utilizator \"%s\": este deja curat.\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "ID-ul utilizator \"%s\": este deja curat.\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3570,258 +3688,263 @@ " desemnat poate face ca unele versiuni de PGP sã respingã " "cheia.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "aceastã cheie a fost deja desemnatã ca un revocator\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi un revocator " "desemnat? (d/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Vã rugãm selectaþi cel mult o subcheie.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Schimb timpul de expirare pentru o subcheie.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Schimb timpul de expirare pentru cheia primarã.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "AVERTISMENT: subcheia de semnare %s nu este certificatã reciproc (cross-" "certified)\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Vã rugãm selectaþi exact un ID utilizator.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "auto-semnãturã v3 sãritã pentru ID-ul utilizator \"%s\"\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Introduceþi URL-ul serverului de chei preferat: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 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:4139 +#: g10/keyedit.c:4147 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:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Notare semnãturã: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Suprascriu? (d/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Nici un ID utilizator cu indicele %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Nici un ID utilizator cu hash-ul %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Nici o subcheie cu indicele %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "ID utilizator: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "semnatã de cheia d-voastrã %s la %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Aceastã semnãturã a expirat pe %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Aþi semnat aceste ID-uri utilizator pe cheia %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (non-revocabilã)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revocatã de cheia d-voastrã %s pe %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 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:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "nici o cheie secretã\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID-ul utilizator \"%s\" este deja revocat\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Cheia %s este deja revocatã.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Subcheia %s este deja revocatã.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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 %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "preferinþa `%s' duplicatã\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "prea multe preferinþe de cifrare\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "prea multe preferinþe de rezumat\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "prea multe preferinþe de compresie\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "articol invalid `%s' în ºirul de preferinþe\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "scriu semnãturã directã\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "scriu auto semnãturã\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "scriu semnãturã legatã de cheie\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "lungime cheie invalidã; folosesc %u biþi\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "lungime cheie rotunjitã la %u biþi\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Semneazã" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Cifreazã" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autentificã" @@ -3834,109 +3957,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsCcAaTt" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Acþiuni posibile pentru o cheie %s: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Acþiuni permise curent: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Comutã capabilitatea de semnare\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Comutã capabilitatea de cifrare\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Comutã capabilitatea de autentificare\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Terminat\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Selectaþi ce fel de cheie doriþi:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA ºi Elgamal (implicit)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA ºi Elgamal (implicit)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (numai semnare)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (seteazã singur capabilitãþile)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (numai semnare)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (numai cifrare)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (numai semnare)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (numai cifrare)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (seteazã singur capabilitãþile)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (seteazã singur capabilitãþile)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Perechea de chei DSA va avea %u biþi.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (seteazã singur capabilitãþile)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "cheile %s pot avea lungimea între %u ºi %u biþi.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Ce lungime de cheie doriþi? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "dimensiunile cheii %s trebuie sã fie în intervalul %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "Ce lungime de cheie doriþi? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Lungimea cheii necesarã este %u biþi\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "rotunjitã prin adaos la %u biþi\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3952,7 +4070,7 @@ " m = cheia expirã în n luni\n" " y = cheia expirã în n ani\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3968,38 +4086,38 @@ " m = semnãtura expirã în n luni\n" " y = semnãtura expirã în n ani\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Cheia este validã pentru? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Semnãtura este validã pentru? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "valoare invalidã\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Cheia nu expirã deloc\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Semnãtura nu expirã deloc\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Cheia expirã pe %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Semnãtura expirã pe %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4007,11 +4125,11 @@ "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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Este aceasta corect? (d/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4028,44 +4146,44 @@ " \"Popa Ioan (popicã) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Nume real: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Caracter invalid în nume\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Numele nu poate începe cu o cifrã\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Adresã de email: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Nu este o adresã de email validã\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Comentariu: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Caracter invalid în comentariu\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Folosiþi setul de caractere `%s'\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4076,7 +4194,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4091,23 +4209,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoTt" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Vã rugãm corectaþi mai întâi eroarea\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4115,12 +4233,12 @@ "Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4131,7 +4249,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:1935 +#: g10/keygen.c:2033 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" @@ -4143,50 +4261,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:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Generarea cheii a fost anulatã.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "scriu cheia publicã în `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "scriu talonul (stub) cheii secrete în `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "eroare la scrierea inelului de chei public `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "eroare la scrierea inelului de chei secret `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "cheile secretã ºi publicã au fost create ºi semnate.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4196,12 +4314,12 @@ "sã folosiþi comanda \"--edit-key\" pentru a genera o subcheie secundarã\n" "pentru acest scop.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Generarea cheii a eºuat: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4209,7 +4327,7 @@ "cheia a fost creatã %lu secundã în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4217,25 +4335,25 @@ "cheia a fost creatã %lu secunde în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Creaþi într-adevãr? (d/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "stocarea cheii pe card a eºuat: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "nu pot crea fiºier de rezervã `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTÃ: copia de siguranþa a cheii cardului salvatã la `%s'\n" @@ -4268,251 +4386,251 @@ msgid "Keyring" msgstr "Inel de chei" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Amprentã cheie primarã:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Amprentã subcheie:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Amprentã cheie primarã:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Amprentã subcheie:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Amprentã cheie =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Card nr. serie =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "redenumirea `%s' ca `%s' a eºuat: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVERTISMENT: existã 2 fiºiere cu informaþii confidenþiale.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s este cel neschimbat\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s este cel nou\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Vã rugãm reparaþi aceastã deficienþã posibilã de securitate\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "pun în cache inelul de chei `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu chei puse în cache pânã acum (%lu semnãturi)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu chei puse în cache (%lu semnãturi)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: inelul de chei creat\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Introduceþi URL-ul serverului de chei preferat: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "AVERTISMENT: opþiunile serverului de chei `%s' nu sunt folosite pe aceastã " "platformã\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "deactivat(ã)" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Introduceþi numãr/numere, N)ext (urmãtor), sau Q)uit (terminã) > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "protocol server de chei invalid (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "cheia \"%s\" nu a fost gãsitã pe serverul de chei\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "cheia nu a fost gãsitã pe serverul de chei\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "cer cheia %s de la serverul %s %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "cer cheia %s de la %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "caut \"%s\" de pe serverul %s %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "caut \"%s\" de pe %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "trimit cheia %s serverului %s %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "trimit cheia %s lui %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "caut \"%s\" de pe serverul %s %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "caut \"%s\" de pe %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "nici o acþiune pentru serverul de chei!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" "AVERTISMENT: manipulator server de chei dintr-o versiune diferitã de GnuPG (%" "s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "serverul de chei nu a trimis VERSION (versiune)\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "nici un server de chei cunoscut (folosiþi opþiunea --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" "apeluri cãtre server de chei extern nu este suportat de acest program\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "acþiunea `%s' nu este suportatã cu schema serverului de chei `%s'\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s nu suportã versiunea de manipulator (handler) %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "serverul de chei a epuizat timpul de aºteptare (timed out)\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "eroare internã server de chei\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "eroare de comunicare server de chei: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" nu este un ID de cheie: sãrit\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "reactualizez 1 cheie de la %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "reactualizez %d chei de la %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n" @@ -4666,63 +4784,63 @@ msgid "[uncertain]" msgstr "[nesigur]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " aka \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Semnãturã expiratã %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Semnãtura expirã %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "semnãturã %s, algoritm rezumat %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binar" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "modtext" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "necunoscut" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Nu pot verifica semnãtura: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "nu o semnãturã detaºatã\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "AVERTISMENT: am detectat multiple semnãturi. Numai prima va fi verificatã.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "semnãturã de sine stãtãtoare (standalone) de clasã 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "semnãturã de stil vechi (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "pachet root invalid detectat în proc_tree()\n" @@ -4761,60 +4879,65 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = aratã-mi mai multe informaþii\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "NOTÃ: %s nu este disponibil în aceastã sesiune\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opþiune învechitã \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVERTISMENT: \"%s\" este o opþiune învechitã\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "vã rugãm folosiþi \"%s%s\" în loc\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "AVERTISMENT: \"%s\" este o comandã învechitã - nu o folosiþi\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Necompresat" # -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "necompresat|niciunul" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "acest mesaj s-ar putea sã nu poatã fi folosit de %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "opþiune ambiguã `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "opþiune necunoscutã `%s'\n" @@ -4867,13 +4990,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "nu pot mânui algoritmul cu cheie publicã %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "AVERTISMENT: cheie de sesiune cifratã simetric potenþial nesigurã " "(insecure)\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpachetul de tip %d are bitul critic setat\n" @@ -4961,7 +5084,7 @@ msgid "Repeat passphrase: " msgstr "Repetaþi fraza-parolã: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4977,58 +5100,58 @@ "foarte largã!\n" "Încercaþi sã folosiþi o imagine de aproximativ 240x288 pixeli.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Introduceþi nume-fiºier JPEG pentru pozã ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "nu pot deschide fiºierul JPEG `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Acest JPEG este foarte mare (%d octeþi) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã îl folosiþi? (d/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' nu este un fiºier JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Este aceastã pozã corectã (d/N/t)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "nu pot afiºa poza ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Nici un motiv specificat" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Cheia este înlocuitã" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Cheia a fost compromisã" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Cheia nu mai este folositã" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "ID utilizator nu mai este valid" @@ -5048,46 +5171,46 @@ msgid "No trust value assigned to:\n" msgstr "Nici o valoare de încredere atribuitã lui:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " aka \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "Cât de mult credeþi cã aceastã cheie aparþine într-adevãr utilizatorului " "numit?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Nu ºtiu sau nu vreau sã mã pronunþ\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = NU am încredere\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Am încredere supremã\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = înapoi la meniul principal\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = sãri peste cheia asta\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " t = terminã\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5096,42 +5219,42 @@ "Nivelul minim de încredere pentru aceastã cheie este: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Decizia d-voastrã? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "" "Doriþi într-adevãr sã setaþi aceastã cheie cu încredere supremã? (d/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificatele ce conduc la o cheie cu încredere supremã:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Nu existã nici o indicaþie cã aceastã cheie aparþine într-adevãr " "utilizatorului numit\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Nu existã nici o indicaþie cã aceastã cheie aparþine într-adevãr " "utilizatorului numit\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Aceastã cheie aparþine probabil utilizatorului numit\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Aceastã cheie ne aparþine\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5141,111 +5264,111 @@ "utilizator. Dacã ºtiþi *cu adevãrat* ce faceþi, puteþi\n" "rãspunde cu da la urmãtoarea întrebare.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Folosiþi oricum aceastã cheie? (d/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "AVERTISMENT: Folosiþi o cheie fãrã încredere!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "AVERTISMENT: aceastã cheie poate fi revocatã (cheia de revocare nu este " "prezentã)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã de proprietarul ei!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Aceasta ar putea însemna cã semnãtura e falsificatã.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã de proprietarul ei!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Notã: Aceastã cheie a fost deactivatã.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Notã: Aceastã cheie a expirat!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "AVERTISMENT: Aceastã cheie nu este certificatã de o semnãturã de încredere!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Nu existã nici o indicaþie cã semnãtura aparþine proprietarului.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "AVERTISMENT: Noi NU avem încredere în aceastã cheie!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Semnãtura este probabil un FALS.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "AVERTISMENT: Aceastã cheie nu este certificatã cu suficiente semnãturi de " "încredere!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Nu este sigur cã semnãtura aparþine proprietarului.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: sãritã: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: sãritã: cheia publicã este deja prezentã\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Nu aþi specificat un ID utilizator. (puteþi folosi \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Destinatari curenþi:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5253,33 +5376,33 @@ "\n" "Introduceþi ID-ul utilizator. Terminaþi cu o linie nouã: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Nu existã acest ID utilizator.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "sãritã: cheia publicã setatã deja ca destinatar implicit\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Cheia publicã este deactivatã.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "sãritã: cheia publicã setatã deja\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "destinatar implicit necunoscut \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: sãritã: cheia publicã este deactivatã\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "nici un destinatar valid\n" @@ -5349,7 +5472,7 @@ msgstr "NOTÃ: cheia a fost revocatã" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet a eºuat: %s\n" @@ -5371,11 +5494,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Creaþi un certificat de revocare desemnat pentru aceastã cheie? (d/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Ieºire în armurã ASCII forþatã.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet a eºuat: %s\n" @@ -5394,28 +5517,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "nici o cheie publicã corespunzãtoare: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "cheia publicã nu se potriveºte cu cheia secretã!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Creaþi un certificat de revocare pentru aceastã cheie? (d/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "algoritm de protecþie necunoscut\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "NOTÃ: Aceastã cheie nu este protejatã!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5433,33 +5556,33 @@ "caz cã mediumul este deteriorat. Dar fiþi atent: sistemul de tipãrire al\n" "maºinii d-voastrã ar putea pãstra datele ºi sã le facã accesibile altora!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Vã rugãm selectaþi motivul pentru revocare:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Renunþã" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probabil doriþi sã selectaþi %d aici)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Introduceþi o descriere opþionalã; terminaþi cu o linie goalã:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Motiv pentru revocare: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Nici o descriere datã)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Este aceasta OK? (d/N) " @@ -5537,17 +5660,17 @@ "AVERTISMENT: subcheia de semnare %s are o certificare-reciprocã invalidã " "(invalid cross-certification)\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "cheie publicã %s este mai nouã cu %lu secundã decât semnãtura\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "cheie publicã %s este mai nouã cu %lu secunde decât semnãtura\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5555,7 +5678,7 @@ "cheia %s a fost creatã %lu secundã în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5563,24 +5686,24 @@ "cheia %s a fost creatã %lu secunde în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "NOTÃ: cheia semnãturii %s a expirat %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "presupun semnãturã incorectã din cheia %s datoritã unui bit critic " "necunoscut\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "cheia %s: nici o subcheie pentru semnãtura de revocare a subcheii\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "cheia %s: nici o subcheie pentru semnãtura legatã de subcheie\n" @@ -5717,12 +5840,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sincronizarea a eºuat: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek a eºuat: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: scrierea a eºuat (n=%d): %s\n" @@ -5766,84 +5889,85 @@ msgid "%s: trustdb created\n" msgstr "%s: a fost creat trustdb\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "NOTÃ: nu poate fi scris în trustdb\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb invalid\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: am eºuat sã creez hashtable: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: eroare actualizare înregistrare versiune: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: eroare citire înregistrare versiune: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: eroare scriere înregistrare versiune: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek a eºuat: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: citirea a eºuat (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: nu e un fiºier trustdb\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: înregistrare versiune cu recnum %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versiune fiºier invalidã %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: eroare citire înregistrare liberã: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: eroare scriere înregistrare dir: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: eroare setere la zero a înregistrãrii: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: adãugarea unei înregistrãri a eºuat: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: a fost creat trustdb\n" #: g10/textfilter.c:147 #, c-format @@ -5890,129 +6014,137 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "înregistrare încredere %lu nu este de tipul cerut %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" "nu pot folosi model de încredere (%d) - presupun model de încredere %s\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "folosesc model de încredere %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 traducãtor vezi trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[revocatã]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[expiratã] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[necunoscutã]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ nedef ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[marginal]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ deplinã]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ supremã]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "nedefinitã" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "niciodatã" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "deplinã" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "supremã" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "nu e nevoie de o verificare trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "urmãtoarea verificare trustdb programatã pe %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nu e nevoie de o verificare trustdb cu modelul de încredere `%s'\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nu e nevoie de o actualizare trustdb cu modelul de încredere `%s'\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "cheia publicã %s nu a fost gãsitã: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "vã rugãm faceþi un --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "verific trustdb\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "nu am gãsit nici o cheie cu încredere supremã\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "cheia publicã a cheii cu încredere supremã %s nu a fost gãsitã\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" "%d marginal(e) necesare, %d complet(e) necesare, model de încredere %s\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "adânc: %d valid: %3d semnat: %3d încredere: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6273,47 +6405,47 @@ msgstr "aþi gãsit un bug ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "da" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "dD" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nu" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "terminã" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "tT" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "OK|OK" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "renunþã|renunþã" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6334,6 +6466,15 @@ 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 "DSA keypair will have %u bits.\n" +#~ msgstr "Perechea de chei DSA va avea %u biþi.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|PIN Admin" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "nu pot pune date notare în semnãturi v3 (stil PGP 2.x)\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/ru.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/ru.gmo differ diff -Nru gnupg-1.4.9/po/ru.po gnupg-1.4.10/po/ru.po --- gnupg-1.4.9/po/ru.po 2008-03-25 08:53:11.000000000 +0000 +++ gnupg-1.4.10/po/ru.po 2009-09-02 17:19:41.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.4.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2005-06-22 02:53+0200\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -40,13 +40,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "не могу открыть `%s': %s\n" @@ -78,9 +77,10 @@ msgid "note: random_seed file not updated\n" msgstr "замечание: файл random_seed не обновлен\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "не могу Ñоздать `%s': %s\n" @@ -135,173 +135,219 @@ "ÐедоÑтаточно Ñлучайных чиÑел. ВыполнÑйте какие-либо дейÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾,\n" "чтобы ОС могла получить больше Ñлучайных данных! (Ðеобходимо ещё %d байт)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Ñбой ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¿ÐµÑ‡Ð°Ñ‚ÐºÐ°: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "Ñбой ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ñ‚Ñ‹ ÑозданиÑ: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "Ñбой при чтении ключа: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "ответ не Ñодержит данных открытого ключа\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "в ответе отÑутÑтвует модуль RSA\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "в ответе отÑутÑтвует Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð°Ñ ÑкÑпонента RSA\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Введите PIN%%0A[подпиÑей: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Введите PIN%%0A[подпиÑей: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN Ð´Ð»Ñ CHV%d Ñлишком короток, Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "при проверке CHV%d Ñбой: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "доÑтуп к командам ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ наÑтроен\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑтатуÑа CHV Ñ ÐºÐ°Ñ€Ñ‚Ñ‹\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "карта заблокирована!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" "оÑталоÑÑŒ %d попыток ввода админиÑтративного PIN перед блокировкой карты\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|ÐдминиÑтративный PID" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Введите PIN%%0A[подпиÑей: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Введите PIN%%0A[подпиÑей: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "доÑтуп к командам ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ наÑтроен\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "ÑÐµÐºÑ€ÐµÑ‚Ð½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ ключ не доÑтупна\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Укажите причину отзыва:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN Ð´Ð»Ñ CHV%d Ñлишком короток, Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Ðовый админиÑтративный PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Ðовый PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "ошибка при получении нового PIN: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… приложениÑ\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¿ÐµÑ‡Ð°Ñ‚ÐºÐ° DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "ключ уже ÑущеÑтвует\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "ÑущеÑтвующий ключ будет заменен\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ключа\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ключа\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "пропущен штамп ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑозданиÑ\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "Модули RSA пропущены или не имеют размер %d бит\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "отÑутÑтвует Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð°Ñ ÑкÑпонента RSA или превышает %d бит\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "ПроÑтое чиÑло RSA %s пропущено или не имеет размер %d бит\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "Ñбой ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "пожалуйÑта, подождите, пока будет генерироватьÑÑ ÐºÐ»ÑŽÑ‡ ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "Ñбой при генерации ключа\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "ключ Ñгенерирован (%d Ñекунд)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ‚Ð¸Ð¼Ð°Ñ Ñтруктура OpenPGP карты (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s подпиÑÑŒ, Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "подпиÑей Ñоздано: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Введите PIN%%0A[подпиÑей: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "проверка админиÑтративного PIN в данный момент запрещен Ñтой командой\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "нет доÑтупа %s - неработоÑпоÑÐ¾Ð±Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° OpenPGP?\n" @@ -386,163 +432,225 @@ "Ñимволы quoted printable в кодировке ASCII - вероÑтно иÑпользовалÑÑ Ð¿Ð»Ð¾Ñ…Ð¾Ð¹ " "MTA\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "Карта OpenPGP недоÑтупна: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "Обнаружена карта OpenPGP номер %s \n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "невозможно Ñделать Ñто в пакетном режиме\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не допуÑтима в режиме %s.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Ваш выбор (?-подробнее)? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[не уÑтановлено]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "мужÑкой" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "женÑкий" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "не задан" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Ошибка:ДопуÑтим только чиÑтый ASCII.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Ошибка: ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñимвол \"<\"\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Ошибка: Двойные пробелы недопуÑтимы.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° карты:" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Ð˜Ð¼Ñ Ð²Ð»Ð´Ð°ÐµÐ»ÑŒÑ†Ð° карты:" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Ошибка: Скомбинированное Ð¸Ð¼Ñ Ñлишком длинное (предел %d Ñимволов).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "URL Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ключа: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Ошибка: URL Ñлишком длинный (предел - %d Ñимволов).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ ключей `%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ (имÑ):" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Ошибка: Данные учетной запиÑи Ñлишком длинные (предел %d Ñимволов).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Секретные DO данные:" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Ошибка: Секретные DO данные Ñлишком длинные (предел %d Ñимволов).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Предпочитаемый Ñзык: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Ошибка: недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð´Ð»Ð¸Ð½Ð° Ñтроки предпочтений.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Ошибка: недопуÑтимые Ñимволы в Ñтроке предпочтений.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Пол ((M)МужÑкой, (F)ЖенÑкий или пробел): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Ошибка: недопуÑтимый ответ.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "отпечаток CA: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Ошибка: неправильный формат отпечатка.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ невозможна: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "карта не OpenPGP" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "ошибка при Ñчитывании информации ключа: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Заменить ÑущеÑтвующий ключ? (y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Какой размер ключа Вам необходим? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Какой размер ключа Вам необходим? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Какой размер ключа Вам необходим? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "округлен до %u бит\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "размер ключей %s должен быть в пределах %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñекретного блока ключа \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "Ñекретный ключ уже Ñохранен в карте\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Заменить ÑущеÑтвующие ключи? (y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -553,140 +661,149 @@ " PIN = `%s' Admin PIN = `%s'\n" "Ð’Ñ‹ должны изменить их иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Выберите тип Ñоздаваемого ключа:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Ключ подпиÑи\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Ключ шифрованиÑ\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Ключ аутентификации\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ðеправильный выбор.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Выберите, где Ñохранить ключ:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "неизвеÑтный алгоритм защиты ключа\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "Ñекретные чаÑти ключа недоÑтупны\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "Ñекретный ключ уже Ñохранен в карте\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "ошибка запиÑи таблицы ключей `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "выйти из Ñтого меню" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "показать управлÑющие команды" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "показать данную Ñправку" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "вывеÑти вÑе доÑтупные данные" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "изменить Ð¸Ð¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð° карты" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "изменить URL Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "запроÑить ключ, указанный по заданному картой URL" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "изменить учетное имÑ" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "изменить Ñзыковые предпочтениÑ" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "изменение пола владельца карты" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "Ñменить отпечаток CA" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 #, fuzzy msgid "toggle the signature force PIN flag" msgstr "переключение флага force PIN" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "Ñгенерировать новые ключи" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "меню Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ разблокировки PIN" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 #, fuzzy msgid "verify the PIN and list all data" msgstr "проверить PIN и показать вÑе данные" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Команда> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Команды админиÑтратора\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Команды админиÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Команды админиÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ разрешены\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (ÑпиÑок команд: \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "Ñекретный ключ не найден" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Ð’Ñтавьте карту и нажмите Enter или введите 'c' Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "Ñбой при удалении блока ключа: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -695,36 +812,36 @@ "Извлеките текущую карту и вÑтавьте карту Ñ Ñерийным номером:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Ðажмите Enter, когда будете готовы или введите 'c' Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Введите новый Admin PIN: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Введите новый PIN: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Введите Admin PIN: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Введите PIN: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Повторите ввод PIN: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "повторный ввод PIN некорректен; попробуйте еще раз" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "не могу открыть `%s'\n" @@ -733,13 +850,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output не работает Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "ключ \"%s\" не найден: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -836,7 +953,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "иÑпользование шифра %s (%d) противоречит предпочтениÑм получателÑ\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" @@ -1229,7 +1346,7 @@ msgid "Pubkey: " msgstr "С открытым ключом: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Симметричные шифры: " @@ -1237,7 +1354,7 @@ msgid "Hash: " msgstr "Ð¥Ñш-функции: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Ðлгоритмы ÑжатиÑ: " @@ -1383,411 +1500,411 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "ЗÐМЕЧÐÐИЕ: Ñтарый файл конфигурации по умолчанию `%s' проигнорирован\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ЗÐМЕЧÐÐИЕ: файл конфигурации `%s' не обнаружен\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "файл конфигурации `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "параметры конфигурации взÑÑ‚Ñ‹ из файла `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ЗÐМЕЧÐÐИЕ: %s не предназначен Ð´Ð»Ñ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ применениÑ!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "раÑширение шифра `%s' не загружено вÑледÑтвие небезопаÑных прав доÑтупа\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' недопуÑтимый Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "не могу проанализировать URL Ñервера ключей\n" # test it -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: недопуÑтимые параметры Ð´Ð»Ñ Ñервера ключей\n" # test it -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "недопуÑтимые параметры Ð´Ð»Ñ Ñервера ключей\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: недопуÑтимый ÑпиÑок параметров\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "недопуÑтимый ÑпиÑок параметров\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "`%s' недопуÑтимый Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "заданный URL предпочитаемого Ñервера ключей неправилен\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "`%s' недопуÑтимый Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "`%s' недопуÑтимый Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" # test it -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: недопуÑтимые параметры проверки \n" # test it -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "недопуÑтимые параметры проверки\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "не могу определить путь запуÑка Ð´Ð»Ñ %s\n" # test it -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: недопуÑтимые параметры проверки \n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "Ð’ÐИМÐÐИЕ: возможно Ñоздание файла дампа памÑти!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "Ð’ÐИМÐÐИЕ: %s замеÑтит %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s не допуÑкаетÑÑ Ð¸Ñпользовать Ñ %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s не имеет ÑмыÑла ÑовмеÑтно Ñ %s!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "ПРЕДУПРЕЖДÐЮ: %s недоÑтупен в данной верÑии\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "не будет работать Ñ Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°Ñной памÑтью из-за %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "можно Ñделать только отделенную или прозрачную подпиÑÑŒ в режиме --pgp2\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Ð’Ñ‹ не можете одновременно подпиÑать и зашифровать в режиме --pgp2\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Ð’Ñ‹ должны иÑпользовать файлы (а не каналы (pipe)) в режиме --pgp2.\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Ð´Ð»Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² режиме --pgp2 требуетÑÑ ÑˆÐ¸Ñ„Ñ€ IDEA\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-функциÑ\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "выбран неверный алгоритм ÑжатиÑ\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð´Ð»Ñ Ñертификации\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "недопуÑтимый default-cert-level; должен быть 0, 1, 2 или 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "недопуÑтимый min-cert-level; должен быть 0, 1, 2 или 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ЗÐМЕЧÐÐИЕ: проÑтой режим S2K (0) Ñтрого не рекомендуетÑÑ\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопуÑтимый режим S2K; должно быть 0, 1 или 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "недопуÑтимые Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð°\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ…Ñш-функции\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð°Ð»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼Ð¾Ð² ÑжатиÑ\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s пока не работает ÑовмеÑтно Ñ %s!\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать шифрование `%s' в режиме %s\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñ…Ñш-функцию `%s' в режиме %s\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñжатие `%s' в режиме %s\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Ð’ÐИМÐÐИЕ: получатели (-r) заданы без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ " "ключом\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Ñимметричное шифрование `%s' не удалоÑÑŒ: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [имÑфайла]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --symmetric --encrypt ÑовмеÑтно Ñ --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "невозможно иÑпользовать --symmetric --encrypt в режиме %s\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [имÑфайла]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --symmetric --sign --encrypt ÑовмеÑтно Ñ --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "невозможно иÑпользовать --symmetric --sign --encrypt в режиме %s\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "Ñбой при отправке на Ñервер ключей: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Ñбой при получении Ñ Ñервера ключей: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "Ñбой при ÑкÑпорте ключа: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "Ñбой при поиÑке на Ñервере ключей: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Ñбой при обновлении Ñ Ñервера ключей: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· ASCII формата: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² ASCII формат: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s'\n" @@ -1833,17 +1950,17 @@ "Дефектный ключ %s признан пригодным ÑоглаÑно параметра --allow-non-" "selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "нет Ñекретного подключа Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ подключа %s - игнорируем\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "иÑпользую подклключ %s вмеÑто главного ключа %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "ключ %s: Ñекретный ключ без открытого ключа - пропущен\n" @@ -1869,8 +1986,9 @@ msgstr "ИÑпользовать: gpgv [параметры] [файлы] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "СинтакÑиÑ: gpg [параметры] [файлы]\n" @@ -2670,12 +2788,12 @@ msgid "keyring `%s' created\n" msgstr "Ñоздана таблица ключей `%s'\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Ñбой переÑтройки кÑша таблицы ключей: %s\n" @@ -2724,7 +2842,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "обнаружено %d User ID без дейÑтвительной ÑамоподпиÑи\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2736,12 +2854,12 @@ "ПроверÑет паÑпорт, ÑверÑет отпечатки ключей и Ñ‚.п.?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = ДоверÑÑŽ ограниченно\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = ПолноÑтью доверÑÑŽ\n" @@ -2959,8 +3077,8 @@ msgid "Really sign? (y/N) " msgstr "ДейÑтвительно подпиÑать? (y/N)" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "не удалоÑÑŒ подпиÑать: %s\n" @@ -2969,19 +3087,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Данный ключ не защищен.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ главного ключа отÑутÑтвует.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ главного ключа Ñохранена на карте.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Ключ защищен.\n" @@ -2998,7 +3116,7 @@ "Введите новый пароль Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñекретного ключа.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "повторный ввод Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚ÐµÐ½; попробуйте еще раз" @@ -3311,46 +3429,46 @@ msgid "Really update the preferences? (y/N) " msgstr "ДейÑтвительно обновить предпочтениÑ? (y/N)" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Сохранить изменениÑ? (y/N)" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Выйти без ÑохранениÑ? (y/N)" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "Ñбой при обновлении: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "Ñбой при обновлений Ñекретного ключа: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "ключ не изменÑлÑÑ - обновление не нужно.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Ð¥Ñш-функции: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Опции: " # check it -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Предпочитаемый Ñервер ключей: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "" @@ -3358,71 +3476,71 @@ "Параметры:\n" " " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Ðе может быть предпочтений в PGP 2.x-Ñтиле User ID.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Данный ключ был отозван %s - %s ключом %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Данный ключ может быть отозван %s ключом %s " -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "Ñоздан: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "отозван: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "проÑрочен Ñ: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "годен до: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "применÑемоÑÑ‚ÑŒ: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "доверие: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "доÑтоверноÑÑ‚ÑŒ: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Данный ключ отключен" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3430,18 +3548,18 @@ "Учтите, что показанные Ñтепени доÑтоверноÑти могут быть неверными,\n" "пока Ð’Ñ‹ не перезапуÑтите программу.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "отозван" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "проÑрочен Ñ" # check it -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3449,7 +3567,7 @@ "Ð’ÐИМÐÐИЕ: нет User ID помеченного как главный. This command may\n" " cause a different user ID to become the assumed primary.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3458,74 +3576,74 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP2. Добавление фото ID может в некоторых верÑиÑÑ…\n" " PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите добавить Ñто? (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ð’Ñ‹ не можете добавить фото ID в ключ PGP2-типа.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Удалить данную дейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Удалить данную недейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Удалить данную неизвеÑтную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "ДейÑтвительно удалить данную ÑамоподпиÑÑŒ? (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Удалена %d подпиÑÑŒ.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Удалено %d подпиÑи.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Ðичего не удалено.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "недопуÑтимый" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "User ID \"%s\" уже очищен\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "ключ %s: \"%s\" %d подпиÑÑŒ очищена\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "ключ %s: \"%s\" %d очищеных подпиÑей\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "User ID \"%s\" уже очищен\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "User ID \"%s\" уже очищен\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3534,253 +3652,258 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n" " может в некоторых верÑиÑÑ… PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ð’Ñ‹ не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Укажите User ID ключа, назначенного отзывающим: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ ключ PGP 2.x отзывающим\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "ключ не может быть назначен отзывающим Ñам ÑебÑ\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "Ñтот ключ уже назначен отзывающим\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Ð’ÐИМÐÐИЕ: назначение ключа отзывающим невозможно будет отменить!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите назначить данный ключ отзывающим? (y/N)" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Снимите выделение Ñ Ñекретного ключа.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Выделите не менее одного подключа.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Смена Ñрока дейÑтвительноÑти подключа.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ключа\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "Ð’Ñ‹ не можете изменить Ñрок дейÑÑ‚Ð²Ð¸Ñ v3 ключа\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Ðет ÑоответÑтвующей подпиÑи в ÑвÑзке Ñекретных\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "" "Ð’ÐИМÐÐИЕ: подпиÑываемый подключ %s не имеет перекреÑтной Ñертификации\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Выберите только один User ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "пропуÑк v3 ÑамоподпиÑи на User ID \"%s\"\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Введите URL предпочтаемого Ñервера ключей: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите заменить его? (y/N)" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить его? (y/N)" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Примечание к подпиÑи" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "ПерезапиÑать (y/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Ðет User ID Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Ðет User ID Ñ Ñ…ÐµÑˆÐµÐ¼ %s\n" # c-format -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Ðет подключа Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "User ID: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "подпиÑано Вашим ключом %s от %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Срок дейÑтвительноÑти подпиÑи закончилÑÑ %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите отозвать? (y/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Создать Ñертификат отзыва Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ подпиÑи? (y/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ð’Ñ‹ подпиÑали данные User ID на ключе %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (не отзываемаÑ)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "отзыв Вашим ключом %s от %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Ð’Ñ‹ отзываете Ñледующие подпиÑи:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "ДейÑтвительно Ñоздать Ñертификат отзыва? (y/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "нет Ñекретного ключа\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" уже отозван\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "Ð’ÐИМÐÐИЕ: User ID подпиÑÑŒ датирована %d Ñекундами в будущем\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Ключ %s уже отозван\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Подключ %s уже отозван\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Показ %s фото ID размера %ld Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "предпочтение `%s' дублируетÑÑ\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "Ñлишком много предпочтений Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð°\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "Ñлишком много предпочтений Ð´Ð»Ñ Ñ…Ñш-функций\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "Ñлишком много предпочтений Ð´Ð»Ñ Ð¼ÐµÑ‚Ð¾Ð´Ð¾Ð² ÑжатиÑ\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "недопуÑтимое вхождение `%s' в Ñтроке предпочтений\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "writing direct signature\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "ÑохранÑем ÑамоподпиÑÑŒ\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "ÑохранÑем объединÑющую подпиÑÑŒ\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "неверный размер ключа; иÑпользуетÑÑ %u бит\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "размер ключа приведен к %u битам\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3793,109 +3916,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Возможные дейÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %s:" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "ДопуÑтимы дейÑтвиÑ:" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Переключить возможноÑÑ‚ÑŒ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Переключить возможноÑÑ‚ÑŒ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Переключить возможноÑÑ‚ÑŒ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Завершено\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Выберите тип ключа:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA и ElGamal (по умолчанию)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA и ElGamal (по умолчанию)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (только Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¼Ð¸ возможноÑÑ‚Ñми)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (только Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (только Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¼Ð¸ возможноÑÑ‚Ñми)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¼Ð¸ возможноÑÑ‚Ñми)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Пара ключей DSA будет иметь длину %u бит.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¼Ð¸ возможноÑÑ‚Ñми)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "ключи %s могут иметь длину от %u до %u бит.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Какой размер ключа Вам необходим? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "размер ключей %s должен быть в пределах %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "Какой размер ключа Вам необходим? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Запрашиваемый размер ключа %u бит\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "округлен до %u бит\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3911,7 +4029,7 @@ " m = Ñрок дейÑтвительноÑти n меÑÑцев\n" " y = Ñрок дейÑтвительноÑти n лет\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3927,38 +4045,38 @@ " m = Ñрок дейÑтвительноÑти подпиÑи n меÑÑцев\n" " y = Ñрок дейÑтвительноÑти подпиÑи n лет\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Ключ дейÑтвителен до? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "ПодпиÑÑŒ дейÑтвительна до? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "недопуÑтимое значение\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Ключ не имеет Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвительноÑти\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "ПодпиÑÑŒ не имеет Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвительноÑти\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Ключ дейÑтвителен до: %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "ПодпиÑÑŒ дейÑтвительна до %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3966,11 +4084,11 @@ "Ваша ÑиÑтема не может корректно отображать даты поÑле 2038.\n" "Однако, корректно обрабатываютÑÑ Ð´Ð°Ñ‚Ñ‹ до 2106.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Ð’Ñе верно? (y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3985,44 +4103,44 @@ " \"Baba Yaga (pensioner) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Ваше наÑтоÑщее имÑ: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "ÐедопуÑтимый Ñимвол в Имени\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно начинатьÑÑ Ñ Ñ†Ð¸Ñ„Ñ€Ñ‹\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно быть короче 5 Ñимволов\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "Email-адреÑ: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Ðеправильный e-mail адреÑ\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Комментарий: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "ÐедопуÑтимый Ñимвол в комментарии\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "ИÑпользуетÑÑ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов: `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4033,7 +4151,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ðе вÑтавлÑйте email-Ð°Ð´Ñ€ÐµÑ Ð² Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ комментарий\n" @@ -4048,24 +4166,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Сменить (N)ИмÑ, (C)Комментарий, (E)email-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ (Q)Выход? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "Сменить (N)ИмÑ, (C)Комментарий, (E)email-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ (O)ПринÑÑ‚ÑŒ/(Q)Выход? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Сначала иÑправьте ошибку\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4073,12 +4191,12 @@ "Ð”Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ Ñекретного ключа необходим пароль.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4090,7 +4208,7 @@ "запуÑтив данную программу Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4102,50 +4220,50 @@ "Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ðº диÑкам) в процеÑÑе генерации; Ñто даÑÑ‚ генератору\n" "Ñлучайных чиÑел возможноÑÑ‚ÑŒ получить лучшую Ñнтропию.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Создание ключа прервано.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "Ñохранение открытого ключа в `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "Ñохранение заглушки Ñекретного ключа в `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "нет доÑтупной Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи таблицы открытых ключей: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "нет доÑтупной Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи таблицы закрытых ключей: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "ошибка запиÑи таблицы открытых ключей `%s': %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "ошибка запиÑи таблицы Ñекретных ключей `%s': %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "открытый и закрытый ключи Ñозданы и подпиÑаны.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4153,45 +4271,45 @@ "Учтите, что данный ключ не может иÑпользоватьÑÑ Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ. Ð’Ñ‹ можете\n" "воÑпользоватьÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ \"--edit-key\" и Ñоздать подключ Ð´Ð»Ñ Ñтих целей.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Сбой при Ñоздании ключа: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, 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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, 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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "ПРЕДУПРЕЖДÐЮ: Ñоздание подключа Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¹ v3 не ÑовмеÑтимо Ñ OpenPGP\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "ДейÑтвительно Ñоздать? (y/N)" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "Ñбой ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð° на карту: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "не могу Ñоздать резервную копию, файл `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "ЗÐМЕТЬТЕ: Ð°Ñ€Ñ…Ð¸Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð° на карте Ñохранена в `%s'\n" @@ -4225,249 +4343,249 @@ msgid "Keyring" msgstr "Таблица ключей" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr " Отпечаток главного ключа:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Отпечаток подключа:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Отпечаток главного ключа:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Отпечаток подключа:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr "Отпечаток ключа =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "при переименовании `%s' в `%s' произошел Ñбой: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Ð’ÐИМÐÐИЕ: СущеÑтвуют 2 файла Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð¹ информацией.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s оÑталоÑÑŒ без изменений\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s новых\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "ИÑправьте Ñту прореху безопаÑноÑти\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "кеширую ÑвÑзки ключей `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu ключей закешировано за Ñто Ð²Ñ€ÐµÐ¼Ñ (%lu подпиÑей)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu ключей закешированно (%lu подпиÑей)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: таблица ключей Ñоздана\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Введите URL предпочтаемого Ñервера ключей: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "Ð’ÐИМÐÐИЕ: параметр Ñервера ключей `%s' не иÑпользуетÑÑ Ð½Ð° данной платформе\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Введите чиÑло(а), N) Следующий или Q) Выход> " # test it -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "invalid keyserver protocol (us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "ключ \"%s\" не найден на Ñервере ключей\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "ключ не найден на Ñервере ключей\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "запрашиваю ключ %s Ñ %s Ñервера %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "получение ключа %s Ñ %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "поиÑк \"%s\" на %s Ñервере %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "поиÑк \"%s\" на %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "отправлÑÑŽ ключ %s на %s Ñервер %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "отправка ключа %s на %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "поиÑк \"%s\" на %s Ñервере %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "поиÑк \"%s\" на %s\n" # test it -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "Ð’ÐИМÐÐИЕ: обработчик Ñервера ключей от другой верÑии GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "Ñервер ключей не приÑлал VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "не заданы Ñерверы ключей (иÑпользуйте --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "Ð”Ð°Ð½Ð½Ð°Ñ Ñборка не поддерживает внешние вызовы Ð´Ð»Ñ Ñервера ключей.\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "нет обработчика Ð´Ð»Ñ Ñхемы Ñервера ключей `%s'\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "дейÑтвие `%s' не поддерживаетÑÑ Ñерверами ключей `%s'\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s не поддерживает верÑию обработчика %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "превышено Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ñервера ключей\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "ошибка Ñервера ключей\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "ошибка ÑвÑзи Ñ Ñервером ключей: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" не идентификатор ключа: пропущен\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "Ð’ÐИМÐÐИЕ: невозможно обновить ключ %s Ñ %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "обновление 1 ключа из %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "обновление %d ключей из %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "Ð’ÐИМÐÐИЕ: невозможно обновить ключ %s Ñ %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "Ð’ÐИМÐÐИЕ: невозможно обновить ключ %s Ñ %s: %s\n" @@ -4621,63 +4739,63 @@ msgid "[uncertain]" msgstr "[Ñомнительно]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " aka \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "ПодпиÑÑŒ проÑрочена %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "ПодпиÑÑŒ дейÑтвительна до %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s подпиÑÑŒ, Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "двоичный" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "текÑтовый" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "неизвеÑтно" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Ðе могу проверить подпиÑÑŒ: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "не Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "Ð’ÐИМÐÐИЕ: обнаружено множеÑтво подпиÑей. Только Ð¿ÐµÑ€Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ проверена.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "ÑамоÑтоÑÑ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ клаÑÑа 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "Ñтарый (PGP 2.x) Ñтиль подпиÑи\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "обнаружен недопуÑтимый корневой пакет в proc_tree()\n" @@ -4720,60 +4838,65 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "Ð’ÐИМÐÐИЕ: иÑпользуетÑÑ ÑкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ñ…ÐµÑˆ-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "Ð’ÐИМÐÐИЕ: хеш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s ÑчитаетÑÑ ÑƒÑтаревшей\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "модуль поддержки шифра IDEA не обнаружен\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr "Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñм. http://www.gnupg.org/faq.html\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "Ð’ÐИМÐÐИЕ: хеш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s ÑчитаетÑÑ ÑƒÑтаревшей\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "ПРЕДУПРЕЖДÐЮ: %s недоÑтупен в данной верÑии\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: не Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "Ð’ÐИМÐÐИЕ: \"%s\" не Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "иÑпользуйте \"%s%s\" взамен\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "" "Ð’ÐИМÐÐИЕ: команда \"%s\" ÑвлÑетÑÑ ÑƒÑтаревшей - не Ñледует применÑÑ‚ÑŒ ее\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Без ÑжатиÑ" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "данное Ñообщение может быть не пригодно Ð´Ð»Ñ %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "двуÑмыÑленный параметр `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "неизвеÑтный параметр `%s'\n" @@ -4825,13 +4948,13 @@ msgid "can't handle public key algorithm %d\n" msgstr "не могу иÑпользовать алгоритм Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ключом %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "Ð’ÐИМÐÐИЕ: потенциально небезопаÑный ÑеанÑовый ключ, зашифрованный " "Ñимметричным шифром\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "подпакет типа %d имеет выÑтавленный критичеÑкий бит\n" @@ -4915,7 +5038,7 @@ msgid "Repeat passphrase: " msgstr "Повторите пароль: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4929,58 +5052,58 @@ "Ñ Ð’Ð°ÑˆÐ¸Ð¼ открытым ключом и увеличит его размер, Ñ‚.е. не Ñледует брать очень\n" "большое изображение. Рекомендуемый размер около 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Введите Ð¸Ð¼Ñ JPEG файла Ð´Ð»Ñ Ð¤Ð¾Ñ‚Ð¾ ID: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "Ðе могу открыть JPEG файл `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Этот JPEG очень велик (%d байт)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' - не JPEG файл\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Данное фото правильное (y/N/q)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "не могу отобразить Фото ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ñ‹" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Ключ заменён другим" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Ключ был Ñкомпрометирован" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Ключ больше не иÑпользуетÑÑ" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "User ID больше не дейÑтвителен" @@ -5000,47 +5123,47 @@ msgid "No trust value assigned to:\n" msgstr "Ðе задано значение Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð´Ð»Ñ:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " aka \"%s\"\n" # test it -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "ÐаÑколько Ð’Ñ‹ уверены, что данный ключ принадлежит пользователю указанному в " "User ID ключа?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Ðе знаю или не буду отвечать\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Ðе доверÑÑŽ\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = ÐбÑолютно доверÑÑŽ\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = вернутьÑÑ Ð² главное меню\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = пропуÑтить Ñтот ключ\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = выход\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5049,22 +5172,22 @@ "Минимальный уровень Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¼Ñƒ ключу: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Ваше решение (?-подробнее)? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "" "Ð’Ñ‹ дейÑтвительно хотите уÑтановить ÐБСОЛЮТÐОЕ доверие владельцу данного " "ключа? (y/N)" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Сертификаты, приводÑщие к абÑолютно доверÑемому ключу:\n" # test it -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" @@ -5072,7 +5195,7 @@ "указанному в User ID ключа\n" # test it -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" @@ -5080,15 +5203,15 @@ "указанному в User ID ключа\n" # test it -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Этот ключ вероÑтно принадлежит названному владельцу\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Данный ключ принадлежит нам\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5098,106 +5221,106 @@ "в User ID ключа. ЕÑли Ð’Ñ‹ ТОЧÐО знаете, что Ð’Ñ‹ делаете,\n" "можете ответить на Ñледующий Ð²Ð¾Ð¿Ñ€Ð¾Ñ ÑƒÑ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Ð’Ñе равно иÑпользовать данный ключ? (y/N)" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "Ð’ÐИМÐÐИЕ: ИÑпользование недоверÑемого ключа!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "Ð’ÐИМÐÐИЕ: возможно данный ключ отозван (ключ отзыва отÑутвтует)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван ключом назначенным отзывающим!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван его владельцем!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Это может означать, что подпиÑÑŒ поддельнаÑ.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "Ð’ÐИМÐÐИЕ: Данный подключ был отозван его владельцем!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Замечание: Данный ключ отключен.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Замечание: Данный ключ проÑрочен!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ не заверен доверенной подпиÑью!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Ðет указаний на то, что подпиÑÑŒ принадлежит владельцу.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "Ð’ÐИМÐÐИЕ: ÐЕТ ДОВЕРИЯ данному ключу!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Возможно, что подпиÑÑŒ ПОДДЕЛÐÐÐ.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "Ð’ÐИМÐÐИЕ: Этот ключ не заверен доÑтаточным количеÑтвом доверÑемых подпиÑей!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Ðет уверенноÑти в том, что подпиÑÑŒ принадлежит владельцу.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: пропущено: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: пропущено: открытый ключ уже ÑущеÑтвует\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Ðе задан User ID. (можете иÑпользовать \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Текущие получатели:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5205,33 +5328,33 @@ "\n" "Введите User ID. ПуÑÑ‚Ð°Ñ Ñтрока Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Ðет такого User ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "пропущено: открытый ключ уже уÑтановлен Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾ умолчанию\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Открытый ключ отключен.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "пропущено: открытый ключ уже уÑтановлен\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "неизвеÑтный получатель по умолчанию \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: пропущено: открытый ключ отключен\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "нет дейÑтвительных адреÑов\n" @@ -5299,7 +5422,7 @@ msgstr "ЗÐМЕТЬТЕ: ключ был отозван" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "" @@ -5322,11 +5445,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Создать Ñертификат отзыва данного ключа? (y/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Ð”Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° иÑпользован ASCII формат.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "" @@ -5345,28 +5468,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "Ñекретный ключ \"%s\" не найден: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "нет ÑоотвеÑтвующего открытого ключа: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "открытый ключ не ÑоотвеÑтвует Ñекретному!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Создать Ñертификат отзыва данного ключа? (y/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "неизвеÑтный алгоритм защиты\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "ЗÐМЕЧÐÐИЕ: Данный ключ не защищен!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5385,33 +5508,33 @@ "ноÑитель будет повреждён, но будьте оÑторожны: ÑиÑтема печати\n" "Вашей машины может Ñохранить данные и Ñделать их доÑтупными Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ…!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Укажите причину отзыва:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Отмена" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Возможно Ð’Ñ‹ хотите выбрать здеÑÑŒ %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Введите необÑзательное поÑÑнение; закончите пуÑтой Ñтрокой:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Причина отзыва: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(ПоÑÑÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÑутÑтвуют)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Ð’Ñе правильно? (y/N) " @@ -5488,17 +5611,17 @@ "Ð’ÐИМÐÐИЕ: подпиÑываемый подключ %s имеет недоÑтоверную перекреÑтную " "Ñертификацию\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "открытый ключ %s на %lu Ñекунд моложе подпиÑи\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "открытый ключ %s на %lu Ñекунд моложе подпиÑи\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5506,7 +5629,7 @@ "ключ %s был Ñоздан на %lu Ñекунд в будущем (time warp или проблемы Ñ " "чаÑами)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5514,22 +5637,22 @@ "ключ %s был Ñоздан на %lu Ñекунд в будущем (time warp или проблемы Ñ " "чаÑами)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "ЗÐМЕТЬТЕ: подпиÑавший ключ %s - проÑрочен %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "принÑта Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ ключа %s Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтным критичеÑким битом\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "ключ %s: нет подключа Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð° отзывающей подпиÑи\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "ключ %s: нет подключа Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи ÑвÑзи подключей\n" @@ -5666,12 +5789,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -5715,84 +5838,85 @@ msgid "%s: trustdb created\n" msgstr "%s: Ñоздана таблица доверий\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "ЗÐМЕТЬТЕ: таблица доверий доÑтупна только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° доверий\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: Ñбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñ…Ñшей: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: ошибка Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи о верÑии: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи о верÑии: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи о верÑии: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: не ÑвлÑетÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ таблицы доверий\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: запиÑÑŒ о верÑии Ñ Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð¼ запиÑи %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñ„Ð°Ð¹Ð»Ð° %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñвободной запиÑи: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: ошибка внеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи каталога: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: Ñбой Ð¾Ð±Ð½ÑƒÐ»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: Ñбой Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "таблица доверий повреждена; запуÑтите \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: Ñоздана таблица доверий\n" #: g10/textfilter.c:147 #, c-format @@ -5839,125 +5963,133 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "запиÑÑŒ о доверии %lu не запрашиваемого типа %d\n" +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + # check it -#: g10/trustdb.c:445 +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" "не могу иÑпользовать неизвеÑтную модель (%d) - иÑпользую %s модель доверий\n" # check it -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "иÑпользую %s модель доверий\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ отозван]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[проÑрочн]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[неизвÑтн]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[неопредл]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ограничн]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ полное ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[абÑолютн]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "неопределено" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "никогда" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "ограниченно" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "полное" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "абÑолютное" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "Ñрок Ñледующей проверки таблицы доверий %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "нет необходимоÑти проверÑÑ‚ÑŒ таблицу доверий при `%s' модели доверий\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "нет необходимоÑти обновлÑÑ‚ÑŒ таблицу доверий при '%s' модели доверий\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "открытый ключ %s не найден: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "выполните --check-trustdb, пожалуйÑта\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "проверка таблицы доверий\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d ключей обработано (%d дейÑвующих запиÑей очищено)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "не найдено абÑолютно доверÑемых ключей\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "открытый ключ Ð´Ð»Ñ Ð°Ð±Ñолютно доверÑемого ключа %s не найден\n" # check it -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" "%d ограниченных необходимо, %d выполненных необходимо, %s модель довериÑ\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5965,7 +6097,7 @@ "глубина: %d корректных: %3d подпиÑанных: %3d довериÑ: %d-, %dq, %dn, %dm, " "%df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6226,47 +6358,47 @@ msgstr "Ð’Ñ‹ нашли ошибку ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "да" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "нет" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "" @@ -6288,6 +6420,15 @@ "(возможно, Ð’Ñ‹ иÑпользуете неподходÑщее программное обеÑпечение\n" "Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ задачи)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "Пара ключей DSA будет иметь длину %u бит.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "таблица доверий повреждена; запуÑтите \"gpg --fix-trustdb\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|ÐдминиÑтративный PID" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "невозможно добавить примечение в v3 (PGP 2.x ÑтилÑ) подпиÑÑŒ\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/sk.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/sk.gmo differ diff -Nru gnupg-1.4.9/po/sk.po gnupg-1.4.10/po/sk.po --- gnupg-1.4.9/po/sk.po 2008-03-25 08:53:12.000000000 +0000 +++ gnupg-1.4.10/po/sk.po 2009-09-02 17:19:41.000000000 +0100 @@ -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: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -37,13 +37,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "nemô¾em otvori» `%s': %s\n" @@ -75,9 +74,10 @@ msgid "note: random_seed file not updated\n" msgstr "poznámka: súbor random_seed nie je aktualizovaný\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "nemô¾em vytvori» `%s': %s\n" @@ -130,176 +130,220 @@ "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:594 +#: g10/app-openpgp.c:697 #, 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:607 +#: g10/app-openpgp.c:710 #, 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:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +msgid "||Please enter the PIN" +msgstr "" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" msgstr "" -#. 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. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1673 +msgid "|A|Please enter the Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "tajné èasti kµúèa nie sú dostupné\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Prosím výberte dôvod na revokáciu:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, fuzzy, c-format msgid "error getting new PIN: %s\n" msgstr "chyba pri vytváraní hesla: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 #, fuzzy msgid "error reading application data\n" msgstr "chyba pri èítaní bloku kµúèa: %s\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 #, fuzzy msgid "error reading fingerprint DO\n" msgstr "%s: chyba pri èítaní voµného záznamu: %s\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 #, fuzzy msgid "key already exists\n" msgstr "`%s' je u¾ skomprimovaný\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 #, fuzzy msgid "generating new key\n" msgstr "vytvori» nový pár kµúèov" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "vytvori» nový pár kµúèov" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, 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:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 #, fuzzy msgid "generating key failed\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, fuzzy, c-format msgid "key generation completed (%d seconds)\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s podpis, hashovací algoritmus %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenájdené ¾iadne platné dáta vo formáte OpenPGP.\n" @@ -386,176 +430,238 @@ "neplatný znak (quoted-printable) v ASCII kódovaní - pravdepodobne bol " "pou¾itý nesprávny MTA\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, fuzzy, c-format msgid "OpenPGP card not available: %s\n" msgstr "tajný kµúè nie je dostupný" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 #, fuzzy msgid "can't do this in batch mode\n" msgstr "nemo¾no previes» v dávkovom móde\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Tento príkaz nie je v módoch %s dovolený.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Vá¹ výber? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "" -#: g10/card-util.c:416 +#: g10/card-util.c:509 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:417 +#: g10/card-util.c:510 #, fuzzy msgid "unspecified" msgstr "Dôvod nebol ¹pecifikovaný" -#: g10/card-util.c:444 +#: g10/card-util.c:537 #, fuzzy msgid "not forced" msgstr "nespracované" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:584 +#: g10/card-util.c:690 #, fuzzy msgid "URL to retrieve public key: " msgstr "¾iadny zodpovedajúci verejný kµúè: %s\n" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "chyba pri vytváraní súboru kµúèov (keyring)`%s': %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pri èítaní `%s': %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "chyba pri vytváraní `%s': %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 #, fuzzy msgid "Language preferences: " msgstr "aktualizova» predvoµby" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 #, fuzzy msgid "Error: invalid response.\n" msgstr "chyba: neplatný odtlaèok\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 #, fuzzy msgid "CA fingerprint: " msgstr "vypísa» fingerprint" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "chyba: neplatný odtlaèok\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 #, fuzzy msgid "not an OpenPGP card" msgstr "nenájdené ¾iadne platné dáta vo formáte OpenPGP.\n" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, 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:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Akú veµkos» kµúèa si prajete? (1024) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Akú veµkos» kµúèa si prajete? (1024) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Akú veµkos» kµúèa si prajete? (1024) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "zaokrúhlené na %u bitov\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "preskoèené: tajný kµúè je u¾ v databáze\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -563,192 +669,201 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 #, 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:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 #, fuzzy msgid " (1) Signature key\n" msgstr "Platnos» podpisu vypr¹ala %s\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Neplatný výber.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 #, 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:1241 +#: g10/card-util.c:1597 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "neznámy ochranný algoritmus\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 #, 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:1251 +#: g10/card-util.c:1607 #, 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:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "chyba pri zápise súboru kµúèov (keyring) `%s': %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "ukonèi» toto menu" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 #, fuzzy msgid "show admin commands" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "ukáza» túto pomoc" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 #, fuzzy msgid "list all available data" msgstr "Kµúè k dispozícii na: " -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 #, fuzzy msgid "change the login name" msgstr "zmeni» dobu platnosti" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 #, fuzzy msgid "change the language preferences" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 #, fuzzy msgid "change a CA fingerprint" msgstr "vypísa» fingerprint" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 #, fuzzy msgid "generate new keys" msgstr "vytvori» nový pár kµúèov" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Príkaz> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný príkaz (skúste \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "tajný kµúè nie je dostupný" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 #, fuzzy msgid "Repeat this PIN: " msgstr "Opakujte heslo: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "nemo¾no otvori» `%s'\n" @@ -757,13 +872,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pre tento príkaz nefunguje\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: 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:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -864,7 +979,7 @@ msgid "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:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "" @@ -1272,7 +1387,7 @@ msgid "Pubkey: " msgstr "Verejné kµúèe: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "©ifry: " @@ -1280,7 +1395,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Kompresia: " @@ -1420,418 +1535,418 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitný súbor s mo¾nos»ami `%s ignorovaný'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitný súbor s mo¾nos»ami `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "súbor s mo¾nos»ami `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, 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/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s nie je platná znaková sada\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie je platná znaková sada\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 #, fuzzy msgid "invalid keyserver options\n" msgstr "neplatný parameter pre export\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "neplatný parameter pre import\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "neplatný parameter pre export\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 #, fuzzy msgid "invalid list options\n" msgstr "neplatný parameter pre import\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "%s nie je platná znaková sada\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "zadané URL pre podpisovú politiku je neplatné\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "%s nie je platná znaková sada\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "%s nie je platná znaková sada\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 #, fuzzy msgid "invalid verify options\n" msgstr "neplatný parameter pre export\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prepí¹e %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolené pou¾íva» %s s %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedáva s %s zmysel!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent nie je v tomto sedení dostupný\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, fuzzy, c-format msgid "will not run with insecure memory due to %s\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 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/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 #, 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 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/gpg.c:3132 +#: g10/gpg.c:3131 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/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "neplatné defaultné predvoµby\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s e¹te nepracuje s %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, 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/gpg.c:3245 +#: g10/gpg.c:3244 #, 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/gpg.c:3250 +#: g10/gpg.c:3249 #, 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/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [meno súboru]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [meno súboru]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "de¹ifrovanie zlyhalo: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [meno súboru]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, 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/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [meno súboru]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, 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/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno súboru]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [meno súboru]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [meno súboru]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key id u¾ívateµa" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ívateµa" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ívateµa [príkazy]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 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/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "nepodaril sa export kµúèa: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "nepodarilo sa nájs» server: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aktualizácia servera zlyhala: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" @@ -1879,17 +1994,17 @@ msgstr "" "Neplatný kµúè %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, 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:2620 +#: g10/getkey.c:2656 #, fuzzy, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "pou¾ívam sekundárny kµúè %08lX namiesto primárneho kµúèa %08lX\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, 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" @@ -1915,8 +2030,9 @@ msgstr "Pou¾itie: gpgv [mo¾nosti] [súbory] (-h pre pomoc)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Syntax: gpg [nastavenia] [súbory]\n" @@ -2717,12 +2833,12 @@ msgid "keyring `%s' created\n" msgstr "súbor kµúèov (keyring) `%s' vytvorený\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "chyba pri vytváraní `%s': %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "zlyhalo obnovenie vyrovnávacej pamäti kµúèov: %s\n" @@ -2772,7 +2888,7 @@ msgstr "" "zistených %d identifikátorov u¾ívateµa bez platného podpisu ním samým\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 #, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " @@ -2785,12 +2901,12 @@ "kontrolou fingerprintov z rôznych zdrojov...)?\n" "\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, fuzzy, c-format msgid " %d = I trust marginally\n" msgstr " %d = Dôverujem èiastoène\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, fuzzy, c-format msgid " %d = I trust fully\n" msgstr " %d = Dôverujem úplne\n" @@ -3031,8 +3147,8 @@ msgid "Really sign? (y/N) " msgstr "Skutoène podpísa»? " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "podpisovanie zlyhalo: %s\n" @@ -3041,20 +3157,20 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Tento kµúè nie je chránený.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Tajné èasti primárneho kµúèa nie sú dostupné.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 #, fuzzy msgid "Secret parts of primary key are stored on-card.\n" msgstr "Tajné èasti primárneho kµúèa nie sú dostupné.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "kµúè je chránený.\n" @@ -3071,7 +3187,7 @@ "Vlo¾te nové heslo (passphrase) pre tento tajný kµúè.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" @@ -3413,117 +3529,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Skutoène aktualizova» predvoµby? " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 #, fuzzy msgid "Save changes? (y/N) " msgstr "Ulo¾i» zmeny? " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ukonèi» bez ulo¾enia? " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "aktualizácia zlyhala: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizácia tajného kµúèa zlyhala: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Charakteristiky: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Notácie: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, fuzzy, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Tento kµúè mô¾e by» revokovaný kµúèom %s " -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, 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:2712 +#: g10/keyedit.c:2714 #, fuzzy msgid "(sensitive)" msgstr "(citlivá informácia)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, fuzzy, c-format msgid "created: %s" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revokované]" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, fuzzy, c-format msgid "expired: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, fuzzy, c-format msgid "expires: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, fuzzy, c-format msgid "usage: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, fuzzy, c-format msgid "trust: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Tento kµúè bol oznaèený za neplatný (disabled)" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3531,19 +3647,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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 #, fuzzy msgid "revoked" msgstr "[revokované]" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3551,7 +3667,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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3560,75 +3676,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Zmaza» tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Zmaza» tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Zmaza» tento neznámy podpis? (a/N/u)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Zmazaný %d podpis.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Zmazaných %d podpisov.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Niè nebolo zmaznané.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "neplatný spôsob reprezentácie v ASCII" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "U¾ívateµské ID \"%s\" je revokované." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "U¾ívateµské ID \"%s\" je revokované." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "U¾ívateµské ID \"%s\" je revokované." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3637,264 +3753,270 @@ "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:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 #, 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:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 #, 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:3522 +#: g10/keyedit.c:3524 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:3528 +#: g10/keyedit.c:3530 #, fuzzy msgid "Please select at most one subkey.\n" msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 #, fuzzy msgid "Changing expiration time for a subkey.\n" msgstr "Mením dobu platnosti sekundárneho kµúèa.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Mením dobu platnosti primárneho kµúèa.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 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:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "VAROVANIE: podpisovací podkµúè %08lX nie je krí¾ovo certifikovaný\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 #, 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:4139 +#: g10/keyedit.c:4147 #, 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:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "Podpisová notácia: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Prepísa» (a/N)? " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, fuzzy, c-format msgid "No subkey with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ívateµa: \"" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, 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:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +#, fuzzy +msgid "Not signed by you.\n" +msgstr " podpísané %08lX v %s%s\n" + +#: g10/keyedit.c:4716 #, 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:4704 +#: g10/keyedit.c:4742 #, fuzzy msgid " (non-revocable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokované %08lX v %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte sa revokova» tieto podpisy:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "neexistuje tajný kµúè\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, fuzzy, c-format msgid "Key %s is already revoked.\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, fuzzy, c-format msgid "Subkey %s is already revoked.\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "Zobrazujem %s fotografické ID s veµkos»ou %ld pre kµúè 0x%08lX (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, fuzzy, c-format msgid "preference `%s' duplicated\n" msgstr "duplicita predvoµby %c%lu\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 #, fuzzy msgid "too many cipher preferences\n" msgstr "príli¹ veµa `%c' predvolieb\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 #, fuzzy msgid "too many digest preferences\n" msgstr "príli¹ veµa `%c' predvolieb\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 #, fuzzy msgid "too many compression preferences\n" msgstr "príli¹ veµa `%c' predvolieb\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "zapisujem podpis kµúèa ním samým (direct signature)\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "zapisujem podpis kµúèa sebou samým\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "zapisujem \"key-binding\" podpis\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná då¾ka kµúèa; pou¾ijem %u bitov\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "då¾ka kµúèa zaokrúhlená na %u bitov\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 #, fuzzy msgid "Sign" msgstr "sign" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 #, fuzzy msgid "Encrypt" msgstr "¹ifrova» dáta" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "" @@ -3907,109 +4029,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, fuzzy, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%d) ElGamal (len na ¹ifrovanie)\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Prosím, vyberte druh kµúèa, ktorý chcete:\n" -#: g10/keygen.c:1454 +#: g10/keygen.c:1492 #, fuzzy, c-format -msgid " (%d) DSA and Elgamal (default)\n" +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA a ElGamal (implicitný)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA a ElGamal (implicitný)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (len na podpis)\n" -#: g10/keygen.c:1457 -#, fuzzy, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) RSA (len na ¹ifrovanie)\n" +#: g10/keygen.c:1497 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (len na podpis)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (len na ¹ifrovanie)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (len na podpis)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, fuzzy, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "Pár kµúèov DSA bude ma» då¾ku 1024 bitov.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1550 +#: g10/keygen.c:1623 #, fuzzy, c-format -msgid "What keysize do you want? (%u) " +msgid "What keysize do you want for the subkey? (%u) " msgstr "Akú veµkos» kµúèa si prajete? (1024) " -#: g10/keygen.c:1564 -#, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "" +#: g10/keygen.c:1626 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Akú veµkos» kµúèa si prajete? (1024) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná då¾ka kµúèa je %u bitov.\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "zaokrúhlené na %u bitov\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -4025,7 +4142,7 @@ " m = doba platnosti kµúèa skonèí za n mesiacov\n" " y = doba platnosti kµúèa skonèí za n rokov\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4041,40 +4158,40 @@ " m = doba platnosti podpisu skonèí za n mesiacov\n" " y = doba platnosti podpisu skonèí za n rokov\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Kµúè je platný na? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Podpis je platný na? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 #, fuzzy msgid "Key does not expire at all\n" msgstr "platnos» %s neskonèí\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 #, fuzzy msgid "Signature does not expire at all\n" msgstr "platnos» %s neskonèí\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, fuzzy, c-format msgid "Key expires at %s\n" msgstr "platnos» %s skonèí %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, fuzzy, c-format msgid "Signature expires at %s\n" msgstr "Platnos» podpisu vypr¹í %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4082,12 +4199,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:1709 +#: g10/keygen.c:1807 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Je to správne (a/n)? " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 #, fuzzy msgid "" "\n" @@ -4104,44 +4221,44 @@ " \"Jozko Mrkvicka (student) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Meno a priezvisko: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Neplatný znak ve mene\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Meno nemô¾e zaèína» èíslicou\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Meno musí by» dlhé aspoò 5 znakov\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Komentár: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentári\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾ívate znakovú sadu `%s'.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4152,7 +4269,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4167,23 +4284,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "mMkKeEPpUu" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Najskôr, prosím, opravte chybu\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4191,12 +4308,12 @@ "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4208,7 +4325,7 @@ "tohto programu s parametrom \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4220,50 +4337,50 @@ "pou¾íva» disky); vïaka tomu má generátor lep¹iu ¹ancu získa» dostatok " "entropie.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Vytváranie kµúèa bolo zru¹ené.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujem verejný kµúè do `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, 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:3074 +#: g10/keygen.c:3260 #, 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:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, 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:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "verejný a tajný kµúè boli vytvorené a podpísané.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 #, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" @@ -4272,12 +4389,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:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4285,7 +4402,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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4293,26 +4410,26 @@ "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:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 #, fuzzy msgid "Really create? (y/N) " msgstr "Skutoène vytvori»? " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "nemô¾em vytvori» `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, 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" @@ -4345,254 +4462,254 @@ msgid "Keyring" msgstr "súbor kµúèov (keyring)" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primárny fingerprint kµúèa:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " Primárny fingerprint kµúèa:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 #, fuzzy msgid " Key fingerprint =" msgstr " Fingerprint kµúèa =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VAROVANIE: Existujú dva súbory s tajnými informáciami.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s je bez zmeny\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s je nový\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Prosím, opravte tento mo¾ný bezpeènostný problém\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, fuzzy, c-format msgid "caching keyring `%s'\n" msgstr "kontrolujem súbor kµúèov (keyring) `%s'\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, fuzzy, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu kµúèov skontrolovaných (%lu podpisov)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, fuzzy, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu kµúèov skontrolovaných (%lu podpisov)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: súbor kµúèov (keyring) vytvorený\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "zadané URL pre podpisovú politiku je neplatné\n" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, fuzzy, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "VAROVANIE: nastavenie v `%s' e¹te nie je aktívne\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 #, fuzzy msgid "disabled" msgstr "disable" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "neplatný parameter pre export\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, fuzzy, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 #, fuzzy msgid "key not found on keyserver\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, 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:1339 +#: g10/keyserver.c:1369 #, 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:1382 +#: g10/keyserver.c:1412 #, 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:1385 +#: g10/keyserver.c:1415 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 #, fuzzy msgid "no keyserver action!\n" msgstr "neplatný parameter pre export\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 #, fuzzy msgid "keyserver timed out\n" msgstr "chyba servera kµúèov" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 #, fuzzy msgid "keyserver internal error\n" msgstr "chyba servera kµúèov" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1903 +#: g10/keyserver.c:1933 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n" @@ -4753,62 +4870,62 @@ msgid "[uncertain]" msgstr "[neistý] " -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, fuzzy, c-format msgid " aka \"%s\"" msgstr " alias \"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Platnos» podpisu vypr¹ala %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Platnos» podpisu vypr¹í %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s podpis, hashovací algoritmus %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binárne" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "textový mód" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "neznáme" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Nemô¾em overi» podpis: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "toto nie je podpis oddelený od dokumentu\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "VAROVANIE: Nájdené viacnásobne podpisy. Skontrolovaný bude len prvý.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "samostatný podpis triedy 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starého typu (PGP 2.x)\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "nájdený neplatný koreòový paket v proc_tree()\n" @@ -4848,61 +4965,66 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s podpis, hashovací algoritmus %s\n" -#: g10/misc.c:353 -#, fuzzy, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "" -"vy¾iadaný hashovací algoritmus %s (%d) nevyhovuje predvoµbám príjemcu\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA modul pre GnuPG nenájdený\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " i = prosím o viac informácíi\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"vy¾iadaný hashovací algoritmus %s (%d) nevyhovuje predvoµbám príjemcu\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent nie je v tomto sedení dostupný\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: pou¾itie parametra \"%s\" sa neodporúèa\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VAROVÁNÍ: pou¾itie parametra \"%s\" sa neodporúèa\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "pou¾ite namiesto neho \"%s%s\" \n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "VAROVÁNÍ: pou¾itie parametra \"%s\" sa neodporúèa\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Nekomprimované" -#: g10/misc.c:744 +#: g10/misc.c:799 #, fuzzy msgid "uncompressed|none" msgstr "Nekomprimované" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "táto správa nemusí pou¾iteµná s %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, fuzzy, c-format msgid "ambiguous option `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, fuzzy, c-format msgid "unknown option `%s'\n" msgstr "neznámy implicitný adresát `%s'\n" @@ -4955,12 +5077,12 @@ msgid "can't handle public key algorithm %d\n" msgstr "nemô¾em pracova» s algoritmom verejného kµúèa %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" "VAROVANIE: pravdepodobne nebezpeèný symetricky ¹ifrovaný kµúè sedenia\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" @@ -5048,7 +5170,7 @@ msgid "Repeat passphrase: " msgstr "Opakujte heslo: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5063,59 +5185,59 @@ "Ak pou¾ijete veµmi veµký obrázok, kµúè bude tie¾ veµký! Odporúèaná veµkos»\n" "obrázka je okolo 240x288.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Meno súbor s fotografiou vo formáte JPEG: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, fuzzy, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "nemo¾no otvori» súbor: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "" -#: g10/photoid.c:127 +#: g10/photoid.c:128 #, fuzzy msgid "Are you sure you want to use it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, fuzzy, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" nie je súbor JPEG\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Je táto fotografia správna (a/N/u)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "Dôvod nebol ¹pecifikovaný" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Kµúè je nahradený" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Kµúè bol skompromitovaný" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Kµúè sa u¾ nepou¾íva" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Identifikátor u¾ívateµa u¾ neplatí" @@ -5138,89 +5260,89 @@ "Nie je priradená ¾iadna hodnota dôvery k:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, fuzzy, c-format msgid " aka \"%s\"\n" msgstr " alias \"" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 #, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "Tento kµúè pravdepodobne patrí jeho majiteµovi\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, fuzzy, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Neviem\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, fuzzy, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Nedôverujem\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, fuzzy, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Dôverujem absolútne\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 #, fuzzy msgid " m = back to the main menu\n" msgstr " m = spä» do hlavného menu\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 #, fuzzy msgid " s = skip this key\n" msgstr " s = preskoèi» tento kµúè\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 #, fuzzy msgid " q = quit\n" msgstr " u = ukonèi»\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" msgstr "" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Va¹e rozhodnutie? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 #, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Skutoène chcete nastavi» pre tento kµúè absolútnu dôveru? " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certifikáty vedúce k finálnemu dôveryhodnému kµúèu:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%08lX: Niè nenaznaèuje tomu, ¾e tento podpis patrí vlastníkovi kµúèa.\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%08lX: Niè nenaznaèuje tomu, ¾e tento podpis patrí vlastníkovi kµúèa.\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 #, fuzzy msgid "This key probably belongs to the named user\n" msgstr "Tento kµúè pravdepodobne patrí jeho majiteµovi\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Tento kµúè patrí nám (máme zodpovedajúci tajný kµúè)\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 #, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" @@ -5232,111 +5354,111 @@ "odpoveda» áno\n" "\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 #, fuzzy msgid "Use this key anyway? (y/N) " msgstr "Pou¾i» napriek tomu tento kµúè? " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "VAROVANIE: Je pou¾itý nedôveryhodný kµúè!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "VAROVANIE: kµúè mô¾e by» revokovaný (revokaèný kµúè neexistuje)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho urèeným revokátorom/!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho vlastníkom!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 #, 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:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "VAROVANIE: Tento podkµúè bol revokovaný jeho vlastníkom!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Poznámka: Tento kµúè bol oznaèený ako neplatný (disabled).\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Poznámka: Skonèila platnos» tohto kµúèa!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "VAROVANIE: Tento kµúè nie certifikovaný dôveryhodným podpisom!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Niè nenaznaèuje tomu, ¾e tento podpis patrí vlastníkovi kµúèa.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "VAROVANIE: NEdôverujeme tomuto kµúèu!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Tento podpis je pravdepodobne FALO©NÝ.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "VAROVANIE: Tento kµúè nie je certifikovaný dostatoène dôveryhodnými " "podpismi!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Nie je isté, ¾e tento podpis patrí vlastníkovi.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: preskoèené: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: preskoèené: verejný kµúè je u¾ obsiahnutý v databáze\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "" "Ne¹pecifikovali ste identifikátor u¾ívateµa (user ID). Mô¾ete pou¾i» \"-r\"\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5344,33 +5466,33 @@ "\n" "Napí¹te identifikátor u¾ívateµa (user ID). Ukonèite prázdnym riadkom: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Takýto identifikátor u¾ívateµa neexistuje.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "preskoèené: verejný kµúè je u¾ nastavený podµa implicitného adresáta\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Verejný kµúè je neplatný (disabled).\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "preskoèené: verejný kµúè je u¾ nastavený\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, fuzzy, c-format msgid "unknown default recipient \"%s\"\n" msgstr "neznámy implicitný adresát `%s'\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: preskoèené: verejný kµúè je neplatný (disabled)\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "¾iadne platné adresy\n" @@ -5437,7 +5559,7 @@ msgstr "POZNÁMKA: kµúè bol revokovaný" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet zlyhala: %s\n" @@ -5460,11 +5582,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "Vynútený ASCII textový výstup.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet zlyhala: %s\n" @@ -5483,29 +5605,29 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "tajný kµúè `%s' nebol nájdený: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "¾iadny zodpovedajúci verejný kµúè: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "verejný kµúè nesúhlasí s tajným!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 #, fuzzy msgid "Create a revocation certificate for this key? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "neznámy ochranný algoritmus\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "POZNÁMKA: Tento kµúè nie je chránený!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5523,33 +5645,33 @@ "Ale hrozí nebezpeèenstvo: Tlaèový systém Vá¹ho poèítaèa mô¾e uklada» dáta a\n" "sprístupni» ich iným!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Prosím výberte dôvod na revokáciu:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Zru¹i»" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Pravdepodobne ste chceli vybra» %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Ak chcete, napí¹te popis; ukonèite prázdnym riadkom:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Dôvod na revokáciu: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(®iadny popis)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 #, fuzzy msgid "Is this okay? (y/N) " msgstr "Je to v poriadku? " @@ -5626,17 +5748,17 @@ msgstr "" "VAROVANIE: podpisovací podkµúè %08lX má neplatnú krí¾ovú certifikáciu\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, fuzzy, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "verejný kµúè %08lX je o %lu sekund nov¹í ne¾ podpis\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, fuzzy, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "verejný kµúè %08lX je o %lu sekund nov¹í ne¾ podpis\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, fuzzy, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5644,7 +5766,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/sig-check.c:193 +#: g10/sig-check.c:205 #, fuzzy, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5652,24 +5774,24 @@ "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/sig-check.c:203 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "POZNÁMKA: podpisovému kµúèu %08lX skonèila platnos» %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, fuzzy, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "predpokladám neplatný podpis kµúèom %08lX, preto¾e je nastavený neznámy " "kritický bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "kµúè %08lX: neexistuje podkµúè pre revokáciu kµúèa\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "kµúè %08lX: neexistuje podkµúè pre viazanie podkµúèov\n" @@ -5817,12 +5939,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "databáza dôvery: synchronizácia zlyhala %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "záznam v databáze dôvery %lu: lseek() sa nepodaril: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "záznam v databáze dôvery %lu: zápis sa nepodaril (n=%d): %s\n" @@ -5866,84 +5988,85 @@ msgid "%s: trustdb created\n" msgstr "%s: databáza dôvery vytvorená\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "POZNÁMKA: do trustdb nemo¾no zapisova»\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: neplatná databáze dôvery\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nepodarilo sa vytvori» hashovaciu tabuµku: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: chyba pri èítaní záznamu verzie: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: chyba pri zápise záznamu verzie: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: nie je súbor databázy dôvery\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: záznam verzie s èíslom %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: neplatná verzia súboru %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: chyba pri èítaní voµného záznamu: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: chyba pri zápise adresárového záznamu: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: vynulovanie záznamu zlyhalo: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: pridanie záznamu zlyhalo: %s\n" #: g10/tdbio.c:1502 -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" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: databáza dôvery vytvorená\n" #: g10/textfilter.c:147 #, c-format @@ -5991,130 +6114,138 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "záznam dôvery %lu nie je po¾adovaného typu %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 #, fuzzy msgid "[ revoked]" msgstr "[revokované]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 #, fuzzy msgid "[ expired]" msgstr "[expirované]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 #, fuzzy msgid "[ unknown]" msgstr "neznáme" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 #, fuzzy msgid "never" msgstr "nikdy " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 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:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, 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:626 #, 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:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "verejný kµúè %08lX nebol nájdený: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "prosím vykonajte --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "kontrolujem databázu dôvery\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, 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:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "neboli nájdené ¾iadne absolútne dôveryhodné kµúèe\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, 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:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, 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" @@ -6376,47 +6507,47 @@ msgstr "nájdená chyba v programe ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ano" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "aAyY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nie" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "ukonèi»" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "uUqQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "" -#: util/miscutil.c:409 +#: util/miscutil.c:461 #, fuzzy msgid "cC" msgstr "c" @@ -6437,6 +6568,14 @@ 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" +#, fuzzy +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "Pár kµúèov DSA bude ma» då¾ku 1024 bitov.\n" + +#~ 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" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "nemô¾em prida» dodatoèné údaje do v3 (PGP 2.x ¹týl) podpisov\n" @@ -6864,10 +7003,6 @@ #~ "\"\n" #~ "lokálne podpísané Va¹ím kµúèom %08lX v %s\n" -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " podpísané %08lX v %s%s\n" - #~ msgid "%s: can't access: %s\n" #~ msgstr "%s: nemô¾em pristupova» k: %s\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/sv.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/sv.gmo differ diff -Nru gnupg-1.4.9/po/sv.po gnupg-1.4.10/po/sv.po --- gnupg-1.4.9/po/sv.po 2008-03-25 10:23:36.000000000 +0000 +++ gnupg-1.4.10/po/sv.po 2009-09-02 17:20:10.000000000 +0100 @@ -1,6 +1,6 @@ # Swedish messages for gnupg -# Copyright (C) 1999-2006 Free Software Foundation, Inc. -# Daniel Nylander , 2006. +# Copyright (C) 1999-2008 Free Software Foundation, Inc. +# Daniel Nylander , 2006, 2007, 2008. # Per Tunedal , 2004. # Daniel Resare , 1999-2002. # @@ -18,14 +18,14 @@ # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po 4715 2008-03-25 10:45:59Z wk $ +# $Id: sv.po 5137 2009-09-02 17:32:43Z wk $ # msgid "" msgstr "" "Project-Id-Version: gnupg 2.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2007-02-22 00:33+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2008-07-20 14:34+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -57,13 +57,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "väntar pÃ¥ lÃ¥s pÃ¥ \"%s\"...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "kan inte öppna \"%s\": %s\n" @@ -95,9 +94,10 @@ msgid "note: random_seed file not updated\n" msgstr "observera: filen random_seed är inte uppdaterad\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "kan inte skapa \"%s\": %s\n" @@ -152,173 +152,219 @@ "för att ge operativsystemet en chans att samla in mer entropidata!\n" "(behöver %d fler byte)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "misslyckades med att lagra fingeravtrycket: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "misslyckades med att lagra datum för skapandet: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "läsning av publik nyckel misslyckades: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "svaret innehÃ¥ller inte publikt nyckeldata\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "svaret innehÃ¥ller inte en RSA-modulus\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "svaret innehÃ¥ller inte den publika RSA-exponenten\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN-Ã¥teranrop returnerade fel: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "validering av CHV%d misslyckades: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "Ã¥tkomst till administrationskommandon är inte konfigurerat\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "fel när CHV-status hämtades frÃ¥n kortet\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "kortet är permanent lÃ¥st!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d försök för Admin PIN-koden Ã¥terstÃ¥r innan kortet lÃ¥ses permanent\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Admin PIN-kod" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "Ã¥tkomst till administrationskommandon är inte konfigurerat\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "de hemliga nyckeldelarna är inte tillgängliga\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Välj anledning till varför nyckeln spärras:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Ny Admin PIN-kod" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Ny PIN-kod" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "fel när ny PIN-kod hämtades: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "fel vid läsning av programdata\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "fel vid läsning av fingeravtryckets DO\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "nyckeln finns redan\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "befintlig nyckel kommer att ersättas\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "genererar ny nyckel\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "genererar ny nyckel\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "tidsstämpel för skapandet saknas\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA modulus saknas eller är inte %d bitar stor\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "Publik RSA-exponent saknas eller större än %d bitar\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "misslyckades med att lagra nyckeln: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "var god vänta under tiden nyckeln genereras ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "nyckelgenereringen misslyckades\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "nyckelgenereringen är färdig (%d sekunder)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "signaturer skapade hittills: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" "validering av Admin PIN-kod är för närvarande förbjudet genom detta " "kommando\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kan inte komma Ã¥t %s - ogiltigt OpenPGP-kort?\n" @@ -341,9 +387,8 @@ msgstr "ogiltig rubrikrad i klartextsignatur\n" #: g10/armor.c:459 -#, fuzzy msgid "unknown armor header: " -msgstr "ASCII-skal: " +msgstr "okänd ASCII-skalrubrik: " #: g10/armor.c:512 msgid "nested clear text signatures\n" @@ -408,163 +453,225 @@ "beror sannolikt pÃ¥ att en felaktig e-postserver eller e-postklient har " "använts\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP-kort är inte tillgängligt: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP-kort nr. %s identifierades\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "kan inte göra detta i satsläge\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "Detta kommando är inte tillÃ¥tet när du är i %s-läge.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Vad väljer du? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[inte inställt]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "man" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "kvinna" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "ej angiven" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "inte tvingad" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "tvingad" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Fel: Endast ren ASCII tillÃ¥ts för närvarande.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Fel: Tecknet \"<\" fÃ¥r inte användas.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Fel: Dubbla blanksteg tillÃ¥ts inte.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Kortinnehavarens efternamn: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Kortinnehavarens förnamn: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Fel: Fullständigt namn för lÃ¥ngt (gränsen är %d tecken).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "Url för att hämta publik nyckel: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Fel: URL:en är för lÃ¥ng (gränsen är %d tecken).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "fel när nyckelringen \"%s\" skapades: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "fel vid läsning av \"%s\": %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "Fel när \"%s\" skapades: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Inloggningsdata (kontonamn): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Fel: Inloggningsdata är för lÃ¥ngt (gräns är %d tecken).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Privat DO-data: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Fel: Privat DO för lÃ¥ngt (gränsen är %d tecken).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "SprÃ¥kinställningar: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Fel: ogiltig längd pÃ¥ inställningssträngen\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Fel: ogiltiga tecken i inställningssträngen.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Fel: ogiltigt svar.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA-fingeravtryck: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Fel: ogiltigt formaterat fingeravtryck.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "nyckelÃ¥tgärden är inte möjlig: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "inte ett OpenPGP-kort" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "fel när aktuell nyckelinformation hämtades: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Ersätt existerande nyckel? (j/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Vilken nyckelstorlek vill du ha? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Vilken nyckelstorlek vill du ha? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Vilken nyckelstorlek vill du ha? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "avrundade uppÃ¥t till %u bitar\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s nyckelstorlekar mÃ¥ste vara inom intervallet %u-%u\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "hemlig nyckel redan lagrad pÃ¥ ett kort\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Ersätt existerande nycklar? (j/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -575,139 +682,148 @@ " PIN-kod = \"%s\" Admin PIN-kod = \"%s\"\n" "Du bör ändra dem med kommandot --change-pin\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Välj vilken typ av nyckel som ska genereras:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Signeringsnyckel\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Krypteringsnyckel\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Autentiseringsnyckel\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Ogiltigt val.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Välj var nyckeln ska sparas:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "okänd nyckelskyddsalgoritm\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "hemliga delar av nyckeln är inte tillgängliga.\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "hemlig nyckel redan lagrad pÃ¥ ett kort\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "avsluta denna meny" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "visa administratörskommandon" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "visa denna hjälp" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "lista allt tillgängligt data" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "ändra kortinnehavarens namn" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "ändra url för att hämta nyckel" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "hämta nyckel som anges i kortets url" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "ändra inloggningsnamnet" # originalet borde ha ett value -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "ändra sprÃ¥kinställningarna" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "ändra kortinnehavarens kön" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "ändra ett CA-fingeravtryck" # den lÃ¥ter skum -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "växla flagga för att tvinga signatur-PIN-kod" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "generera nya nycklar" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "meny för att ändra eller avblockera PIN-koden" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "validera PIN-koden och lista allt data" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Kommando> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Kommandon endast för administratör\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Administrationskommandon tillÃ¥ts\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Administrationskommandon tillÃ¥ts inte\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Ogiltigt kommando (försök med \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "kortläsaren är inte tillgänglig\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Mata in kortet och tryck Return eller \"c\" för att avbryta: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "val av openpgp misslyckades: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -716,37 +832,37 @@ "Ersätt det nuvarande kortet med det kort som har serienumret:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Tryck Return när du är färdig eller \"c\" för att avbryta: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Ange ny Admin PIN-kod: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Ange ny PIN-kod: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Ange Admin PIN-kod: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "Ange PIN-kod: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Upprepa denna PIN-kod: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN-kod repeterades inte korrekt; försök igen" # se förra kommentaren #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "kan inte öppna \"%s\"\n" @@ -755,13 +871,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "nyckeln \"%s\" hittades inte: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -864,7 +980,7 @@ msgstr "" "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "du kan inte använda %s när du är i %s-läget\n" @@ -1263,7 +1379,7 @@ msgid "Pubkey: " msgstr "Publik nyckel: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Chiffer: " @@ -1271,7 +1387,7 @@ msgid "Hash: " msgstr "Kontrollsumma: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Komprimering: " @@ -1414,415 +1530,414 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "OBS: inställningsfilen \"%s\" saknas\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "inställningsfil \"%s\": %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "läser inställningar frÃ¥n \"%s\"\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBS: %s är inte för normal användning!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "chiffertillägget \"%s\" lästes inte in pÃ¥ grund av osäkra rättigheter\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "\"%s\" är inte ett giltigt utgÃ¥ngsdatum för en signatur\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "\"%s\" är ingen giltig teckentabell\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "kunde inte tolka url till nyckelserver\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "ogiltiga flaggor för nyckelserver\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ogiltiga importeringsflaggor\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "ogiltiga importflaggor\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ogiltiga exportflaggor\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "ogiltiga exportinställningar\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ogiltiga listflaggor\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "ogiltiga listflaggor\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "visa foto-id vid signaturvalidering" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "visa policy-url:er vid signaturvalidering" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "visa alla notationer vid signaturvalidering" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "visa IETF-standardnotationer vid signaturvalidering" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "visa användarangivna notationer vid signaturvalidering" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "visa url:er till föredragna nyckelserver vid signaturvalidering" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "visa giltighet för användaridentitet vid signaturvalidering" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "visa spärrade och utgÃ¥ngna användaridentiteter i signaturvalidering" -#: g10/gpg.c:2672 -#, fuzzy +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" -msgstr "visa spärrade och utgÃ¥ngna användaridentiteter i signaturvalidering" +msgstr "visa endast den primära användaridentiteten i signaturvalidering" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "validera signaturer med PKA-data" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "öka tillit pÃ¥ signaturer med giltigt PKA-data" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ogiltiga flaggor för validering\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "ogiltiga flaggor för validering\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte ställa in exec-path till %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ogiltig auto-key-locate-lista\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "ogiltig auto-key-locate-lista\n" # Programmet skapar en avbildning (image) av minnet för att lättare kunna spÃ¥ra fel. -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s är inte tillÃ¥ten tillsammans med %s!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, 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/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "kommer inte att köra med osäkert minne pÃ¥ grund av %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 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/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "den valda chifferalgoritmen är ogiltig\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "vald sammandragsalgoritm är ogiltig\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "vald komprimeringsalgoritm är ogiltig\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "vald algoritm för certifieringssammandrag ä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/gpg.c:3121 +#: g10/gpg.c:3120 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/gpg.c:3123 +#: g10/gpg.c:3122 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/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth mÃ¥ste vara inom intervallet frÃ¥n 1 till 255\n" # Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "ogiltigt 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/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ogiltigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 1, 2 eller 3\n" # S2K har med krypteringen av hemliga nyckeln att göra -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ogiltigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "ogiltiga 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/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s fungerar ännu inte med %s\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du fÃ¥r inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "du fÃ¥r inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "du fÃ¥r inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filnamn]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filnamn]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key användaridentitet" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key användaridentitet" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key användaridentitet [kommandon]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "sändning till nyckelservern misslyckades: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "hämtning frÃ¥n nyckelservern misslyckades: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "export av nyckeln misslyckades: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "sökning pÃ¥ nyckelservern misslyckades: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "uppdatering av nyckeln frÃ¥n en nyckelserver misslyckades: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "misslyckades med att ta bort ASCII-skalet: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "misslyckades med att skapa ASCII-skal: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ogiltig kontrollsummealgoritm \"%s\"\n" @@ -1867,17 +1982,17 @@ msgstr "" "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "använder undernyckeln %s istället för primära nyckeln %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n" @@ -1906,8 +2021,9 @@ msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Syntax: gpg [flaggor] [filer]\n" @@ -2731,12 +2847,12 @@ msgid "keyring `%s' created\n" msgstr "%s: nyckelring skapad\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "nyckelblockresurs \"%s\": %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "misslyckades med att Ã¥terskapa nyckelringscache: %s\n" @@ -2785,7 +2901,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2796,12 +2912,12 @@ "korrekt validera andra användares nycklar (genom att undersöka pass,\n" "undersöka fingeravtryck frÃ¥n olika källor, etc.)\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Jag litar marginellt\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Jag litar fullständigt\n" @@ -3019,8 +3135,8 @@ msgid "Really sign? (y/N) " msgstr "Verkligen signera? (j/N) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "signeringen misslyckades: %s\n" @@ -3031,19 +3147,19 @@ "Nyckeln har endast en stump eller nyckelobjekt pÃ¥ kortet - ingen lösenfras " "att ändra.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Denna nyckel är inte skyddad.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Hemliga delar av den primära nyckeln är lagrade pÃ¥ kortet.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Nyckeln är skyddad.\n" @@ -3060,7 +3176,7 @@ "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "lösenfrasen repeterades inte korrekt; försök igen." @@ -3381,115 +3497,115 @@ msgid "Really update the preferences? (y/N) " msgstr "Vill du verkligen uppdatera inställningarna? (j/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "Spara ändringar? (j/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Avsluta utan att spara? (j/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "uppdateringen misslyckades: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 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:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Sammandrag: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Funktioner: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Nyckelserver no-modify" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Föredragen nyckelserver: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "Notationer: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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 en användaridentitet av PGP 2.x-" "typ.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(känsligt)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "skapat: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "spärrad: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "utgÃ¥nget: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "gÃ¥r ut: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "användning: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "tillit: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "giltighet: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Denna nyckel har stängts av" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "kortnummer: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3497,17 +3613,17 @@ "Observera! Den visade nyckelgiltigheten kan vara felaktig\n" "sÃ¥vida inte du startar om programmet.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "spärrad" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "utgÃ¥nget" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3516,7 +3632,7 @@ "Detta kommando kan göra att en annan användaridentitet antas\n" "vara den primära identiteten.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3525,75 +3641,75 @@ "VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto-id kan\n" " vissa versioner av PGP avvisa denna nyckel.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 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:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Vill du radera denna korrekta signatur? (j/N/a)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Vill du radera denna okända signatur? (j/N/a)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Verkligen ta bort denna självsignatur? (j/N)" # skulle lika gärna kunna heta 1 signatur va? -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "Raderade %d signatur.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "Raderade %d signaturer.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Ingenting raderat.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "ogiltigt" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Användaridentiteten \"%s\" komprimerad: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Användaridentiteten \"%s\": %d signatur borttagen\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Användaridentiteten \"%s\": %d signaturer borttagna\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "Användaridentiteten \"%s\": redan minimerad\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "Användaridentitet \"%s\": redan rensad\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3603,257 +3719,262 @@ "denna\n" " nyckel inte användas i vissa versioner av PGP.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Du fÃ¥r inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "Ange användaridentiteten för spärrnyckeln: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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.x-nyckel som spärrnyckel\n" -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "den här nyckeln har redan markerats som spärrnyckel\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VARNING: det gÃ¥r aldrig att Ã¥ngra om du utser en spärrnyckel!\n" # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad) -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Är du säker pÃ¥ att du vill använda den här nyckeln för spärrning? (j/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Tag bort markeringar frÃ¥n de hemliga nycklarna.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Välj som mest en undernyckel.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Ändrar utgÃ¥ngstid för en undernyckel.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "Ändrar giltighetstid för den primära nyckeln.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n" # Vad betyder det? -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "signeringsundernyckeln %s är redan korscertifierad\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Välj endast en användaridentitet.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hoppar över v3-självsignatur pÃ¥ användaridentiteten \"%s\"\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Ange din föredragna nyckelserver-url: " # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Är du säker pÃ¥ att du vill ersätta det? (j/N) " # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Är du säker pÃ¥ att du vill ta bort det? (j/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "Ange notationen: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "Fortsätt? (j/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "Inget användaridentitet med indexet %d\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "Inget användaridentitet med hashen %s\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "Ingen undernyckel med indexet %d\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "användaridentitet: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "signerat av din nyckel %s den %s%s%s\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Denna signatur gick ut den %s.\n" # nyckel? signatur? -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Är du säker pÃ¥ att du fortfarande vill spärra den? (j/N)" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (inte spärrbar)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "spärrad av din nyckel %s den %s\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Du är pÃ¥ väg att spärra dessa signaturer:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "användaridentiteten \"%s\" är redan spärrat\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VARNING: en signatur pÃ¥ en användaridentitet är daterad %d sekunder in i " "framtiden\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Nyckeln %s är redan spärrad.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Undernyckeln %s är redan spärrad.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, 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 %s (uid %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "inställningen \"%s\" förekommer flera gÃ¥nger\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "för mÃ¥nga chifferinställningar\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "för mÃ¥nga sammandragsinställningar\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "för mÃ¥nga komprimeringsinställningar\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "ogiltig post \"%s\" i inställningssträngen\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "skriver direkt signatur\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "skriver självsignatur\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "skriver signatur knuten till nyckeln\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ogiltig nyckelstorlek; använder %u bitar\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nyckelstorleken avrundad uppÃ¥t till %u bitar\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Signera" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "Certifiera" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Kryptera" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Autentisera" @@ -3870,110 +3991,105 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsKkAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "Möjliga Ã¥tgärder för en %s-nyckel: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "För närvarande tillÃ¥tna Ã¥tgärder: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Växla signeringsförmÃ¥gan\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Växla krypteringsförmÃ¥gan\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Växla autentiseringsförmÃ¥gan\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Färdig\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Välj vilken typ av nyckel du vill ha:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA och Elgamal (standard)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA och Elgamal (standard)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (endast signering)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (ställ in dina egna förmÃ¥gor)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (endast signering)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (endast kryptering)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (endast signering)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (endast kryptering)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (ställ in dina egna förmÃ¥gor)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (ställ in dina egna förmÃ¥gor)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA-nyckelparet kommer att ha %u bitar.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (ställ in dina egna förmÃ¥gor)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s-nycklar kan vara mellan %u och %u bitar lÃ¥nga.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Vilken nyckelstorlek vill du ha? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s nyckelstorlekar mÃ¥ste vara inom intervallet %u-%u\n" +msgid "What keysize do you want? (%u) " +msgstr "Vilken nyckelstorlek vill du ha? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Den efterfrÃ¥gade nyckelstorleken är %u bitar\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, 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:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3990,7 +4106,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:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -4006,38 +4122,38 @@ " m = signaturen blir ogiltig efter n mÃ¥nader\n" " y = signaturen blir ogiltig efter n Ã¥r\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "För hur lÃ¥ng tid ska nyckeln vara giltig? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "Signaturen är giltig hur länge? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "ogiltigt värde\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Nyckeln gÃ¥r aldrig ut\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Signaturen gÃ¥r aldrig ut\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Nyckeln gÃ¥r ut %s\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Signaturen gÃ¥r ut %s\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -4045,11 +4161,11 @@ "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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Stämmer detta? (j/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4067,44 +4183,44 @@ " \"Gustav Vasa (Brutal kung) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Namn: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ogiltigt tecken i namnet\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Namnet fÃ¥r inte börja med en siffra\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "Namnet mÃ¥ste vara Ã¥tminstone 5 tecken lÃ¥ngt\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-postadress: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "E-postadressen är ogiltig\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Ogiltigt tecken i kommentaren\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du använder teckentabellen \"%s\"\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4115,7 +4231,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ange inte e-postadressen som namn eller kommentar\n" @@ -4131,24 +4247,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnKkEeOoAa" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Rätta först felet\n" # fel kapitalisering i originalet? -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4156,12 +4272,12 @@ "Du behöver en lösenfras för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4173,7 +4289,7 @@ "om du använder detta program med flaggan \"--edit-key\".\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4185,51 +4301,51 @@ "hÃ¥rddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n" "en större chans att samla ihop en tillräcklig mängd entropidata.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Skapandet av nycklar avbröts.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver den publika nyckeln till \"%s\"\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "skrier hemliga nyckelstumpen till \"%s\"\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "ingen skrivbar publik nyckelring hittades: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n" # Flagga.. inte kommando -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4238,13 +4354,13 @@ "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta " "syfte.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" # c-format behövs inte i singularis -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4252,7 +4368,7 @@ "nyckeln är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4260,25 +4376,25 @@ "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Verkligen skapa? (j/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "misslyckades med att lagra nyckeln pÃ¥ kortet: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n" @@ -4311,248 +4427,248 @@ msgid "Keyring" msgstr "Nyckelring" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Primära nyckelns fingeravtryck:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " Undernyckelns fingeravtryck:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "Primära nyckelns fingeravtryck:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " Undernyckelns fingeravtryck:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr "Nyckelns fingeravtryck =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Kortets serienr =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "namnbyte frÃ¥n \"%s\" till \"%s\" misslyckades: %s\n" # Enligt Werner uppstÃ¥r detta om nÃ¥got gÃ¥r snett när den hemliga nyckeln uppdateras. -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VARNING: det finns 2 filer med konfidentiell information.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s är den oförändrade\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s är den nya\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Lös detta potentiella säkerhetsproblem\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "mellanlagrar nyckelringen \"%s\"\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "%lu nycklar mellanlagrade än sÃ¥ länge (%lu signaturer)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: nyckelring skapad\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "inkludera spärrade nycklar i sökresultatet" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "inkludera undernycklar vid sökning efter nyckel-id" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "ta inte bort temporärfiler efter de använts" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "hämta automatiskt nycklar vid validering av signaturer" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "respektera föredragen nyckelserver-url inställd i nyckeln" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "respektera PKA-posten inställd pÃ¥ en nyckel när nycklar hämtas" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" "VARNING: nyckelserverflaggan \"%s\" används inte pÃ¥ den här plattformen\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "inaktiverad" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "nyckeln \"%s\" hittades inte pÃ¥ nyckelservern\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "nyckeln hittades inte pÃ¥ nyckelservern\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "begär nyckeln %s frÃ¥n %s-servern %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "begär nyckeln %s frÃ¥n %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "söker efter namn frÃ¥n %s-servern %s\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "söker efter namn frÃ¥n %s\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "skickar nycken %s till %s-servern %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "skickar nyckeln %s till %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "söker efter \"%s\" frÃ¥n %s-servern %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "söker efter \"%s\" frÃ¥n %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "ingen nyckelserverÃ¥tgärd!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "VARNING: nyckelserverhanteraren frÃ¥n en annan version av GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "nyckelserver skickade inte VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "Ã¥tgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s har inte stöd för hanterarversionen %d\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "tidsgräns överstigen för nyckelserver\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "internt fel i nyckelserver\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "kommunikationsfel mot nyckelserver: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" inte ett nyckel-id: hoppar över\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "uppdaterar 1 nyckel frÃ¥n %s\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "uppdaterar %d nycklar frÃ¥n %s\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "VARNING: kunde inte hämta uri:n %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "VARNING: kunde inte tolka uri:n %s\n" @@ -4654,7 +4770,7 @@ #: g10/mainproc.c:722 msgid "WARNING: multiple plaintexts seen\n" -msgstr "" +msgstr "VARNING: multipla klartexter sedda\n" #: g10/mainproc.c:850 msgid "standalone revocation - use \"gpg --import\" to apply\n" @@ -4714,64 +4830,64 @@ msgid "[uncertain]" msgstr "[osäkert]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " även känd som \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Giltighetstiden för signaturen har upphört %s\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Giltighetstiden för signaturen gÃ¥r ut %s\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signatur, sammandragsalgoritm %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "binär" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "textläge" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "okänd" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan inte kontrollera signaturen: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "detta är inte nÃ¥gon signatur i en separat fil\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 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:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "fristÃ¥ende signatur av klassen 0x%02x\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "signatur av den gamla (PGP 2.x) typen\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "ogiltigt rotpaket hittades i proc_tree()\n" @@ -4796,9 +4912,8 @@ msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n" #: g10/misc.c:320 -#, fuzzy msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n" -msgstr "VARNING: sammandragsalgoritmen %s är förÃ¥ldrad\n" +msgstr "VARNING: Elgamal-nycklar för signering/kryptering är förÃ¥ldrade\n" #: g10/misc.c:333 #, c-format @@ -4810,59 +4925,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "VARNING: sammandragsalgoritmen %s är förÃ¥ldrad\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "insticksmodul för IDEA-kryptering är inte installerat\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "se %s för mer information\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "VARNING: sammandragsalgoritmen %s är förÃ¥ldrad\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: alternativet är förÃ¥ldrat \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VARNING: inställningen \"%s\" är förÃ¥ldrad\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "Använd \"%s%s\" istället\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "VARNING: \"%s\" är ett förÃ¥ldrat kommando - använd det inte\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Okomprimerad" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "okomprimerad|ingen" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "detta meddelande kanske inte kan användas av %s\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "tvetydlig flagga \"%s\"\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "okänd flagga \"%s\"\n" @@ -4915,11 +5035,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "kan inte hantera algoritmen %d för publika nycklar\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format 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" @@ -5005,7 +5125,7 @@ msgid "Repeat passphrase: " msgstr "Repetera lösenfrasen: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5019,61 +5139,61 @@ "en mycket stor bild, sÃ¥ blir din nyckel ocksÃ¥ väldigt stor!\n" "Försök att använda en bild som har ungefär formatet 240x288 pixlar.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Skriv JPEG-filnamnet för foto-id: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n" # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Vill du verkligen använda den? (j/N)? " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "\"%s\" är inte en JPEG-fil\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Är detta foto korrekt (j/N/a)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "ingen fotovisare inställd\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "kan inte visa foto-id!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 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. 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:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Nyckeln är ersatt" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Nyckeln har tappat sin säkerhet" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Nyckeln används inte längre" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Användaridentiteten är inte längre giltig" @@ -5094,45 +5214,45 @@ msgid "No trust value assigned to:\n" msgstr "Inget tillitsvärde tilldelat till:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " även känd som \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "Hur mycket litar du pÃ¥ att nyckeln faktiskt tillhör den angivna användaren?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = Jag vet inte eller kan inte säga nÃ¥got\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Jag litar INTE\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Jag litar förbehÃ¥llslöst\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " h = gÃ¥ tillbaka till huvudmenyn\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = hoppa över denna nyckel\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " a = avsluta\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5141,40 +5261,40 @@ "Minimum tillitsnivÃ¥ för denna nyckel är: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Vad väljer du? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "Vill du verkligen ge denna nyckel förbehÃ¥llslöst förtroende? (j/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certifikat som leder till en nyckel med förbehÃ¥llslöst förtroende:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Det finns viss information om att nyckeln tillhör den angivna " "användaren\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Denna nyckel tillhör oss\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5184,109 +5304,109 @@ "användaridentiteten. Om du *verkligen* vet vad du gör, kan du\n" "svara ja pÃ¥ nästkommande frÃ¥ga.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Vill du använda nyckeln ändÃ¥? (j/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "VARNING: Använder en nyckel som inte är betrodd!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 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:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Detta kan betyda att signaturen är förfalskad.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Obs: Denna nyckel har stängts av.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "Observera: Validerad adress för signeraren är \"%s\"\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "trustlevel justerad till FULL pÃ¥ grund av giltig PKA-info\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "trustlevel justerad till NEVER pÃ¥ grund av felaktig PKA-info\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Obs: Giltighetstiden för denna nyckel har gÃ¥tt ut!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 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:605 +#: g10/pkclist.c:606 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:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "VARNING: Vi litar INTE pÃ¥ denna nyckel!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 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" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 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:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: hoppade över: %s\n" # överhoppad? -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: hoppades över: publik nyckel finns redan\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Nuvarande mottagare:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5294,29 +5414,29 @@ "\n" "Ange användaridentiteten. Avsluta med en tom rad: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Inget sÃ¥dan användaridentitet.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "" "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Den publika nyckeln är inaktiverad.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "hoppade över: publik nyckel redan angiven\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "okänd standardmottagare \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n" @@ -5324,7 +5444,7 @@ # plural av adressee # dvs. den som meddelandet är adresserat till. # Ã…tskillnad görs mellan adressee och receiver. -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "inga giltiga adressater\n" @@ -5394,7 +5514,7 @@ # Vad? #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet misslyckades: %s\n" @@ -5421,12 +5541,12 @@ # -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:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "utdata med ett ascii-skal genomdrivet.\n" # Vad menas??? -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet misslyckades: %s\n" @@ -5445,28 +5565,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "ingen motsvarande publik nyckel: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "publika nyckeln passar inte ihop med den hemliga nyckeln!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "okänd skyddsalgoritm\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "OBS: Denna nyckel är oskyddad!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5484,33 +5604,33 @@ "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:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Välj anledning till varför nyckeln spärras:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Avbryt" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Troligen vill du välja %d här)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Anledning för spärrning: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(Ingen beskrivning angiven)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Är detta OK? (j/N) " @@ -5592,18 +5712,18 @@ msgstr "VARNING signeringsundernyckel %s har en ogiltig korscertifiering\n" # behövs verkligen c-format här? -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n" # c-format behövs inte i singularis -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -5611,7 +5731,7 @@ "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd " "klocka)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5619,23 +5739,23 @@ "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller " "felinställd klocka)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "antar felaktig signatur frÃ¥n nyckeln %s pÃ¥ grund av en okänd kritisk bit\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n" @@ -5779,12 +5899,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "tillitsdatabas: synkronisering misslyckades: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n" @@ -5829,84 +5949,85 @@ msgid "%s: trustdb created\n" msgstr "%s: tillitsdatabas skapad\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "OBS: det gÃ¥r inte att skriva till tillitsdatabasen\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ogiltig tillitsdatabas\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: fel vid uppdatering av versionspost: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: fel vid läsning av versionspost: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: fel vid skrivning av versionspost: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "tillitsdatabas: lseek misslyckades: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: detta är inte en tillitsdatabasfil\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versionspost med postnummer %lu\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ogiltig filversion %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: fel vid läsning av ledig post: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: fel vid läsning av katalogpost: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: misslyckades med att nollställa en post: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: misslyckades med att lägga till en post: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: tillitsdatabas skapad\n" #: g10/textfilter.c:147 #, c-format @@ -5957,13 +6078,21 @@ 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:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "använder tillitsmodellen %s\n" @@ -5977,121 +6106,121 @@ # It gets passed to atoi() so everything after the number is # essentially a comment and need not be translated. Either key and # uid are both NULL, or neither are NULL. */ -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "15" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ spärrad ]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ utgÃ¥nget ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ okänt ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ odefinierad ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ marginell ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ fullständig ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[förbehÃ¥llslös]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "odefinierad" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "aldrig" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "marginell" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "fullständig" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "förbehÃ¥llslös" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "publika nyckeln %s hittades inte: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 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:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "kontrollerar tillitsdatabasen\n" # Vad är detta!? -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d nycklar behandlade (%d validity counts rensade)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "hittade inga nycklar med förbehÃ¥llslöst förtroende\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "publik nyckel för förbehÃ¥llslöst betrodda nyckeln %s hittades inte\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "djup: %d giltig: %3d signerad: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6358,47 +6487,47 @@ msgstr "du har hittat ett fel i programmet ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "ja" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "jJ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "nej" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "avsluta" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "aA" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okej|ok" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "avbryt|stoppa" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "aAsS" @@ -6418,21 +6547,11 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kanske använder fel program för den här uppgiften)\n" -# notation data? -#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -#~ msgstr "" -#~ "kan inte lägga till notationer i signaturer gjorda med en v3-nyckel\n" -#~ "(PGP 2.x-typ)\n" - -#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -#~ msgstr "" -#~ "kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med " -#~ "en v3-nyckel (PGP 2.x-typ)\n" - -#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -#~ msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n" - -#~ 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" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA-nyckelparet kommer att ha %u bitar.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Admin PIN-kod" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/tr.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/tr.gmo differ diff -Nru gnupg-1.4.9/po/tr.po gnupg-1.4.10/po/tr.po --- gnupg-1.4.9/po/tr.po 2008-03-25 08:53:12.000000000 +0000 +++ gnupg-1.4.10/po/tr.po 2009-09-02 17:19:41.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2005-03-16 07:30+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -39,13 +39,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "`%s' açılamıyor: %s\n" @@ -77,9 +76,10 @@ msgid "note: random_seed file not updated\n" msgstr "bilgi: \"random_seed\" dosyası güncel deÄŸil\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "\"%s\" oluÅŸturulamıyor: %s\n" @@ -133,172 +133,218 @@ "daha fazla rasgele bayt toplayabilmesi için iÅŸletim sistemine\n" "yardımcı olun! (%d bayt daha gerekiyor)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "parmakizinin saklanması baÅŸarısız oldu: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "oluÅŸturma tarihinin saklanması baÅŸarısız oldu: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, fuzzy, c-format msgid "reading public key failed: %s\n" msgstr "anahtar okuması baÅŸarısız\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "yanıt genel anahtar verisi içermiyor\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "yanıt RSA modülü içermiyor\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "yanıt RSA genel bileÅŸenini içermiyor\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, fuzzy, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "PIN [yapılan imza: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "PIN [yapılan imza: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN eylemcisi hata döndürdü: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "CHV%d doÄŸrulaması baÅŸarısız oldu: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "yönetici komutlarına eriÅŸim yapılandırılmamış\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "karttan CHV durumu alınırken hata\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "kart kalıcı olarak kilitli!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|Yönetici PIN'i" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "PIN [yapılan imza: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "PIN [yapılan imza: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "yönetici komutlarına eriÅŸim yapılandırılmamış\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "gizli anahtar parçaları kullanım dışı\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|Yeni Yönetici PIN'i" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|Yeni PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "yeni PIN alınırken hata: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "uygulama verisi okunurken hata\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "parmakizi DO okunurken hata\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "anahtar zaten mevcut\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "mevcut anahtar konulacak\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "yeni anahtar üretiliyor\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "yeni anahtar üretiliyor\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, fuzzy, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "genel üs çok büyük (32 bitten fazla)\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "anahtarın saklanması baÅŸarısız: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "anahtar üretimi baÅŸarısızlığa uÄŸradı\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "anahtar üretimi tamamlandı (%d saniye)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, fuzzy, c-format msgid "card does not support digest algorithm %s\n" msgstr "%s imzası, %s özümleme algoritması\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "ÅŸu ana kadar oluÅŸturulan imzalar: %lu\n" -#: g10/app-openpgp.c:2140 -#, fuzzy, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "PIN [yapılan imza: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "%s eriÅŸilebilir deÄŸil - OpenPGP kartı geçersiz olabilir mi?\n" @@ -383,163 +429,225 @@ "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta " "sunucusu kullanılmış\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP anahtarı kullanılabilir deÄŸil: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "%s numaralı OpenPGP kartı saptandı\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "bu önceden betik kipinde yapılamaz\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "%s kipindeyken bu komut kullanılamaz.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "Seçiminiz? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[belirtilmedi]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "erkek" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "diÅŸi" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "belirtilmemiÅŸ" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "zorlanmadı" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "zorlandı" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "Hata: Åžimdilik sadece US-ASCII mümkün.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "Hata: \"<\" karakteri kullanılmamalı.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "Hata: Çift boÅŸluÄŸa izin verilmez.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "Kart sahibinin soyadı: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "Kart sahibinin adı: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "Hata: Ä°simler birlikte çok uzun oluyor (sınır: %d karakter).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "genel anahtarın alınacağı URL: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "Hata: URL çok uzun (sınır: %d karakter).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "`%s' anahtar zinciri oluÅŸturulurken hata: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "\"%s\" okunurken hata: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "`%s' oluÅŸturulurken hata: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "Oturum açma verisi (hesap adı): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "Özel DO verisi: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "Dil tercihleri: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "Hata: tercih dizgesinin uzunluÄŸu geçersiz.\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "Cinsiyet ((E)rkek, (D)iÅŸi veya boÅŸluk): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "Hata: yanıt geçersiz.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA parmak izi: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "Hata: biçimli parmakizi geçersiz\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "anahtar iÅŸlemi mümkün deÄŸil: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "bir OpenPGP kartı deÄŸil" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "geçerli anahtar bilgisi alınırken hata: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "Mevcut anahtar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "%u bite yuvarlandı\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "gizli anahtar bloÄŸu \"%s\" okunurken hata oluÅŸtu: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "Åžifreli anahtarın kartsız yedeÄŸi yapılsın mı? (E/h ya da Y/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "Mevcut anahtarlar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -550,139 +658,148 @@ " PIN = `%s' Admin PIN = `%s'\n" "Bunları --change-pin komutunu kullanarak deÄŸiÅŸtirmelisiniz\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) Ä°mzalama anahtarı\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) Åžifreleme anahtarı\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) Kimlik kanıtlama anahtarı\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "Seçim geçersiz.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "bilinmeyen anahtar koruma algoritması\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "anahtarın gizli parçaları kullanılabilir deÄŸil\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "\"%s\" anahtar zincirine yazarken hata oluÅŸtu: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "bu menüden çık" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "yönetici komutlarını gösterir" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "bunu gösterir" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "tüm kullanılabilir veriyi listeler" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "kart sahibinin ismini deÄŸiÅŸtirir" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "anahtarın alınacağı URL deÄŸiÅŸtirilir" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "kart URL'sinde belirtilmiÅŸ anahtarı alır" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "oturum açma ismini deÄŸiÅŸtirir" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "dil tercihlerini deÄŸiÅŸtirir" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "kart sahibinin cinsiyetini deÄŸiÅŸtirir" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "bir CA parmakizini deÄŸiÅŸtirir" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "imza zorlama PIN'i bayrağını deÄŸiÅŸtirir" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "yeni anahtarlar üretir" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "PIN deÄŸiÅŸtirmek için menü" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "Komut> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "Yöneticiye özel komut\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "Yönetici komutlarına izin verilir\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "Yönetici komutlarına izin verilmez\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 #, fuzzy msgid "card reader not available\n" msgstr "gizli anahtar kullanışsız" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Lüthen kartı yerleÅŸtirdikten sonra ya ya da iptal için 'c' tuÅŸlayın: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, fuzzy, c-format msgid "selecting openpgp failed: %s\n" msgstr "anahtar bloÄŸu silinemedi: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -692,36 +809,36 @@ " %.*s\n" "olan kartı yerleÅŸtirin.\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "Hazır olunca ya da iptal etmek için 'c' tuÅŸlayın: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "Yeni Yönetici PIN'ini girin: " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "Yeni PIN'i girin: " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "Yönetici PIN'ini girin: " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "PIN'i girin: " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "Bu PIN'i tekrarlayın: " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN doÄŸru tekrarlanmadı; tekrar deneyin" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "`%s' açılamadı\n" @@ -730,13 +847,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output seçeneÄŸi bu komutla çalışmaz\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "anahtar \"%s\" yok: %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -839,7 +956,7 @@ msgstr "" "alıcının tercihleriyle çeliÅŸen %s (%d) simetrik ÅŸifre kullanımı zorlanıyor\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" @@ -1234,7 +1351,7 @@ msgid "Pubkey: " msgstr "GenAnah: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "Åžifre: " @@ -1242,7 +1359,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "Sıkıştırma: " @@ -1379,402 +1496,402 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "BÄ°LGÄ°: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "BÄ°LGÄ°: \"%s\" öntanımlı seçenek dosyası yok\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "seçenek dosyası \"%s\": %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "\"%s\"den seçenekler okunuyor\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "BÄ°LGÄ°: %s normal kullanım için deÄŸil!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ÅŸifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "'%s' geçerli bir karakter kümesi deÄŸil\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "'%s' geçerli bir karakter kümesi deÄŸil\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "anahtar sunucusu seçenekleri geçersiz\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: liste seçenekleri geçersiz\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "liste seçenekleri geçersiz\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 #, fuzzy msgid "show all notations during signature verification" msgstr "'%s' geçerli bir karakter kümesi deÄŸil\n" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "belirtilen anahtar sunucusu adresi geçersiz\n" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 #, fuzzy msgid "show user ID validity during signature verification" msgstr "'%s' geçerli bir karakter kümesi deÄŸil\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 #, fuzzy msgid "show only the primary user ID in signature verification" msgstr "'%s' geçerli bir karakter kümesi deÄŸil\n" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d doÄŸrulama seçenekleri geçersiz\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "doÄŸrulama seçenekleri geçersiz\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, fuzzy, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d doÄŸrulama seçenekleri geçersiz\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyası oluÅŸturabilir!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i aşıyor\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullanılmaz!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent bu oturumda kullanılamaz\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 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/gpg.c:3008 +#: g10/gpg.c:3006 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/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "seçilen özümleme algoritması geçersiz\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan büyük olmalı\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den büyük olmalı\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 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/gpg.c:3127 +#: g10/gpg.c:3126 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/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "öntanımlı tercihler geçersiz\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "kiÅŸisel ÅŸifre tercihleri geçersiz\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "kiÅŸisel özümleme tercihleri geçersiz\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "kiÅŸisel sıkıştırma tercihleri geçersiz\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s, %s ile henüz çalışmıyor\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken '%1$s' ÅŸifreleme algoritması kullanılamaz\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, 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ılamaz\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, 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ılamaz\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, 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/gpg.c:3363 +#: g10/gpg.c:3365 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/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "`%s' için simetrik ÅŸifreleme baÅŸarısız: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [dosyaismi]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [dosyaismi]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key kullanıcı-kimliÄŸi" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key kullanıcı-kimliÄŸi" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullanıcı-kimliÄŸi [komutlar]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullanıcı-kimliÄŸi] [anahtar-zinciri]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "anahtar sunucusuna gönderim baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "anahtar sunucusundan alım baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "anahtar ihracı baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "anahtar sunucusunda arama baÅŸarısız: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "anahtar sunucusunda tazeleme baÅŸarısız: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "zırhın kaldırılması baÅŸarısız: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "zırhlama baÅŸarısız: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritması geçersiz\n" @@ -1819,18 +1936,18 @@ msgstr "" "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n" @@ -1856,8 +1973,9 @@ msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Kullanımı: gpg [seçenekler] [dosyalar]\n" @@ -2657,12 +2775,12 @@ msgid "keyring `%s' created\n" msgstr "`%s' anahtar zinciri oluÅŸturuldu\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, fuzzy, c-format msgid "keyblock resource `%s': %s\n" msgstr "`%s' oluÅŸturulurken hata: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "anahtar zinciri belleÄŸi yeniden oluÅŸturulurken hata: %s\n" @@ -2711,7 +2829,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d öz-imzası geçersiz kullanıcı kimliÄŸi saptandı\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2722,12 +2840,12 @@ "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n" "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = Şöyle böyle güveniyorum\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = Tamamen güveniyorum\n" @@ -2945,8 +3063,8 @@ msgid "Really sign? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "imzalama baÅŸarısız: %s\n" @@ -2957,19 +3075,19 @@ "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n" "deÄŸiÅŸtirilecek bir anahtar parolası yok.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "Bu anahtar korunmamış.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "Anahtar korunmuÅŸ.\n" @@ -2986,7 +3104,7 @@ "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "" "ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " @@ -3319,117 +3437,117 @@ msgid "Really update the preferences? (y/N) " msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? (e/H ya da y/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "gizliyi güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "Güncelleme gereÄŸi olmadığından anahtar deÄŸiÅŸmedi.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "Özümlenen: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "Özellikler: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "Anahtar sunucusu deÄŸiÅŸmez" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "Tercih edilen anahtar sunucusu: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 #, fuzzy msgid "Notations: " msgstr "Niteleme: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "" "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten " "kaldırılmış\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(duyarlı)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "oluÅŸturuldu: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "yürürlükten kaldırıldı: %s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "son kullanma tarihi: %s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "son kullanma tarihi: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "kullanımı: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "güvencesi: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "geçerliliÄŸi: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "Bu anahtar iptal edilmiÅŸti" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "kart-no: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3437,17 +3555,17 @@ "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:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "yürürlükten kaldırıldı" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "zamanaşımına uÄŸradı" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3456,7 +3574,7 @@ " farklı bir kullanıcı kimliÄŸin birincil kullanıcı kimlik olarak\n" " kabul edilmesini saÄŸlayabilirsiniz.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3465,75 +3583,75 @@ "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:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "Onu yine de eklemek istiyor musunuz? (e/H) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 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:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "Bu geçersiz imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "Hiçbir ÅŸey silinmedi.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 #, fuzzy msgid "invalid" msgstr "geçersiz zırh" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, fuzzy, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, fuzzy, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, fuzzy, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, fuzzy, c-format msgid "User ID \"%s\": already minimized\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, fuzzy, c-format msgid "User ID \"%s\": already clean\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3543,266 +3661,271 @@ " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n" " ile sonuçlanabilir.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3373 +#: g10/keyedit.c:3375 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:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 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:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediÄŸinizden emin " "misiniz? (e/H ya da y/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "Bir yardımcı anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 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:3584 +#: g10/keyedit.c:3586 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:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, fuzzy, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı deÄŸil\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, 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:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "Onu deÄŸiÅŸtirmek istediÄŸinizden emin misiniz? (e/H ya da y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "Onu silmek istediÄŸinizden emin misiniz? (e/H ya da y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 #, fuzzy msgid "Enter the notation: " msgstr "imza niteleyici: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 #, fuzzy msgid "Proceed? (y/N) " msgstr "Ãœzerine yazılsın mı? (e/H ya da y/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "%d indisli bir yardımcı anahtar yok\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "Kullanıcı kimliÄŸi: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "%s anahtarınızla %s%s%s de imzalandı\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 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:4651 +#: g10/keyedit.c:4659 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:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (yürülükten kaldırılmaz)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "%s tarafından %s de yürürlükten kaldırılmış\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 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:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "gizli anahtar yok\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, 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:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliÄŸi " "gösteriliyor\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "'%s' tercihi yinelendi\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "çok fazla ÅŸifreleme tercihi\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "çok fazla özümleme tercihi\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "çok fazla sıkıştırma tercihi\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "doÄŸrudan imza yazılıyor\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "öz-imza yazılıyor\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "anahtarı garantileyen imzayı yazıyor\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "anahtar uzunluÄŸu geçersiz; %u bit kullanılıyor\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "anahtar uzunluÄŸu %u bite yuvarlandı\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "Ä°mzalama" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "Åžifreleme" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "Kimlik kanıtlama" @@ -3815,109 +3938,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "Ä°iŞşKkçÇ" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "bir %s anahtarı için olası eylemler: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "Åžimdilik mümkün eylemler: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) Ä°mzalama yeteneÄŸini açar/kapar\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) Åžifreleme yeteneÄŸini açar/kapar\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) Kimlik kanıtlama yeteneÄŸini açar/kapar\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) Bitti\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "Lütfen istediÄŸiniz anahtarı seçiniz:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA ve ElGamal (öntanımlı)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA ve ElGamal (öntanımlı)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (yalnız imzalamak için)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (yeteneklerini belirtin)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (sadece imzalamak için)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (yalnız ÅŸifrelemek için)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (sadece imzalamak için)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (yeteneklerini belirtin)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (yeteneklerini belirtin)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA anahtar çifti %u bit olacak.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (yeteneklerini belirtin)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n" +msgid "What keysize do you want? (%u) " +msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "%u bite yuvarlandı\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3933,7 +4051,7 @@ " m = anahtar n ay geçerli\n" " y = anahtar n yıl geçerli\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3949,38 +4067,38 @@ " m = imza n ay geçerli\n" " y = imza n yıl geçerli\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "Anahtar ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, fuzzy, c-format msgid "Signature is valid for? (%s) " msgstr "Ä°mza ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "deÄŸer hatalı\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "Anahtar hep geçerli olacak\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "Ä°mza hep geçerli olacak\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "Anahtarın geçerliliÄŸi %s de bitecek.\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "Ä°mzanın geçerliliÄŸi %s de bitecek.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3988,11 +4106,11 @@ "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:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "Bu doÄŸru mu? (e/H ya da y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -4008,44 +4126,44 @@ "\t\"Fatih Sultan Mehmed (Padisah) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "Adınız ve Soyadınız: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "Ad ve soyadınızda geçersiz karakter var\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "Ad ve soyadınız bir rakamla baÅŸlamamalı\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 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:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "E-posta adresiniz: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "geçerli bir E-posta adresi deÄŸil\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "Önbilgi: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "Önbilgi alanında geçersiz karakter var\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "`%s' karakter kümesini kullanıyorsunuz.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4056,7 +4174,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 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" @@ -4072,24 +4190,24 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "AaYyEeTtKk" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 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:1838 +#: g10/keygen.c:1936 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:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "Lütfen önce hatayı düzeltin\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4097,12 +4215,12 @@ "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4114,7 +4232,7 @@ "seçeneÄŸi ile kullanarak her zaman deÄŸiÅŸtirebilirsiniz.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4127,50 +4245,50 @@ "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n" "üretecine yardımcı olur. \n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "Anahtar üretimi durduruldu.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "genel anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "gizli anahtar koçanı `%s'e yazılıyor\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, 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:3099 +#: g10/keygen.c:3285 #, 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:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4178,19 +4296,19 @@ "Bu anahtar ÅŸifreleme için kullanılamaz. Åžifreleme için yardımcı anahtarı\n" "\"--edit-key\" seçeneÄŸini kullanarak üretebilirsiniz.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, 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:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4198,26 +4316,26 @@ "anahtar bundan %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 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:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "Gerçekten oluÅŸturulsun mu? (e/H ya da y/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "anahtarın kart üzerinde saklanması baÅŸarısız: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "'%s' yedek dosyası oluÅŸturulamıyor: %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "BÄ°LGÄ°: kart anahtarının yedeklemesi '%s' e kaydedildi\n" @@ -4250,246 +4368,246 @@ msgid "Keyring" msgstr "Anahtar Zinciri" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " Anahtar parmakizi =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " Kart seri no. =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "`%s' > `%s' isim deÄŸiÅŸikliÄŸi baÅŸarısız: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s deÄŸiÅŸmeyenlerden\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s yenilerden\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "Lütfen bu güvenlik çatlağını giderin\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "%s' anahtar zinciri arabellekleniyor\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "ÅŸimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "%lu anahtar arabelleklendi (%lu imza)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: anahtar zinciri oluÅŸturuldu\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: " -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "UYARI: anahtar sunucusu seçeneÄŸi `%s' bu platformda kullanımda deÄŸil\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "iptal edildi" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "anahtar \"%s\" anahtar sunucusunda yok\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "anahtar, anahtar sunucusunda yok\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "%s anahtarı %s adresinden isteniyor\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, fuzzy, c-format msgid "searching for names from %s server %s\n" msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, fuzzy, c-format msgid "searching for names from %s\n" msgstr "%2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "%s anahtarı %s adresine gönderiliyor\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "%2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "bir anahtar sunucusu eylemi yok!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "UYARI: GnuPG'nin baÅŸka bir sürümünün anahtar sunucusu eylemcisi (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "anahtar sunucusu VERSION göndermiyor\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneÄŸini kullanın)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "harici anahtar sunucusu çaÄŸrıları bu kurulumda desteklenmiyor\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "`%s' anahtar sunucusu ÅŸeması için eylemci yok\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "`%s' eylemi `%s' anahtar sunucusu ÅŸeması ile desteklenmiyor\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, fuzzy, c-format msgid "%s does not support handler version %d\n" msgstr "gpgkeys_%s %d sürümü eylemciyi desteklemiyor\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "anahtar sunucusu zamanaşımına uÄŸradı\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "anahtar sunucusu iç hatası\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "anahtar sunucusuyla iletiÅŸim hatası: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" bir anahtar kimliÄŸi deÄŸil: atlanıyor\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 anahtar %s adresinden tazeleniyor\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d anahtar %s adresinden tazeleniyor\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, fuzzy, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, fuzzy, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n" @@ -4647,62 +4765,62 @@ msgid "[uncertain]" msgstr "[şüpheli]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " nam-ı diÄŸer \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "Bu imzanın geçerliliÄŸi %s de bitti.\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "Bu imzanın geçerliliÄŸi %s de bitecek.\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s imzası, %s özümleme algoritması\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "ikili" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "metinkipi" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "bilinmeyen" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "Ä°mza kontrol edilemedi: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "bir bağımsız imza deÄŸil\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "0x%02x sınıfı tek başına imza\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "eski stil (PGP 2.x) imza\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() içinde geçersiz kök paket saptandı\n" @@ -4741,59 +4859,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA ÅŸifre eklentisi yok\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, fuzzy, c-format msgid "please see %s for more information\n" msgstr " b = Daha fazla bilgi gerekli\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "gpg-agent bu oturumda kullanılamaz\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: \"%s\" seçeneÄŸi kullanımdan kaldırılmak üzere.\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "UYARI: %s seçeneÄŸi kullanımdan kaldırılmak üzere.\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "lütfen yerine \"%s%s\" kullanınız\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "UYARI: %s seçeneÄŸi kullanımdan kaldırılmak üzere.\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "Sıkıştırılmamış" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "Sıkıştırılmamış|yok" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "bu ileti %s tarafından kullanılamayabilir\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "`%s' seçeneÄŸi belirsiz\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "`%s' seçeneÄŸi bilinmiyor\n" @@ -4846,11 +4969,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "%d genel anahtar algoritması kullanılamadı\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "UYARI: simetrik ÅŸifreli oturum anahtarı potansiyel olarak güvensiz\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d tipi alt paket kritik bit kümesine sahip\n" @@ -4936,7 +5059,7 @@ msgid "Repeat passphrase: " msgstr "Tekrar: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4950,58 +5073,58 @@ "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n" "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "Foto kimliÄŸi için JPEG dosya ismini giriniz: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "JPEG dosyası `%s' açılamıyor: %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H ya da y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "'%s' bir JPEG dosyası deÄŸil\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "Bu foto doÄŸru mu? (e/H/ç)? " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "foto kimliÄŸi gösterilemiyor!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "BelirtilmiÅŸ bir neden yok" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "Anahtarın yerine baÅŸkası konulmuÅŸ ve iptal edilmiÅŸtir" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "Anahtar tehlikede" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "Anahtar artık kullanılmayacak" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "Kullanıcı kimliÄŸi artık geçersiz" @@ -5021,45 +5144,45 @@ msgid "No trust value assigned to:\n" msgstr "Güven deÄŸeri belirtilmemiÅŸ:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " namı-diÄŸer \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" "%s: Bu anahtarın gerçekten sahibine ait olduÄŸuna dair bir belirti yok\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = bilmiyorum, kem küm\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = güvence vermem\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Son derece güveniyorum\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = ana menüye dön\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " a = bu anahtarı atla\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " ç = çık\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -5068,43 +5191,43 @@ "Bu anahtar için asgari güvence seviyesi: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "Kararınız? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "" "Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz? (e/H ya da " "y/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" "%s: Bu anahtarın gerçekten ismi belirtilen ÅŸahsa ait olduÄŸuna dair bir " "belirti yok\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" "%s: Bu anahtarın gerçekten ismi belirtilen ÅŸahsa ait olduÄŸuna dair sınırlı " "bir belirti var\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "Bu anahtarın ismi belirtilen ÅŸahsa ait olduÄŸu umuluyor\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "Bu anahtar bizim\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -5114,110 +5237,110 @@ "olduÄŸu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n" "sonraki soruya da evet cevabı verebilirsiniz.\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma " "anahtarı mevcut deÄŸil)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " Bu imza sahte anlamına gelebilir.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "Bilgi: Bu anahtar iptal edildi.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuÅŸtu!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Bu imzanın sahibine ait olduÄŸuna dair bir belirti yok.\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " Bu imza SAHTE olabilir.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla " "sertifikalanmamış!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Bu imzanın sahibine ait olduÄŸu kesin deÄŸil.\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: atlandı: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: atlandı: genel anahtar zaten var\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "Bir kullanıcı kimliÄŸi belirtmediniz. (\"-r\" kullanabilirsiniz)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "Åžimdiki alıcılar:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5225,33 +5348,33 @@ "\n" "Kullanıcı kimliÄŸini girin. BoÅŸ bir satır iÅŸlemi sonlandırır:" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "Böyle bir kullanıcı kimliÄŸi yok.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "Genel anahtar iptal edildi.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "atlandı: genel anahtar zaten belirtilmiÅŸ\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: atlandı: genel anahtar iptal edildi\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "geçerli adresler yok\n" @@ -5318,7 +5441,7 @@ msgstr "BÄ°LGÄ°: anahtar yürürlükten kaldırılmıştı" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet baÅŸarısız: %s\n" @@ -5342,11 +5465,11 @@ "Bu imza için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? (e/H ya " "da y/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "ASCII zırhlı çıktı istendi.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet baÅŸarısız: %s\n" @@ -5365,30 +5488,30 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "gizli anahtar \"%s\" yok: %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "karşılığı olan genel anahtar yok: `%s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "genel anahtar gizli anahtarla uyuÅŸmuyor!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "" "Bu anahtar için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? (e/H " "ya da y/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "bilinmeyen sıkıştırma algoritması\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "BÄ°LGÄ°: Bu anahtar korunmamış!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5406,34 +5529,34 @@ "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n" "bir kasada da muhafaza edebilirsiniz.\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "Ä°ptal" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Burada %d seçtiÄŸiniz varsayılıyor)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" "Ä°steÄŸe baÄŸlı açıklamayı girebilirsiniz; BoÅŸ bir satır iÅŸlemi sonlandırır:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "Yürürlükten kaldırma sebebi: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(açıklama verilmedi)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "Bu tamam mı? (e/H ya da y/N) " @@ -5512,24 +5635,24 @@ msgstr "" "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" "anahtar %s %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat problemi)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" @@ -5537,25 +5660,25 @@ "anahtar %s bundan %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "BÄ°LGÄ°: %s imza anahtarının kullanım süresi %s sularında dolmuÅŸ\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından " "kaynaklandığı sanılıyor\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "" "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" @@ -5695,12 +5818,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "güvence veritabanı: eÅŸzamanlama baÅŸarısız: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "güvence veritabanı %lu kaydı: eriÅŸim baÅŸarısız: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "güvence veritabanı %lu kaydı: yazma baÅŸarısız (n=%d): %s\n" @@ -5744,85 +5867,85 @@ msgid "%s: trustdb created\n" msgstr "%s: güvence veritabanı oluÅŸturuldu\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "BÄ°LGÄ°: güvence veritabanına yazılamıyor\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: güvence veritabanı geçersiz\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nitelemeli tablo oluÅŸturulamadı: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: sürüm kaydının okunmasında hata: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: sürüm kaydının yazılmasında hata: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "güvence veritabanı: eriÅŸim baÅŸarısız: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "güvence veritabanı: okuma baÅŸarısız (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: bir güvence veritabanı dosyası deÄŸil\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: dosya sürümü %d geçersiz\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: serbest kaydı okuma hatası: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: dizin kaydını yazma hatası: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: kayıt sıfırlama baÅŸarısız: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: kayıt ekleme baÅŸarısız: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "" -"güvence veritabanı bozulmuÅŸ; lütfen \"gpg --fix-trustdb\" çalıştırın.\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: güvence veritabanı oluÅŸturuldu\n" #: g10/textfilter.c:147 #, c-format @@ -5869,122 +5992,130 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "güvence veritabanının %lu. kaydı %d istek türünde deÄŸil\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli " "varsayılıyor\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "%s güvence modeli kullanılıyor\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[yürürlükten kaldırıldı] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[süresi doldu] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[bilinmeyen]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[tanımsız]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[şöyle böyle]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[tamamen]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[son derece]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "tanımsız" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "asla " -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "şöyle böyle" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "tamamen" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "son derece" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, 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:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "genel anahtar %s yok: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "lütfen bir --check-trustdb yapın\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "güvence veritabanı denetleniyor\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "son derece güvenli bir anahtar yok\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "son derece güvenli %s için genel anahtar yok\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5992,7 +6123,7 @@ "derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, " "%du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6253,47 +6384,47 @@ msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "evet" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "eE" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "hayır" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "hH" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "çık" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "çÇ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "tamam|tamam" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "iptal|iptal" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "tT" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "iÄ°" @@ -6315,6 +6446,16 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA anahtar çifti %u bit olacak.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "" +#~ "güvence veritabanı bozulmuÅŸ; lütfen \"gpg --fix-trustdb\" çalıştırın.\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|Yönetici PIN'i" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/zh_CN.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/zh_CN.gmo differ diff -Nru gnupg-1.4.9/po/zh_CN.po gnupg-1.4.10/po/zh_CN.po --- gnupg-1.4.9/po/zh_CN.po 2008-03-25 08:53:12.000000000 +0000 +++ gnupg-1.4.10/po/zh_CN.po 2009-09-02 17:19:42.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.7\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" "PO-Revision-Date: 2007-11-26 13:41+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) " msgstr "命令> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "仅供管ç†å‘˜ä½¿ç”¨çš„命令\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "ä¸å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(å°è¯•â€œhelpâ€)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "读å¡å™¨ä¸å¯ç”¨\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "请æ’入智能å¡å¹¶å›žè½¦ï¼Œæˆ–输入‘c’æ¥å–消：" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "选择 OpenPGP 时失败：%s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -690,36 +807,36 @@ "请å–出当å‰çš„智能å¡ï¼Œå¹¶æ’入有下列åºåˆ—å·çš„智能å¡ï¼š\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "就绪åŽè¯·å›žè½¦ï¼Œæˆ–输入‘c’å–消" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "输入新的管ç†å‘˜ PIN：" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "输入新的 PIN：" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "输入管ç†å‘˜ PIN：" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "输入 PIN：" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "å†æ¬¡è¾“入此 PIN：" -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "无法打开‘%s’\n" @@ -728,13 +845,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中ä¸èµ·ä½œç”¨\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找ä¸åˆ°ï¼š%s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -830,7 +947,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "强行使用的 %s (%d)对称加密算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "您ä¸è¯¥å°† %s 用于 %s 模å¼ä¸­\n" @@ -1219,7 +1336,7 @@ msgid "Pubkey: " msgstr "公钥：" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "对称加密：" @@ -1227,7 +1344,7 @@ msgid "Hash: " msgstr "散列：" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "压缩：" @@ -1360,397 +1477,397 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "注æ„：旧å¼çš„默认é…置文件‘%s’已被忽略\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注æ„：没有默认é…置文件‘%s’\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "é…置文件‘%s’：%s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读å–选项\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注æ„：一般情况下ä¸ä¼šç”¨åˆ° %sï¼\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模å—‘%s’因为æƒé™ä¸å®‰å…¨è€Œæœªè¢«è½½å…¥\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ç­¾å过期日期\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„字符集\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "无法解æžå…¬é’¥æœåŠ¡å™¨ URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "验è¯ç­¾å时显示照片标识" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "验è¯ç­¾å时显示策略 URL" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "验è¯ç­¾å时显示所有注记" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "验è¯ç­¾å时显示 IETF 标准注记" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "验è¯ç­¾å时显示用户æ供的注记" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "验è¯ç­¾å时显示首选公钥æœåŠ¡å™¨ URL" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "验è¯ç­¾å时显示用户标识的有效性" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "验è¯å¯†é’¥æ—¶æ˜¾ç¤ºå·²åŠé”€æˆ–已过期的å­é’¥" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "在签å验è¯ä¸­åªæ˜¾ç¤ºä¸»ç”¨æˆ·æ ‡è¯†" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "使用 PKA æ•°æ®éªŒè¯ç­¾å的有效性" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "æå‡å¸¦æœ‰æœ‰æ•ˆ PKA æ•°æ®çš„ç­¾å的信任度" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把è¿è¡Œè·¯å¾„è®¾æˆ %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s：%d：无效的 auto-key-locate 清å•\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "无效的 auto-key-locate 清å•\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "警告：程åºå¯èƒ½ä¼šåˆ›å»ºæ ¸å¿ƒå†…存转储ï¼\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ä¸å¯ä¸Ž %s 并用\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无æ„义ï¼\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "注æ„：%s 本版本中ä¸å¯ç”¨\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "ä¸ä¼šåœ¨å†…å­˜ä¸å®‰å…¨çš„情况下è¿è¡Œï¼ŒåŽŸå› æ˜¯ %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您åªæœ‰åœ¨ --pgp2 模å¼ä¸‹æ‰èƒ½åšåˆ†ç¦»å¼æˆ–明文签å\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模å¼ä¸‹æ—¶ï¼Œä¸èƒ½åŒæ—¶ç­¾å和加密\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "å¯ç”¨ --pgp2 时您应该åªä½¿ç”¨æ–‡ä»¶ï¼Œè€Œéžç®¡é“\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†æŠ¥æ–‡éœ€è¦ IDEA 算法\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的è¯ä¹¦æ•£åˆ—算法无效\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "需è¦çš„完全å¯ä¿¡ç­¾å数一定è¦å¤§äºŽ 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "需è¦çš„勉强å¯ä¿¡ç­¾å数一定è¦å¤§äºŽ 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大验è¯æ·±åº¦ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 255 之间\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验è¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 0，1，2 或 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最å°éªŒè¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 1，2 或 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注æ„：强烈ä¸å»ºè®®ä½¿ç”¨ç®€å•çš„ S2K 模å¼(0)\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模å¼ï¼›å¿…须是 0，1 或 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s å°šä¸èƒ½å’Œ %s 并用\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’对称加密算法\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’散列算法\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’压缩算法\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "åˆå§‹åŒ–信任度数æ®åº“失败：%s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [文件å]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [文件å]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [文件å]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件å]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric -encrypt\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [文件å]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件å]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件å]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric --sign -encrypt\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件å]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [文件å]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [文件å]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æŽ¥æ”¶å¤±è´¥ï¼š%s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "æœå¯»å…¬é’¥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æ›´æ–°å¤±è´¥ï¼š%s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII å°è£…失败：%s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII å°è£…失败：%s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" @@ -1794,17 +1911,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公钥 %s 没有相对应的ç§é’¥â€•â€•å¿½ç•¥\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用å­é’¥ %s 而éžä¸»é’¥ %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "密钥 %s：无相应公钥的ç§é’¥â€•â€•å·²è·³è¿‡\n" @@ -1830,8 +1947,9 @@ msgstr "用法：gpgv [选项] [文件] (用 -h 求助)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "语法：gpg [选项] [文件]\n" @@ -2601,12 +2719,12 @@ msgid "keyring `%s' created\n" msgstr "钥匙环‘%s’已建立\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "密钥å—资æºâ€˜%s’：%s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "é‡æ–°å»ºç«‹é’¥åŒ™çŽ¯ç¼“存失败： %s\n" @@ -2655,7 +2773,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "检测到 %d 个没有有效自身签å的用户标识\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2666,12 +2784,12 @@ "查\n" "指纹等)？\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" @@ -2878,8 +2996,8 @@ msgid "Really sign? (y/N) " msgstr "真的è¦ç­¾åå—？(y/N)" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "ç­¾å时失败： %s\n" @@ -2888,19 +3006,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "åªæœ‰å ä½å¯†é’¥ï¼Œæˆ–者密钥存储在智能å¡ä¸Šâ€”—没有密ç å¯ä»¥æ›´æ”¹ã€‚\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "这把密钥没有被ä¿æŠ¤ã€‚\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "主钥的ç§é’¥éƒ¨åˆ†æ— æ³•å–用。\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "主钥的ç§é’¥éƒ¨åˆ†å­˜å‚¨åœ¨æ™ºèƒ½å¡ä¸Šã€‚\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "密钥å—ä¿æŠ¤ã€‚\n" @@ -2917,7 +3035,7 @@ "输入è¦ç»™è¿™æŠŠç§é’¥ç”¨çš„新密ç ã€‚\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "密ç å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" @@ -3226,136 +3344,136 @@ msgid "Really update the preferences? (y/N) " msgstr "真的è¦æ›´æ–°é¦–选项å—？(y/N)" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "è¦ä¿å­˜å˜åŠ¨å—？(y/N)" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "è¦ä¸ä¿å­˜è€Œç¦»å¼€å—？(y/N)" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "æ›´æ–°ç§é’¥å¤±è´¥ï¼š%s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "密钥没有å˜åŠ¨æ‰€ä»¥ä¸éœ€è¦æ›´æ–°ã€‚\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "公钥æœåŠ¡å™¨ä¸å¯å˜é€ " -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "首选公钥æœåŠ¡å™¨ï¼š" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "注记：" -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x æ ·å¼çš„用户标识没有首选项。\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "此密钥已于 %s 被 %s 密钥 %s 所åŠé”€\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥å¯è¢« %s 密钥 %s åŠé”€" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr " (æ•æ„Ÿçš„)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "å·²åŠé”€ï¼š%s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "å¯ç”¨äºŽï¼š%s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "这把密钥已ç»è¢«ç¦ç”¨" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "å¡å·ï¼š" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注æ„，在您é‡å¯ç¨‹åºä¹‹å‰ï¼Œæ˜¾ç¤ºçš„密钥有效性未必正确，\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "å·²åŠé”€" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3364,74 +3482,74 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加照片标识å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP ä¸èƒ½è¯†åˆ«è¿™æŠŠå¯†é’¥ã€‚\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定ä»ç„¶æƒ³è¦å¢žåŠ å—？(y/N)" -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您ä¸å¯ä»¥æŠŠç…§ç‰‡æ ‡è¯†å¢žåŠ åˆ° PGP2 æ ·å¼çš„密钥里。\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签åå—？(y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签åå—？(y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签åå—？(y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "真的è¦åˆ é™¤è¿™ä¸ªè‡ªèº«ç­¾åå—？(y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签å。\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签å。\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "无效" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "用户标识“%sâ€æ— ç”¨éƒ¨åˆ†è¢«æ¸…除：%s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "用户标识“%sâ€ï¼š%d 个签å被清除\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "用户标识“%sâ€ï¼š%d 个签å被清除\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "用户标识“%sâ€ï¼šå·²ç»æœ€å°åŒ–\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "用户标识“%sâ€ï¼šæ— ç”¨éƒ¨åˆ†å·²æ¸…除\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3440,255 +3558,260 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加指定åŠé”€è€…å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您ä¸å¯ä»¥ä¸º PGP 2.x æ ·å¼çš„密钥添加指定åŠé”€è€…。\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定åŠé”€è€…的用户标识：" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 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:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个åŠé”€è€…\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将æŸæŠŠå¯†é’¥æŒ‡æ´¾ä¸ºæŒ‡å®šåŠé”€è€…çš„æ“作无法撤销ï¼\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定è¦å°†è¿™æŠŠå¯†é’¥è®¾ä¸ºæŒ‡å®šåŠé”€è€…å—？(y/N)：" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "请从ç§é’¥ä¸­åˆ é™¤é€‰æ‹©ã€‚\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "请至多选择一个å­é’¥ã€‚\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "å°†è¦å˜æ›´å­é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "å°†è¦å˜æ›´ä¸»é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "您ä¸èƒ½å˜æ›´ v3 密钥的使用期é™\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "在ç§é’¥çŽ¯é‡Œæ²¡æœ‰ç›¸åº”çš„ç­¾å\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "ç­¾åçš„å­é’¥ %s å·²ç»äº¤å‰éªŒè¯\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "å­é’¥ %s ä¸ç­¾å，因此ä¸éœ€è¦äº¤å‰éªŒè¯\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%sâ€çš„ v3 自身签å\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥æœåŠ¡å™¨çš„ URL：" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定è¦æ›¿æ¢å®ƒå—？(y/N)" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定è¦åˆ é™¤å®ƒå—？(y/N)" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "输入注记：" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "继续？(y/N)" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "没有散列值为 %s 的用户标识\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "没有索引为 %d çš„å­é’¥\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%sâ€\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s%s ç­¾å\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (ä¸å¯å¯¼å‡º)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签å已在 %s 过期。\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您ä»ç„¶æƒ³è¦åŠé”€å®ƒå—？(y/N)" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "è¦ä¸ºè¿™ä»½ç­¾å生æˆä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已ç»ä¸ºè¿™äº›å¯†é’¥ %s 上的这些用户标识添加签å：\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (ä¸å¯åŠé”€)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s åŠé”€\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "您正在åŠé”€è¿™äº›ç­¾å：\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "真的è¦ç”ŸæˆåŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "没有ç§é’¥\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%sâ€å·²ç»è¢«åŠé”€ã€‚\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签å的日期标记为 %d 秒åŽçš„未æ¥\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "密钥 %s 已被åŠé”€ã€‚\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "å­é’¥ %s 已被åŠé”€ã€‚\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大å°ä¸º %ld，属于密钥 %s，用户标识 %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "首选项‘%s’é‡å¤\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "太多对称加密算法首选项\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "太多散列算法首选项\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "太多首选压缩算法\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "首选项字符串里有无效项‘%s’\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "正在写入直接签å\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "正在写入自身签å\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "正在写入密钥绑定签å\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "密钥尺寸无效：改用 %u ä½\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "密钥尺寸èˆå…¥åˆ° %u ä½\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "ç­¾å" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "验è¯" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "加密" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "认è¯" @@ -3701,109 +3824,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 密钥å¯èƒ½çš„æ“作：" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "ç›®å‰å…许的æ“作：" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 选择是å¦ç”¨äºŽç­¾å\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 选择是å¦ç”¨äºŽåŠ å¯†\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 选择是å¦ç”¨äºŽè®¤è¯\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完æˆ\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "请选择您è¦ä½¿ç”¨çš„密钥ç§ç±»ï¼š\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA å’Œ ElGamal (默认)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA å’Œ ElGamal (默认)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (仅用于签å)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (自定义用途)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (仅用于签å)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (仅用于加密)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (仅用于签å)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (仅用于加密)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (自定义用途)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (自定义用途)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA 密钥对会有 %u ä½ã€‚\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s 密钥长度应在 %u ä½ä¸Ž %u ä½ä¹‹é—´ã€‚\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "您想è¦ç”¨å¤šå¤§çš„密钥尺寸？(%u)" -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s 密钥尺寸必须在 %u 与 %u é—´\n" +msgid "What keysize do you want? (%u) " +msgstr "您想è¦ç”¨å¤šå¤§çš„密钥尺寸？(%u)" -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "您所è¦æ±‚的密钥尺寸是 %u ä½\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "èˆå…¥åˆ° %u ä½\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3819,7 +3937,7 @@ " m = 密钥在 n 月åŽè¿‡æœŸ\n" " y = 密钥在 n å¹´åŽè¿‡æœŸ\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3835,38 +3953,38 @@ " m = ç­¾å在 n 月åŽè¿‡æœŸ\n" " y = ç­¾å在 n å¹´åŽè¿‡æœŸ\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "密钥的有效期é™æ˜¯ï¼Ÿ(0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "ç­¾å的有效期é™æ˜¯å¤šä¹…？(%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "无效的数值\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "密钥永远ä¸ä¼šè¿‡æœŸ\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "ç­¾å永远ä¸ä¼šè¿‡æœŸ\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "密钥于 %s 过期\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "ç­¾å于 %s 过期\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3874,11 +3992,11 @@ "您的系统无法显示 2038 年以åŽçš„日期。\n" "ä¸è¿‡ï¼Œå®ƒå¯ä»¥æ­£ç¡®å¤„ç† 2106 年之å‰çš„年份。\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "以上正确å—？(y/n)" -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3894,44 +4012,44 @@ " “Heinrich Heine (Der Dichter) â€\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "真实姓å：" -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "姓åå«æœ‰æ— æ•ˆçš„字符\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "姓åä¸å¯ä»¥ç”¨æ•°å­—开头\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "姓å至少è¦æœ‰äº”个字符长\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "电å­é‚®ä»¶åœ°å€ï¼š" -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "电å­é‚®ä»¶åœ°å€æ— æ•ˆ\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "注释：" -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "注释å«æœ‰æ— æ•ˆçš„字符\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3942,7 +4060,7 @@ " “%sâ€\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "请ä¸è¦æŠŠç”µå­é‚®ä»¶åœ°å€æ”¾è¿›æ‚¨çš„真实姓å或注释里\n" @@ -3957,23 +4075,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "更改姓å(N)ã€æ³¨é‡Š(C)ã€ç”µå­é‚®ä»¶åœ°å€(E)或退出(Q)？" -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "更改姓å(N)ã€æ³¨é‡Š(C)ã€ç”µå­é‚®ä»¶åœ°å€(E)或确定(O)/退出(Q)？" -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "请先改正错误\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3981,12 +4099,12 @@ "您需è¦ä¸€ä¸ªå¯†ç æ¥ä¿æŠ¤æ‚¨çš„ç§é’¥ã€‚\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -3998,7 +4116,7 @@ "å†æ¬¡æ‰§è¡Œè¿™ä¸ªç¨‹åºï¼Œå¹¶ä¸”使用“--edit-keyâ€é€‰é¡¹å³å¯ã€‚\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4008,50 +4126,50 @@ "我们需è¦ç”Ÿæˆå¤§é‡çš„éšæœºå­—节。这个时候您å¯ä»¥å¤šåšäº›ç事(åƒæ˜¯æ•²æ‰“键盘ã€ç§»åŠ¨\n" "é¼ æ ‡ã€è¯»å†™ç¡¬ç›˜ä¹‹ç±»çš„)，这会让éšæœºæ•°å­—å‘生器有更好的机会获得足够的熵数。\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "密钥生æˆå·²å–消。\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "正在将公钥写至`%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "å‘‘%s’写入ç§é’¥å ä½ç¬¦\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "正在将ç§é’¥å†™è‡³`%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "找ä¸åˆ°å¯å†™çš„公钥钥匙环：%s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "找ä¸åˆ°å¯å†™çš„ç§é’¥é’¥åŒ™çŽ¯ï¼š%s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "写入公钥钥匙环‘%s’时å‘生错误： %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "写入ç§é’¥é’¥åŒ™çŽ¯â€˜%s’时å‘生错误： %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "公钥和ç§é’¥å·²ç»ç”Ÿæˆå¹¶ç»ç­¾å。\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4059,42 +4177,42 @@ "请注æ„这把密钥还ä¸èƒ½ç”¨æ¥åŠ å¯†ï¼Œæ‚¨å¿…须先用“--edit-keyâ€æŒ‡ä»¤\n" "生æˆç”¨äºŽåŠ å¯†çš„å­é’¥ã€‚\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "生æˆå¯†é’¥å¤±è´¥ï¼š%s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "注æ„：为 v3 密钥生æˆå­é’¥ä¼šå¤±åŽ» OpenPGP 兼容性\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "真的è¦å»ºç«‹å—？(y/N)" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "å‘智能å¡ä¸Šå­˜å‚¨å¯†é’¥æ—¶å¤±è´¥ï¼š%s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "ä¸èƒ½åˆ›å»ºå¤‡ä»½æ–‡ä»¶â€˜%s’：%s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "注æ„：智能å¡å¯†é’¥çš„备份已ä¿å­˜åˆ°â€˜%s’\n" @@ -4127,246 +4245,246 @@ msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "主钥指纹：" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr "å­é’¥æŒ‡çº¹ï¼š" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " 主钥指纹：" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " å­é’¥æŒ‡çº¹ï¼š" # use tty -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr "密钥指纹 =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "å¡åºåˆ—å· =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "将‘%s’é‡å‘½å为‘%s’时失败：%s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "警告：两个文件存在有互相矛盾的信æ¯ã€‚\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s 是没有改å˜çš„那一个\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s 是新的那一个\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "请修补这个å¯èƒ½çš„安全性æ¼æ´ž\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "缓存钥匙环‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "ç›®å‰å·²ç¼“å­˜ %lu 把密钥(%lu 份签å)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "缓存了 %lu 把密钥(%lu 份签å)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s：钥匙环已建立\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "在æœç´¢ç»“果中包å«å·²åŠé”€çš„密钥" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "按钥匙å·æœç´¢æ—¶åŒ…å«å­é’¥" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "å‘公钥æœåŠ¡å™¨è¾…助程åºä¼ é€’æ•°æ®æ—¶ä½¿ç”¨ä¸´æ—¶æ–‡ä»¶" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "ä¸åˆ é™¤ä½¿ç”¨è¿‡çš„临时文件" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "验è¯ç­¾å时自动下载密钥" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "使用密钥中指定的首选公钥æœåŠ¡å™¨ URL" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "获å–密钥时使用密钥上的 PKA 记录" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告：公钥æœåŠ¡å™¨é€‰é¡¹â€˜%s’在此平å°ä¸Šæ²¡æœ‰è¢«ä½¿ç”¨\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "å·²ç¦ç”¨" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥æœåŠ¡å™¨åè®®(us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥â€œ%sâ€\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s æœåŠ¡å™¨ %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "在 %s æœåŠ¡å™¨ %s 上æœç´¢åå­—\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "在 %s 上æœç´¢åå­—\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s æœåŠ¡å™¨ %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s æœåŠ¡å™¨ %s 上\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s 上\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "公钥æœåŠ¡å™¨æ— åŠ¨ä½œï¼\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告：处ç†å…¬é’¥æœåŠ¡å™¨çš„程åºæ¥è‡ªä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "公钥æœåŠ¡å™¨æœªå‘é€ VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥æœåŠ¡å™¨(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本ä¸æ”¯æŒå¤–部调用公钥æœåŠ¡å™¨\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处ç†â€˜%s’公钥æœåŠ¡å™¨çš„程åº\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’æ“作ä¸ä¸ºâ€˜%s’公钥æœåŠ¡å™¨æ‰€æ”¯æŒ\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s ä¸æ”¯æŒå¯¹ç‰ˆæœ¬ %d 的处ç†\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "公钥æœåŠ¡å™¨è¶…æ—¶\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "公钥æœåŠ¡å™¨å†…部错误\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥æœåŠ¡å™¨é€šè®¯é”™è¯¯ï¼š%s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼šè·³è¿‡\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "è­¦å‘Šï¼šæ— æ³•èŽ·å– URI %s：%s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "ä¸èƒ½è§£æž URI %s\n" @@ -4518,62 +4636,62 @@ msgid "[uncertain]" msgstr "[ä¸ç¡®å®š]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " 亦å³â€œ%sâ€" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "这份签å已于 %s 过期。\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "这份签å在 %s 过期。\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s ç­¾å，散列算法 %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "二进制" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "文本模å¼" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "无法检查签å：%s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "ä¸æ˜¯ä¸€ä»½åˆ†ç¦»çš„ç­¾å\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告：检测到多é‡ç­¾å。åªæ£€æŸ¥ç¬¬ä¸€ä¸ªç­¾å。\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等级 0x%02x 的独立签å\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "æ—§å¼(PGP 2.x)ç­¾å\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中检测到无效的根包\n" @@ -4612,59 +4730,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "警告：使用试验性质的散列算法 %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "警告：ä¸å»ºè®®ä½¿ç”¨æ•£åˆ—算法 %s\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA 算法æ’件ä¸å­˜åœ¨\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "请å‚è§ %s 以得到更多信æ¯ã€‚\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "警告：ä¸å»ºè®®ä½¿ç”¨æ•£åˆ—算法 %s\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "注æ„：%s 本版本中ä¸å¯ç”¨\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d：ä¸å»ºè®®ä½¿ç”¨è¯¥é€‰é¡¹â€œ%sâ€\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "警告：“%sâ€é€‰é¡¹å·²ä¸å»ºè®®ä½¿ç”¨\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "请以“%s%sâ€ä»£æ›¿\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "警告：“%sâ€å‘½ä»¤å·²ä¸å»ºè®®ä½¿ç”¨â€”—ä¸è¦ä½¿ç”¨å®ƒ\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "ä¸åŽ‹ç¼©" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "未压缩|æ— " -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "%s 也许ä¸èƒ½ä½¿ç”¨è¿™ä¸ªæŠ¥æ–‡\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "有歧义的选项‘%s’\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "未知的选项 '%s'\n" @@ -4716,11 +4839,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "无法æ“作公钥算法 %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "警告：潜在ä¸å®‰å…¨çš„对称加密会è¯å¯†é’¥\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的å­åŒ…设定了关键ä½\n" @@ -4804,7 +4927,7 @@ msgid "Repeat passphrase: " msgstr "请å†è¾“入一次密ç ï¼š" -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4817,58 +4940,58 @@ "片会被存放在您的公钥里。如果您挑了éžå¸¸å¤§çš„图片的è¯ï¼Œæ‚¨çš„密钥也会å˜å¾—éž\n" "常大ï¼è¯·å°½é‡æŠŠå›¾ç‰‡å°ºå¯¸æŽ§åˆ¶åœ¨240x288å·¦å³ï¼Œè¿™æ˜¯ä¸ªç†æƒ³çš„尺寸。\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "输入è¦å½“作相片标识的JPEG文件å： " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "无法打开 JPEG 文件‘%s’：%s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "这个 JPEG 文件太大了(%d 字节)ï¼\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "您确定è¦ç”¨å®ƒå—？(y/N)" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ª JPEG 文件\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "这张照片正确å—？(y/N/q)" -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "没有设置照片查看程åº\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "无法显示照片标识ï¼\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "未指定原因" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "密钥被替æ¢" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "密钥已泄æ¼" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "密钥ä¸å†ä½¿ç”¨" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "用户标识ä¸å†æœ‰æ•ˆ" @@ -4889,44 +5012,44 @@ msgid "No trust value assigned to:\n" msgstr "下列项目没有指定信任度：\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " 亦å³â€œ%sâ€\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "您是å¦ç›¸ä¿¡è¿™æŠŠå¯†é’¥å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…？\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = 我ä¸çŸ¥é“或我ä¸ä½œç­”\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = 我ä¸ç›¸ä¿¡\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = 我ç»å¯¹ç›¸ä¿¡\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = 回到主èœå•\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = 跳过这把密钥\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = 退出\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -4935,37 +5058,37 @@ "这把密钥的最å°ä¿¡ä»»ç­‰çº§ä¸ºï¼š%s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "您的决定是什么？" -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "您真的è¦æŠŠè¿™æŠŠå¯†é’¥è®¾æˆç»å¯¹ä¿¡ä»»ï¼Ÿ(y/N)" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "被ç»å¯¹ä¿¡ä»»çš„密钥的è¯ä¹¦ï¼š\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s：没有è¯æ®è¡¨æ˜Žè¿™æŠŠå¯†é’¥çœŸçš„属于它所声称的æŒæœ‰è€…\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s：åªæœ‰æœ‰é™çš„è¯æ®è¡¨æ˜Žè¿™æŠŠå¯†é’¥å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "这把密钥有å¯èƒ½å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "这把密钥是属于我们的\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -4974,105 +5097,105 @@ "这把密钥并ä¸ä¸€å®šå±žäºŽç”¨æˆ·æ ‡è¯†å£°ç§°çš„那个人。如果您真的知é“自\n" "己在åšä»€ä¹ˆï¼Œæ‚¨å¯ä»¥åœ¨ä¸‹ä¸€ä¸ªé—®é¢˜å›žç­” yes。\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "无论如何还是使用这把密钥å—？(y/N)" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "警告：正在使用ä¸è¢«ä¿¡ä»»çš„密钥ï¼\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "警告：此密钥å¯èƒ½å·²è¢«åŠé”€(åŠé”€å¯†é’¥ä¸å­˜åœ¨)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "警告：这把密钥已ç»è¢«å®ƒçš„指定åŠé”€è€…åŠé”€äº†ï¼\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "警告：这把密钥已ç»è¢«å®ƒçš„æŒæœ‰è€…åŠé”€äº†ï¼\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " 这表明这个签å有å¯èƒ½æ˜¯ä¼ªé€ çš„。\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "警告：这把å­é’¥å·²ç»è¢«å®ƒçš„æŒæœ‰è€…åŠé”€äº†ï¼\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "注æ„：这把密钥已ç»è¢«ç¦ç”¨äº†ã€‚\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "注æ„：验è¯è¿‡çš„ç­¾å者的地å€æ˜¯â€˜%s’\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "注æ„：签å者的地å€â€˜%s’ä¸åŒ¹é…任何 DNS 记录\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "PKA ä¿¡æ¯æœ‰æ•ˆï¼Œä¿¡ä»»çº§åˆ«è°ƒæ•´åˆ°â€œå®Œå…¨â€\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "PKA ä¿¡æ¯æ— æ•ˆï¼Œä¿¡ä»»çº§åˆ«è°ƒæ•´åˆ°â€œä»Žä¸â€\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "注æ„：这把密钥已ç»è¿‡æœŸäº†ï¼\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "警告：这把密钥未ç»å—信任的签å认è¯ï¼\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " 没有è¯æ®è¡¨æ˜Žè¿™ä¸ªç­¾å属于它所声称的æŒæœ‰è€…。\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "警告：我们ä¸ä¿¡ä»»è¿™æŠŠå¯†é’¥ï¼\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " 这个签å很有å¯èƒ½æ˜¯ä¼ªé€ çš„。\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "警告：这把密钥未ç»æœ‰è¶³å¤Ÿä¿¡ä»»åº¦çš„ç­¾å所认è¯ã€‚\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " 这份签å并ä¸ä¸€å®šå±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s：已跳过：%s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳过：公钥已存在\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "您没有指定用户标识。(您å¯ä»¥åœ¨å‘½ä»¤è¡Œä¸­ç”¨â€œ-râ€æŒ‡å®š)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "当å‰æ”¶ä»¶äººï¼š\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5080,33 +5203,33 @@ "\n" "输入用户标识。以空白行结æŸï¼š" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "没有这个用户标识。\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "已跳过：公钥已被设为默认收件者\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "公钥被ç¦ç”¨ã€‚\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "已跳过：公钥已被设定\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的默认收件者“%sâ€\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s：已跳过：公钥已被ç¦ç”¨\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "没有有效的地å€\n" @@ -5173,7 +5296,7 @@ msgstr "注æ„：密钥已被åŠé”€" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失败：%s\n" @@ -5195,11 +5318,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "è¦ä¸ºè¿™æŠŠå¯†é’¥å»ºç«‹ä¸€ä»½æŒ‡å®šåŠé”€è€…è¯ä¹¦å—？(y/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "已强行使用 ASCII å°è£…过的输出。\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失败： %s\n" @@ -5218,28 +5341,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "找ä¸åˆ°ç§é’¥â€œ%sâ€ï¼š%s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "没有相对应的公钥：%s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "公钥与ç§é’¥ä¸å»åˆï¼\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "è¦ä¸ºè¿™æŠŠå¯†é’¥å»ºç«‹ä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "未知的ä¿æŠ¤ç®—法\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "注æ„：这把密钥没有被ä¿æŠ¤ï¼\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5257,33 +5380,33 @@ "å°å¿ƒï¼šæ‚¨çš„机器上的打å°ç³»ç»Ÿå¯èƒ½ä¼šåœ¨æ‰“å°è¿‡ç¨‹ä¸­æŠŠè¿™äº›æ•°æ®ä¸´æ—¶åœ¨æŸä¸ªå…¶ä»–\n" "人也能够看得到的地方ï¼\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "请选择åŠé”€çš„原因：\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "å–消" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(也许您会想è¦åœ¨è¿™é‡Œé€‰æ‹© %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "请输入æè¿°(å¯é€‰)；以空白行结æŸï¼š\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "åŠé”€åŽŸå› ï¼š%s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(ä¸ç»™å®šæè¿°)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "这样å¯ä»¥å—？ (y/N)" @@ -5355,44 +5478,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "警告：签åçš„å­é’¥ %s 交å‰éªŒè¯æ— æ•ˆ\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "公钥 %s 在其签ååŽ %lu 秒生æˆ\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "公钥 %s 在其签ååŽ %lu 秒生æˆ\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "密钥 %s 是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "密钥 %s 是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "注æ„：签å密钥 %s 已于 %s 过期\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "å‡å®šå¯†é’¥ %s çš„ç­¾å由于æŸä¸ªæœªçŸ¥çš„关键ä½å‡ºé”™è€ŒæŸå\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "密钥 %s：没有å­é’¥åŠé”€ç­¾å所需的å­é’¥\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "密钥 %s：没有å­é’¥ç»‘定签å所需的å­é’¥\n" @@ -5520,12 +5643,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "信任度数æ®åº“：åŒæ­¥å¤±è´¥ï¼š%s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "信任度数æ®åº“记录 %lu：lseek 失败：%s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "信任度数æ®åº“记录 %lu：write 失败 (n=%d): %s\n" @@ -5569,84 +5692,85 @@ msgid "%s: trustdb created\n" msgstr "%s：建立了信任度数æ®åº“\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "注æ„：信任度数æ®åº“ä¸å¯å†™å…¥\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s：无效的信任度数æ®åº“\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s：建立散列表失败：%s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s：更新版本记录时出错： %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s：读å–版本记录时出错： %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s：写入版本记录时出错：%s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "信任度数æ®åº“：lseek 失败：%s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "信任度数æ®åº“：read 失败(n=%d)：%s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s：ä¸æ˜¯ä¸€ä¸ªä¿¡ä»»åº¦æ•°æ®åº“文件\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s：记录编å·ä¸º%lu的版本记录\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s：无效的文件版本%d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s：读å–自由记录时出错：%s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s：写入目录记录时出错：%s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s：记录归零时失败：%s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s：附加记录时失败：%s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "信任度数æ®åº“å·²æŸå；请执行“gpg --fix-trustdbâ€ã€‚\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s：建立了信任度数æ®åº“\n" #: g10/textfilter.c:147 #, c-format @@ -5693,127 +5817,135 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "信任记录 %lu ä¸å±žäºŽæ‰€è¯·æ±‚的类别 %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "无法使用未知的信任模型(%d)――å‡å®šä½¿ç”¨ %s 信任模型\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[å·²åŠé”€]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[已过期]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ 未知 ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[未定义]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ 勉强 ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ 完全 ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ ç»å¯¹ ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "从ä¸" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "完全" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "ç»å¯¹" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数æ®åº“检查将于 %s 进行\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ›´æ–°ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "找ä¸åˆ°å…¬é’¥ %s：%s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "正在检查信任度数æ®åº“\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "å·²ç»å¤„ç†äº† %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何ç»å¯¹ä¿¡ä»»çš„密钥\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ç»å¯¹ä¿¡ä»»çš„密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "éœ€è¦ %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, 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:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数æ®åº“版本记录：写入失败：%s\n" @@ -6072,47 +6204,47 @@ msgstr "您找到一个程åºç¼ºé™·äº†â€¦â€¦(%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|ok" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6132,6 +6264,15 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(您å¯èƒ½ä½¿ç”¨äº†é”™è¯¯çš„程åºæ¥å®Œæˆæ­¤é¡¹ä»»åŠ¡)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA 密钥对会有 %u ä½ã€‚\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "信任度数æ®åº“å·²æŸå；请执行“gpg --fix-trustdbâ€ã€‚\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|管ç†å‘˜ PIN" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "无法在 v3 (PGP 2.xæ ·å¼)çš„ç­¾å内放入注记数æ®\n" Binary files /tmp/hIZbyyVkNd/gnupg-1.4.9/po/zh_TW.gmo and /tmp/nOCeUVKJSg/gnupg-1.4.10/po/zh_TW.gmo differ diff -Nru gnupg-1.4.9/po/zh_TW.po gnupg-1.4.10/po/zh_TW.po --- gnupg-1.4.9/po/zh_TW.po 2008-03-25 08:53:12.000000000 +0000 +++ gnupg-1.4.10/po/zh_TW.po 2009-09-02 17:19:42.000000000 +0100 @@ -1,22 +1,25 @@ # Traditional Chinese(zh-tw) messages for GnuPG # Copyright (C) 2002 Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. -# Jedi , 2003, 2004, 2005. +# Jedi Lin , 2003, 2004, 2005, 2006, 2007, 2008. # -# Special thanks to "Autrijus Tang ". +# Special thanks to "Audrey Tang ". # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.4.2\n" +"Project-Id-Version: gnupg 1.4.9\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" -"PO-Revision-Date: 2007-12-29 20:48+0800\n" -"Last-Translator: Jedi \n" +"POT-Creation-Date: 2009-09-02 18:19+0200\n" +"PO-Revision-Date: 2008-03-27 09:51+0800\n" +"Last-Translator: Jedi Lin \n" "Language-Team: Chinese (traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Basepath: gnupg-1.4.8/\n" +"X-Poedit-Basepath: gnupg-1.4.9/\n" +"X-Poedit-Language: Chinese\n" +"X-Poedit-Country: TAIWAN\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: cipher/primegen.c:119 #, c-format @@ -42,13 +45,12 @@ msgid "waiting for lock on `%s'...\n" msgstr "正在等候 `%s' 鎖定...\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 g10/openfile.c:188 +#: g10/openfile.c:356 g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 +#: g10/sign.c:1083 g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 +#: g10/tdbio.c:538 g10/tdbio.c:604 #, c-format msgid "can't open `%s': %s\n" msgstr "無法開啟 `%s': %s\n" @@ -80,9 +82,10 @@ msgid "note: random_seed file not updated\n" msgstr "請注æ„: random_seed 檔案未更新\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889 -#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "無法建立 `%s': %s\n" @@ -135,171 +138,217 @@ "隨機ä½å…ƒçµ„ä¸å¤ å¤š. 請多åšä¸€äº›æœ‰çš„沒的事情, \n" "這樣作業系統纔能è’集到更多的亂數! (é‚„éœ€è¦ %d ä½å…ƒçµ„)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "存放指紋失敗: %s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "存放創生日期失敗: %s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, c-format msgid "reading public key failed: %s\n" msgstr "讀å–公鑰時失敗: %s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:1157 g10/app-openpgp.c:2875 msgid "response does not contain the public key data\n" msgstr "回應中未包å«å…¬é‘°è³‡æ–™\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:2883 msgid "response does not contain the RSA modulus\n" msgstr "å›žæ‡‰ä¸­æœªåŒ…å« RSA 系數\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1174 g10/app-openpgp.c:2893 msgid "response does not contain the RSA public exponent\n" msgstr "å›žæ‡‰ä¸­æœªåŒ…å« RSA 公用指數\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, c-format msgid "PIN callback returned error: %s\n" msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少è¦æœ‰ %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "é©—è­‰ CHV%d 失敗: %s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "管ç†è€…指令存å–權é™å°šæœªçµ„æ…‹\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3489 msgid "error retrieving CHV status from card\n" msgstr "從å¡ç‰‡å–回 CHV 狀態時出錯\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3498 msgid "card is permanently locked!\n" msgstr "å¡ç‰‡æ°¸ä¹…鎖定了!!\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "%d 管ç†è€…個人識別碼 (PIN) 試圖在å¡ç‰‡æ°¸ä¹…鎖定å‰éºç•™ä¸‹ä¾†\n" -#. TRANSLATORS: Do not translate the "|A|" prefix but -#. keep it at the start of the string. We need this elsewhere -#. to get some infos on the string. -#: g10/app-openpgp.c:1341 -msgid "|A|Admin PIN" -msgstr "|A|管ç†è€… PIN" - -#. 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. -#: g10/app-openpgp.c:1490 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "管ç†è€…指令存å–權é™å°šæœªçµ„æ…‹\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "ç§é‘°éƒ¨åˆ†ç„¡æ³•å–用\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "è«‹é¸æ“‡æ’¤éŠ·çš„原因:\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少è¦æœ‰ %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|新增管ç†è€… PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "|N|新增 PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, c-format msgid "error getting new PIN: %s\n" msgstr "å–得新的個人識別碼 (PIN) 時出錯: %s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "讀å–應用程å¼è³‡æ–™æ™‚出錯\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "讀å–指紋 DO 時出錯\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "金鑰已存在\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "既有的金鑰將被å–代\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "正在產生新的金鑰\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "正在產生新的金鑰\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "缺æ¼å‰µç”Ÿæ™‚間戳å°\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA 模組缺æ¼æˆ–è€…ä¸¦éž %d ä½å…ƒå¤§\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:2652 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA 公用指數缺æ¼æˆ–者大於 %d ä½å…ƒ\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA 質數 %s 缺æ¼æˆ–è€…ä¸¦éž %d ä½å…ƒå¤§\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "存放金鑰失敗: %s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "正在產生金鑰中, è«‹ç¨å€™ ...\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "產生金鑰時失敗\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "金鑰產生完畢 (%d 秒)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "無效的 OpenPGP å¡ç‰‡çµæ§‹ (DO 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "å¡ç‰‡ä¸æ”¯æ´ %s 摘è¦æ¼”算法\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "ç›®å‰å»ºç«‹çš„簽章: %lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||請輸入 PIN%%0A[簽署完æˆ: %lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3503 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "ç›®å‰åœ¨æ­¤æŒ‡ä»¤ä¸­çš„管ç†è€…個人識別碼 (PIN) 驗證被ç¦æ­¢äº†\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "ç„¡æ³•å­˜å– %s - 無效的 OpenPGP å¡ç‰‡?\n" @@ -381,163 +430,225 @@ "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "å°è£è£¡å‡ºç¾è¢«å¼•è™Ÿæ‹¬ä½çš„å¯åˆ—å°å­—符 - å¯èƒ½æ˜¯æœ‰ç‘•ç–µçš„é€ä¿¡ç¨‹å¼é€ æˆçš„\n" -#: g10/card-util.c:61 g10/card-util.c:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "沒有å¯ç”¨çš„ OpenPGP å¡ç‰‡: %s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "åµæ¸¬åˆ° OpenPGP å¡ç‰‡ç·¨è™Ÿ %s\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "無法在批次模å¼ä¸­é€™æ¨£åš\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "在 %s 模å¼ä¸­ä¸å…許使用這個指令.\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "妳è¦é¸å“ªä¸€å€‹? " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[未設定]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "男性" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "女性" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "未特定" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "ä¸å¼·è¿«ä½¿ç”¨" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "強迫使用" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "錯誤: ç›®å‰ç¥‡å…許使用單純的 ASCII 字符.\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "錯誤: ä¸èƒ½ä½¿ç”¨ \"<\" 字符.\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "錯誤: 並ä¸å…許使用連續兩個以上的空格.\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "å¡ç‰‡æŒæœ‰è€…的姓æ°: " -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "å¡ç‰‡æŒæœ‰è€…çš„åå­—: " -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "錯誤: åˆä½µå¾Œçš„å字太長 (上é™æ˜¯ %d 個字符).\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "å–回公鑰的 URL: " -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "錯誤: URL 太長 (上é™æ˜¯ %d 個字符).\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "建立 `%s' 鑰匙圈時出錯: %s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "è®€å– `%s' 時出錯: %s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "建立 `%s' 時出錯: %s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "登入資料 (帳號å稱): " -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "錯誤: 登入資料太長 (上é™æ˜¯ %d 個字符).\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "ç§äººçš„ DO 資料: " -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "錯誤: ç§äººçš„ DO 太長 (上é™æ˜¯ %d 個字符).\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "介é¢èªžè¨€å好設定: " -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "錯誤: 無效的å好設定字串長度\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "錯誤: å好設定字串中å«æœ‰ç„¡æ•ˆçš„字符\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "性別 ((M)男性, (F)女性或留空): " -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "錯誤: 無效的回應.\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "憑證中心 (CA) 指紋: " -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "錯誤: 無效的格å¼åŒ–指紋.\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "ä¸å¯èƒ½é€²è¡Œé‡‘é‘°æ“作: %s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "這ä¸æ˜¯ OpenPGP å¡ç‰‡" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "å–å¾—ç¾ç”¨é‡‘鑰資訊時出錯: %s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "是å¦è¦å–代既有的金鑰? (y/N) " -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "妳想è¦ç”¨å¤šå¤§çš„金鑰尺寸? (%u) " + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "妳想è¦ç”¨å¤šå¤§çš„金鑰尺寸? (%u) " + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "妳想è¦ç”¨å¤šå¤§çš„金鑰尺寸? (%u) " + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "加大到 %u ä½å…ƒ\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s 金鑰尺寸一定è¦ä»‹æ–¼ %u 到 %u 之間\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "讀å–ç§é‘°å€å¡Š \"%s\" 時出錯: %s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "是å¦è¦ç‚ºåŠ å¯†ç”¨é‡‘鑰建立å¡å¤–備份? (Y/n) " -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "ç§é‘°å·²ç¶“存放在å¡ç‰‡ä¸Šäº†\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "是å¦è¦å–代既有的金鑰? (y/N) " -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -548,137 +659,146 @@ " PIN = `%s' 管ç†è€… (Admin) PIN = `%s'\n" "妳應該用 --change-pin 指令來加以變更\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "è«‹é¸æ“‡å¦³è¦ç”¢ç”Ÿçš„金鑰種類:\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) 簽署用金鑰\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) 加密用金鑰\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) 憑證用金鑰\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "無效的é¸æ“‡.\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "è«‹é¸æ“‡è¦æŠŠé‡‘鑰存放在哪裡:\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "未知的金鑰ä¿è­·æ¼”算法\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "ç§é‘°éƒ¨åˆ†ç„¡æ³•å–用\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "ç§é‘°å·²ç¶“存放在å¡ç‰‡ä¸Šäº†\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "離開這個é¸å–®" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "顯示管ç†è€…指令" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "顯示這份線上說明" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "列出所有å¯ç”¨çš„資料" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "變更å¡ç‰‡æŒæœ‰äººçš„åå­—" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "變更å–回金鑰的 URL" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "從å¡ç‰‡ URL å–回指定的金鑰" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "變更登入å稱" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "變更介é¢èªžè¨€å好設定" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "變更å¡ç‰‡æŒæœ‰è€…的性別" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "變更æŸå€‹æ†‘證中心 (CA) 的指紋" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "切æ›ç°½ç« æ˜¯å¦å¼·åˆ¶ä½¿ç”¨å€‹äººè­˜åˆ¥ç¢¼ (PIN) 的旗標" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "產生新的金鑰" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "變更或解å‡å€‹äººè­˜åˆ¥ç¢¼ (PIN) çš„é¸å–®" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "驗證個人識別碼 (PIN) 並列出所有的資料" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "指令> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "é™ç®¡ç†è€…使用的指令\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "å…許使用管ç†è€…指令\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "未å…許使用管ç†è€…指令\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "無效的指令 (試試看 \"help\")\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "沒有讀å¡æ©Ÿå¯ç”¨\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "è«‹æ’å…¥å¡ç‰‡ä¸¦æŒ‰ä¸‹ [Enter], 或者輸入 'c' å–消: " -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "æŒ‘é¸ openpgp 時失敗: %s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -687,36 +807,36 @@ "請移除ç¾ç”¨ä¸­çš„å¡ç‰‡ä¸¦æ’入下列åºè™Ÿçš„å¡ç‰‡:\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "準備好時請按下 [Enter], 或者輸入 'c' å–消: " -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "請輸入新的管ç†è€…個人識別碼 (PIN): " -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "請輸入新的個人識別碼 (PIN): " -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "請輸入管ç†è€…個人識別碼 (PIN): " -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "請輸入個人識別碼 (PIN): " -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "è«‹å†æ¬¡è¼¸å…¥å€‹äººè­˜åˆ¥ç¢¼ (PIN): " -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "å‰å¾Œå…©æ¬¡è¼¸å…¥çš„個人識別碼 (PIN) ä¸ä¸€è‡´; è«‹å†è©¦ä¸€æ¬¡" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "無法開啟 `%s'\n" @@ -725,13 +845,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output 在這個指令中沒有作用\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 +#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "找ä¸åˆ°é‡‘é‘° \"%s\": %s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -827,7 +947,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "強迫使用 %s (%d) å°ç¨±å¼ç·¨å¯†æ³•æœƒé•å收件者å好設定\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "妳ä¸èƒ½å¤ å°‡ %s 用於 %s 模å¼ä¸­\n" @@ -1215,7 +1335,7 @@ msgid "Pubkey: " msgstr "公鑰: " -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "編密法: " @@ -1223,7 +1343,7 @@ msgid "Hash: " msgstr "雜湊: " -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "壓縮: " @@ -1356,397 +1476,397 @@ msgid "NOTE: old default options file `%s' ignored\n" msgstr "請注æ„: 已忽略舊有的é è¨­é¸é …檔 `%s'\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "請注æ„: 沒有é è¨­é¸é …檔 `%s'\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "é¸é …檔 `%s': %s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "從 `%s' 讀å–é¸é …中\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "請注æ„: 一般情æ³ä¸‹ä¸æœƒç”¨åˆ° %s!\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "編密法延伸模組 `%s' 因為權é™ä¸å®‰å…¨è€Œæœªè¼‰å…¥\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "`%s' ä¸æ˜¯å€‹æœ‰æ•ˆçš„簽章使用期é™\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' ä¸æ˜¯å€‹æœ‰æ•ˆçš„字元集\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "無法剖æžé‡‘鑰伺æœå™¨ URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: 無效的金鑰伺æœå™¨é¸é …\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "無效的金鑰伺æœå™¨é¸é …\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 無效的匯入é¸é …\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "無效的匯入é¸é …\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 無效的匯出é¸é …\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "無效的匯出é¸é …\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: 無效的清單é¸é …\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "無效的清單é¸é …\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "驗證簽章時顯示照片 ID" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "驗證簽章時顯示原則 URL" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "驗證簽章時顯示所有的註記" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "驗證簽章時顯示 IETF 標準註記" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "驗證簽章時顯示使用者æ供的註記" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "驗證簽章時顯示å好的金鑰伺æœå™¨ URL" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "驗證簽章時顯示使用者 ID 有效性" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "驗證簽章時顯示已撤銷或éŽæœŸçš„使用者 ID" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "驗證簽章時祇顯示主è¦çš„使用者 ID" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "以 PKA 資料驗證簽章" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "æ高å°æŒæœ‰æœ‰æ•ˆ PKA 資料之簽章的信任" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: 無效的驗證é¸é …\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "無效的驗證é¸é …\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "ç„¡æ³•æŠŠåŸ·è¡Œæª”è·¯å¾‘è¨­æˆ %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: 無效的自動金鑰定å€æ¸…å–®\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "無效的自動金鑰定å€æ¸…å–®\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "警告: 程å¼å¯èƒ½æœƒå‚¾å°å‡ºæ ¸å¿ƒæª”!\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告: %s 會推翻 %s\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ä¸å…許跟 %s 併用!\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s è·Ÿ %s 放在一起沒有æ„義!\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "請注æ„: %s 在本版中無法使用\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "因為 %s 而ä¸æœƒåœ¨ä¸å®‰å…¨çš„記憶體中執行\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "妳祇有在 --pgp2 模å¼ä¸‹çº”能åšå‡ºåˆ†é›¢å¼æˆ–明文簽章\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "妳在 --pgp2 模å¼ä¸‹æ™‚, ä¸èƒ½åŒæ™‚簽署和加密\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而éžç®¡é“\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†è¨Šæ¯éœ€è¦ IDEA 編密法\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "所é¸çš„編密演算法無效\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "所é¸çš„摘è¦æ¼”算法無效\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "所é¸çš„壓縮演算法無效\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "所é¸çš„憑證摘è¦æ¼”算法無效\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed 一定è¦å¤§æ–¼ 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed 一定è¦å¤§æ–¼ 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth 一定è¦ä»‹æ–¼ 1 å’Œ 255 之間\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "無效的 default-cert-level; 一定è¦æ˜¯ 0, 1, 2 或 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "無效的 min-cert-level; 一定è¦æ˜¯ 1, 2 或 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "請注æ„: 強烈ä¸å»ºè­°ä½¿ç”¨å–®ç´”çš„ S2K æ¨¡å¼ (0)\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "無效的 S2K 模å¼; 一定è¦æ˜¯ 0, 1 或 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "無效的é è¨­å好\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "無效的個人編密法å好\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "無效的個人摘è¦å好\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "無效的個人壓縮å好\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 還沒辦法跟 %s 一起é‹ä½œ\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "妳ä¸è©²å°‡ `%s' 編密演算法用於 %s 模å¼ä¸­\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "妳ä¸è©²å°‡ `%s' 摘è¦æ¼”算法用於 %s 模å¼ä¸­\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "妳ä¸è©²å°‡ `%s' 壓縮演算法用於 %s 模å¼ä¸­\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "信任資料庫啟始失敗: %s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [檔å]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [檔å]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "`%s' å°ç¨±å¼åŠ å¯†å¤±æ•—: %s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [檔å]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [檔å]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "妳ä¸èƒ½åœ¨ --s2k-mode 0 中使用 --symmetric --encrypt\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "妳ä¸èƒ½åœ¨ %s 模å¼ä¸­ä½¿ç”¨ --symmetric --encrypt\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [檔å]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [檔å]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [檔å]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "妳ä¸èƒ½åœ¨ --s2k-mode 0 中使用 --symmetric --sign --encrypt\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "妳ä¸èƒ½åœ¨ %s 模å¼ä¸­ä½¿ç”¨ --symmetric --sign --encrypt\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [檔å]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [檔å]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [檔å]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key 使用者ID" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key 使用者ID" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key 使用者ID [指令]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "é€è‡³é‡‘鑰伺æœå™¨å¤±æ•—: %s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "從金鑰伺æœå™¨æŽ¥æ”¶å¤±æ•—: %s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "金鑰匯出失敗: %s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "用金鑰伺æœå™¨æœå°‹å¤±æ•—: %s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "從金鑰伺æœå™¨æ›´æ–°å¤±æ•—: %s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "解開å°è£å¤±æ•—: %s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "進行å°è£å¤±æ•—: %s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "無效的 `%s' 雜湊演算法\n" @@ -1790,17 +1910,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "無效的金鑰 %s å¯ä»¥è—‰ç”± --allow-non-selfsigned-uid 而生效\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公鑰 %s 沒有相å°æ‡‰çš„ç§é‘° - 正在忽略\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用å­é‘° %s 來替æ›ä¸»é‘° %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "金鑰 %s: 祇有ç§é‘°è€Œæ²’有公鑰 - 已跳éŽ\n" @@ -1826,8 +1946,9 @@ msgstr "用法: gpgv [é¸é …] [檔案] (或用 -h 求助)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "語法: gpg [é¸é …] [檔案]\n" @@ -2609,12 +2730,12 @@ msgid "keyring `%s' created\n" msgstr "`%s' 鑰匙圈已建立\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "`%s' 金鑰å€å¡Šè³‡æº: %s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "é‡æ–°å»ºç«‹é‘°åŒ™åœˆå¿«å–失敗: %s\n" @@ -2663,7 +2784,7 @@ msgid "%d user IDs without valid self-signatures detected\n" msgstr "åµæ¸¬åˆ° %d 個沒有有效自我簽章的使用者 ID\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2673,12 +2794,12 @@ "請判斷妳有多信任這ä½ä½¿ç”¨è€…確實驗證其他使用者的金鑰\n" "(åƒæ˜¯æŸ¥å°èº«ä»½è­‰, 或從ä¸åŒçš„來æºæª¢æŸ¥æŒ‡ç´‹ç­‰...）的能力\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉強信任\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全信任\n" @@ -2890,8 +3011,8 @@ msgid "Really sign? (y/N) " msgstr "真的è¦ç°½ç½²å—Ž? (y/N)" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1059 g10/keyedit.c:4833 g10/keyedit.c:4924 g10/keyedit.c:4988 +#: g10/keyedit.c:5049 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "簽署時失敗: %s\n" @@ -2900,19 +3021,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "金鑰祇剩下殘骸或者祇å«æœ‰å¡ä¸Šé‡‘é‘°é …ç›® - 沒有å¯è®Šæ›´çš„密語.\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "這把金鑰未被ä¿è­·.\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "主鑰的ç§é‘°éƒ¨åˆ†ç„¡æ³•å–用.\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "主鑰的ç§é‘°éƒ¨åˆ†å­˜æ”¾æ–¼å¡ä¸Š.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "金鑰已ä¿è­·.\n" @@ -2929,7 +3050,7 @@ "請輸入è¦çµ¦é€™æŠŠç§é‘°ç”¨çš„新密語.\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "å‰å¾Œå…©æ¬¡è¼¸å…¥çš„密語ä¸ä¸€è‡´; è«‹å†è©¦ä¸€æ¬¡" @@ -3237,115 +3358,115 @@ msgid "Really update the preferences? (y/N) " msgstr "真的è¦æ›´æ–°å好設定嗎? (y/N) " -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "è¦å„²å­˜è®Šæ›´å—Ž? (y/N) " -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "è¦ä¸å„²å­˜å°±é›¢é–‹å—Ž? (y/N) " -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "更新失敗: %s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "æ›´æ–°ç§é‘°å¤±æ•—: %s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "金鑰沒有變更所以ä¸éœ€è¦æ›´æ–°.\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "摘è¦: " -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "特點: " -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "金鑰伺æœå™¨ç„¡ä¿®æ”¹" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "å好的金鑰伺æœå™¨: " -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "註記: " -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x 型態的使用者 ID 沒有å好設定.\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2687 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "這把金鑰å¯èƒ½è¢« %s 金鑰 %s 所撤銷" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 msgid "(sensitive)" msgstr "(機密)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "建立: %s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, c-format msgid "revoked: %s" msgstr "撤銷: %s" # of subkey -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, c-format msgid "expired: %s" msgstr "éŽæœŸ: %s" # of subkey -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "到期: %s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "用途: %s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "ä¿¡ä»»: %s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "有效性: %s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "這把金鑰已經åœç”¨äº†" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "å¡ç‰‡ç·¨è™Ÿ: " -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3353,17 +3474,17 @@ "請注æ„顯示出來的金鑰有效性ä¸éœ€è¦æ›´æ­£,\n" "除éžå¦³é‡æ–°åŸ·è¡Œç¨‹å¼.\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "已撤銷" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "å·²éŽæœŸ" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 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" @@ -3371,7 +3492,7 @@ "警告: 沒有任何使用者 ID è¢«æ¨™ç¤ºç‚ºä¸»è¦ ID. 這項指令å¯èƒ½æœƒ\n" " 導致ä¸åŒçš„使用者 ID 被當æˆä¸»è¦ ID.\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3380,74 +3501,74 @@ "警告: 這是一把 PGP2 型態的金鑰.\n" " 增加照片 ID å¯èƒ½æœƒå°Žè‡´æŸäº›ç‰ˆæœ¬çš„ PGP é§å›žé€™æŠŠé‡‘é‘°.\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "妳確定ä»ç„¶æƒ³è¦å¢žåŠ å—Ž? (y/N) " -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "妳ä¸å¯ä»¥æŠŠç…§ç‰‡ ID 增加到 PGP2 型態的金鑰裡.\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "刪除這份完好的簽章嗎? (y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "刪除這份無效的簽章嗎? (y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "刪除這份未知的簽章嗎? (y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "真的è¦åˆªé™¤é€™ä»½è‡ªæˆ‘簽章嗎? (y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "已經刪除了 %d 份簽章.\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "已經刪除了 %d 份簽章.\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "沒有刪除任何æ±è¥¿.\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "無效" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "使用者 ID \"%s\" 已精簡: %s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "使用者 ID \"%s\": 已經最å°åŒ–了\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "使用者 ID \"%s\": 已經是乾淨的了\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3456,252 +3577,257 @@ "警告: 這是一把 PGP2 型態的金鑰.\n" " 增加指定撤銷者å¯èƒ½æœƒå°Žè‡´æŸäº›ç‰ˆæœ¬çš„ PGP é§å›žé€™æŠŠé‡‘é‘°.\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "妳ä¸å¯ä»¥æŠŠæŒ‡å®šæ’¤éŠ·è€…增加到 PGP2 型態的金鑰裡.\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3375 msgid "Enter the user ID of the designated revoker: " msgstr "輸入指定撤銷者的使用者 ID: " -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3413 +#: g10/keyedit.c:3415 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "妳ä¸èƒ½æŒ‡æ´¾æŸæŠŠé‡‘鑰為它自己的指定撤銷者\n" -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3437 msgid "this key has already been designated as a revoker\n" msgstr "已指定這把金鑰為撤銷者了\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告: 一旦把æŸæŠŠé‡‘鑰指派為指定撤銷者後, 就無法å悔了!\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "妳確定è¦æŒ‡æ´¾é€™æŠŠé‡‘鑰為指定撤銷者嗎? (y/N) " -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3524 msgid "Please remove selections from the secret keys.\n" msgstr "請從ç§é‘°ä¸­ç§»é™¤é¸æ“‡.\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "請至多é¸æ“‡ä¸€æŠŠå­é‘°.\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "正在變更å­é‘°çš„使用期é™.\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "正在變更主鑰的使用期é™.\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "妳ä¸èƒ½è®Šæ›´ v3 金鑰的使用期é™\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "在ç§é‘°åœˆè£¡æ²’有一致的簽章\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "簽署å­é‘° %s 已經交å‰èªè­‰éŽäº†\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "å­é‘° %s ä¸åšç°½ç½²ä¹‹ç”¨, 因此無須交å‰é©—è­‰\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3856 msgid "Please select exactly one user ID.\n" msgstr "請祇é¸æ“‡ä¸€å€‹ä½¿ç”¨è€… ID.\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "正在跳éŽä½¿ç”¨è€… ID \"%s\" çš„ v3 自我簽章\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "請輸入妳的å好金鑰伺æœå™¨ URL: " -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "妳確定è¦å–代它嗎？ (y/N) " -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "妳確定è¦åˆªé™¤å®ƒå—Žï¼Ÿ (y/N) " -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "請輸入註記: " -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "是å¦ç¹¼çºŒ? (y/N) " -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "索引 %d 沒有å°æ‡‰åˆ°ä½¿ç”¨è€… ID\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "雜湊 %s 沒有å°æ‡‰åˆ°ä½¿ç”¨è€… ID\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "索引 %d 沒有å°æ‡‰åˆ°å­é‘°\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, c-format msgid "user ID: \"%s\"\n" msgstr "使用者 ID: \"%s\"\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4645 g10/keyedit.c:4739 g10/keyedit.c:4782 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "已被妳的金鑰 %s æ–¼ %s%s%s 所簽署\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4647 g10/keyedit.c:4741 g10/keyedit.c:4784 msgid " (non-exportable)" msgstr " (ä¸å¯åŒ¯å‡º)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "這份簽章已經在 %s éŽæœŸäº†.\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "妳確定ä»ç„¶æƒ³è¦æ’¤éŠ·å®ƒå—Ž? (y/N) " -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "è¦ç‚ºé€™ä»½ç°½ç« å»ºç«‹ä¸€ä»½æ’¤éŠ·æ†‘證嗎? (y/N) " -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4710 +msgid "Not signed by you.\n" +msgstr "" + +#: g10/keyedit.c:4716 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4742 msgid " (non-revocable)" msgstr " (ä¸å¯æ’¤éŠ·)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4749 #, c-format msgid "revoked by your key %s on %s\n" msgstr "被妳的金鑰 %s æ–¼ %s 所撤銷了\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4771 msgid "You are about to revoke these signatures:\n" msgstr "妳正è¦æ’¤éŠ·é€™äº›ç°½ç« :\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4791 msgid "Really create the revocation certificates? (y/N) " msgstr "真的è¦å»ºç«‹æ’¤éŠ·æ†‘證嗎? (y/N) " -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4821 msgid "no secret key\n" msgstr "沒有ç§é‘°\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4891 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "使用者 ID \"%s\" 已撤銷\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4908 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4972 #, c-format msgid "Key %s is already revoked.\n" msgstr "金鑰 %s 已撤銷.\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5034 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "å­é‘° %s 已撤銷.\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5129 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n" -#: g10/keygen.c:263 +#: g10/keygen.c:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "å好設定 `%s' é‡è¤‡äº†\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "編密å好éŽå¤š\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "摘è¦å好éŽå¤š\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "壓縮å好éŽå¤š\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "å好字串中å«æœ‰ç„¡æ•ˆçš„ `%s' é …ç›®\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "寫入直接簽章中\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "寫入自我簽章中\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 msgid "writing key binding signature\n" msgstr "寫入附鑰簽章中\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "金鑰尺寸無效; 改用 %u ä½å…ƒ\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "金鑰尺寸增大到 %u ä½å…ƒ\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "簽署" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "ä¿è­‰" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "加密" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "鑑定" @@ -3714,109 +3840,104 @@ #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 金鑰å¯èƒ½çš„動作: " -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "ç›®å‰å¯é€²è¡Œçš„動作: " -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 切æ›ç°½ç½²æ€§èƒ½\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 切æ›åŠ å¯†æ€§èƒ½\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 切æ›é‘‘定性能\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完æˆ\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "è«‹é¸æ“‡å¦³è¦ä½¿ç”¨çš„金鑰種類:\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" +msgstr " (%d) DSA å’Œ Elgamal (é è¨­)\n" + +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA å’Œ Elgamal (é è¨­)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (僅能用於簽署)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (妳能自己設定性能)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (僅能用於簽署)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (僅能用於加密)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (僅能用於簽署)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (僅能用於加密)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (妳能自己設定性能)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (妳能自己設定性能)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA 金鑰å°æœƒæœ‰ %u ä½å…ƒé•·.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (妳能自己設定性能)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s 金鑰的長度å¯èƒ½ä»‹æ–¼ %u ä½å…ƒå’Œ %u ä½å…ƒä¹‹é–“.\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "妳想è¦ç”¨å¤šå¤§çš„金鑰尺寸? (%u) " -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s 金鑰尺寸一定è¦ä»‹æ–¼ %u 到 %u 之間\n" +msgid "What keysize do you want? (%u) " +msgstr "妳想è¦ç”¨å¤šå¤§çš„金鑰尺寸? (%u) " -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "妳所è¦æ±‚的金鑰尺寸是 %u ä½å…ƒ\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "加大到 %u ä½å…ƒ\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3832,7 +3953,7 @@ " m = 金鑰在 n 月後會到期\n" " y = 金鑰在 n 年後會到期\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3848,38 +3969,38 @@ " m = 簽章在 n 月後會到期\n" " y = 簽章在 n 年後會到期\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "金鑰的有效期é™æ˜¯å¤šä¹…? (0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "簽章的有效期é™æ˜¯å¤šä¹…? (%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "無效的數值\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "金鑰完全ä¸æœƒéŽæœŸ\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "簽章完全ä¸æœƒéŽæœŸ\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "金鑰將會在 %s 到期\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "簽章將會在 %s 到期.\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3887,11 +4008,11 @@ "妳的系統無法顯示 2038 年以後的日期.\n" "ä¸éŽ, 它å¯ä»¥æ­£ç¢ºè™•ç†ç›´åˆ° 2106 年之å‰çš„年份.\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "以上正確嗎? (y/N) " -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3906,44 +4027,44 @@ " \"Ke-Huan Lin (Jedi) \"\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "真實姓å: " -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "姓åå«æœ‰ç„¡æ•ˆçš„字符\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "姓åä¸å¯ä»¥ç”¨æ•¸å­—é–‹é ­\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "姓å至少è¦æœ‰äº”個字符長\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "é›»å­éƒµä»¶åœ°å€: " -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "ä¸æ˜¯æœ‰æ•ˆçš„é›»å­éƒµä»¶åœ°å€\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "註釋: " -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "註釋å«æœ‰ç„¡æ•ˆçš„字符\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "妳正在使用 `%s' 字元集.\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3954,7 +4075,7 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "è«‹ä¸è¦æŠŠé›»å­éƒµä»¶åœ°å€æ”¾é€²å¦³çš„真實姓å或註釋裡\n" @@ -3969,23 +4090,23 @@ #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "變更姓å(N), 註釋(C), é›»å­éƒµä»¶åœ°å€(E)或退出(Q)? " -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "變更姓å(N), 註釋(C), é›»å­éƒµä»¶åœ°å€(E)或確定(O)/退出(Q)? " -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "請先訂正錯誤\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3993,12 +4114,12 @@ "妳需è¦ä¸€å€‹å¯†èªžä¾†ä¿è­·å¦³çš„ç§é‘°.\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -4010,7 +4131,7 @@ "僅需è¦å†æ¬¡åŸ·è¡Œé€™å€‹ç¨‹å¼, 並且使用 \"--edit-key\" é¸é …å³å¯.\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4021,50 +4142,50 @@ "(åƒæ˜¯æ•²æ‰“éµç›¤, 移動滑鼠, 讀寫硬碟之類的)\n" "這會讓隨機數字產生器有更多的機會ç²å¾—夠多的亂數.\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "金鑰產生已å–消.\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "正在寫入公鑰至 `%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "正在寫入ç§é‘° stub 至 `%s'\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "正在寫入ç§é‘°è‡³ `%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "找ä¸åˆ°å¯å¯«å…¥çš„公鑰鑰匙圈: %s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "找ä¸åˆ°å¯å¯«å…¥çš„ç§é‘°é‘°åŒ™åœˆ: %s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "寫入ç§é‘°é‘°åŒ™åœˆ `%s' 時出錯: %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "公鑰和ç§é‘°å·²å»ºç«‹åŠç°½ç½².\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4072,42 +4193,42 @@ "請注æ„這把金鑰ä¸èƒ½ç”¨æ–¼åŠ å¯†. 也許妳會想藉由 \"--edit-key\" 指令\n" "來產生加密用的å­é‘°.\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "產生金鑰失敗: %s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "金鑰已經在 %lu 秒後的未來製妥 (å¯èƒ½æ˜¯å› ç‚ºæ™‚光旅行或時é˜çš„å•é¡Œ)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "金鑰已經在 %lu 秒後的未來製妥 (å¯èƒ½æ˜¯å› ç‚ºæ™‚光旅行或時é˜çš„å•é¡Œ)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "請注æ„: å° v3 金鑰製造å­é‘°æœƒå¤±åŽ» OpenPGP 相容性\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "真的è¦å»ºç«‹å—Ž? (y/N) " -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "儲存金鑰到å¡ç‰‡ä¸Šæ™‚失敗: %s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "無法建立備份檔案 `%s': %s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "請注æ„: å¡ç‰‡é‡‘鑰的備份已儲存至 `%s'\n" @@ -4140,246 +4261,246 @@ msgid "Keyring" msgstr "鑰匙圈" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr " 主鑰指紋:" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 msgid " Subkey fingerprint:" msgstr " å­é‘°æŒ‡ç´‹:" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1527 msgid " Primary key fingerprint:" msgstr " 主鑰指紋:" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " å­é‘°æŒ‡ç´‹:" # use tty -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr " 金鑰指紋 =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr " å¡ç‰‡åºè™Ÿ =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "把 `%s' é‡æ–°æ–°å‘½æˆ `%s' 時失敗: %s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s 是沒有改變的那一個\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s 是新的那一個\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "請修補這個å¯èƒ½çš„安全æ¼æ´ž\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "å¿«å–鑰匙圈 `%s' 中\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "ç›®å‰å·²æª¢æŸ¥ %lu 把金鑰 (å…± %lu 份簽章)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "已檢查 %lu 把金鑰 (å…± %lu 份簽章)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s: 鑰匙圈已建立\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "在æœå°‹çµæžœä¸­ä¹ŸåŒ…å«å·²æ’¤éŠ·çš„金鑰" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "以金鑰 ID æœå°‹æ™‚也æœå°‹å­é‘°" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "用暫存檔來將資料éžé€çµ¦é‡‘鑰伺æœå™¨å”助程å¼" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "使用暫存檔後ä¸è¦åŠ ä»¥åˆªé™¤" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "驗證簽章時自動å–回金鑰" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "å°Šé‡é‡‘鑰上所設定的å好金鑰伺æœå™¨ URL" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "å–回金鑰時尊é‡é‡‘鑰所設定的 PKA 記錄" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告: 金鑰伺æœå™¨é¸é … `%s' 並未用於此平å°\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "å·²åœç”¨" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "請輸入數字, N)下一é , 或 Q)離開 > " -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "無效的金鑰伺æœå™¨å”定 (我們用 %d!=ç¶“æ‰‹ç¨‹å¼ %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在金鑰伺æœå™¨ä¸Šæ‰¾ä¸åˆ°é‡‘é‘° \"%s\"\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "在金鑰伺æœå™¨ä¸Šæ‰¾ä¸åˆ°é‡‘é‘°\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "正在請求金鑰 %s 自 %s 伺æœå™¨ %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "正在請求金鑰 %s 自 %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "正在從 %s 伺æœå™¨ %s æœå°‹åå­—\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "正在從 %s æœå°‹åå­—\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "éžé€é‡‘é‘° %s 至 %s 伺æœå™¨ %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "éžé€é‡‘é‘° %s 至 %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "正在æœå°‹ \"%s\" æ–¼ %s 伺æœå™¨ %s\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "正在æœå°‹ \"%s\" æ–¼ %s\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "沒有金鑰伺æœå™¨å‹•ä½œ!\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告: 金鑰伺æœå™¨ç¶“手程å¼ä¿‚來自ä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1479 msgid "keyserver did not send VERSION\n" msgstr "金鑰伺æœå™¨ä¸¦æœªé€å‡ºç‰ˆæœ¬ (VERSION)\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "沒有已知的金鑰伺æœå™¨ (使用 --keyserver é¸é …)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "本版並ä¸æ”¯æ´å¤–部金鑰伺æœå™¨å«ç”¨\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "沒有 `%s' 金鑰伺æœå™¨æž¶æ§‹çš„經手程å¼\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "`%s' 動作在 `%s' 金鑰伺æœå™¨æž¶æ§‹ä¸­æœªæ”¯æ´\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s 並ä¸æ”¯æ´ç¬¬ %d 版經手程å¼\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "金鑰伺æœå™¨é€¾æ™‚\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "金鑰伺æœå™¨å…§éƒ¨éŒ¯èª¤\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "金鑰伺æœå™¨é€šè¨ŠéŒ¯èª¤: %s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" 並éžé‡‘é‘° ID: è·³éŽä¸­\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告: 無法更新金鑰 %s æ–¼ %s: %s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "æ›´æ–° 1 份金鑰中 (從 %s )\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "æ›´æ–° %d 份金鑰中 (從 %s )\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "警告: ç„¡æ³•æŠ“å– URI %s: %s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "警告: ç„¡æ³•å‰–æž URI %s\n" @@ -4531,62 +4652,62 @@ msgid "[uncertain]" msgstr "[ ä¸ç¢ºå®š ]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " äº¦å³ \"%s\"" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "這份簽署已經在 %s éŽæœŸäº†\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "這份簽署將在 %s 到期\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s 簽章, 摘è¦æ¼”算法 %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "二進制" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "文字模å¼" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "無法檢查簽章: %s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "ä¸æ˜¯ä¸€ä»½åˆ†é›¢çš„簽章\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告: åµæ¸¬åˆ°å¤šé‡ç°½ç« . 祇有第一個簽章纔會被核é¸.\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等級 0x%02x çš„ç¨ç«‹ç°½ç« \n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "舊型 (PGP 2.x) 簽章\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中åµæ¸¬åˆ°ç„¡æ•ˆçš„ root å°åŒ…\n" @@ -4624,59 +4745,64 @@ msgid "WARNING: using experimental digest algorithm %s\n" msgstr "警告: 正在使用實驗性的 %s 摘è¦æ¼”算法\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "警告: å·²ä¸å»ºè­°ä½¿ç”¨ %s 摘è¦æ¼”算法\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA 編密法外掛模組ä¸å­˜åœ¨\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "è«‹åƒè€ƒ %s 上進一步的資訊\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "警告: å·²ä¸å»ºè­°ä½¿ç”¨ %s 摘è¦æ¼”算法\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "請注æ„: %s 在本版中無法使用\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ä¸å»ºè­°ä½¿ç”¨çš„é¸é … \"%s\"\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "警告: å·²ä¸å»ºè­°ä½¿ç”¨ \"%s\" é¸é …\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "請改以 \"%s%s\" 代替\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "警告: \"%s\" 是個棄而ä¸é¡§çš„指令 - 別å†ç”¨äº†\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "未壓縮" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "uncompressed|none|未壓縮|ç„¡" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "這個訊æ¯å° %s 來說無法使用\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "ä¸æ˜Žç¢ºçš„ `%s' é¸é …\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "未知的 `%s' é¸é …\n" @@ -4728,11 +4854,11 @@ msgid "can't handle public key algorithm %d\n" msgstr "無法æ“作 %d 公開金鑰演算法\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "警告: å¯èƒ½ä¸¦ä¸å®‰å…¨çš„å°ç¨±å¼åŠ å¯†éšŽæ®µé‡‘é‘°\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d 類別的å­å°åŒ…設定了關éµä½å…ƒ\n" @@ -4818,7 +4944,7 @@ msgid "Repeat passphrase: " msgstr "è«‹å†è¼¸å…¥ä¸€æ¬¡å¯†èªž: " -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4832,58 +4958,58 @@ "妳的金鑰也會變æˆéžå¸¸åœ°å¤§!\n" "盡é‡æŠŠåœ–片尺寸控制在 240x288 å·¦å³, 會是個éžå¸¸ç†æƒ³çš„大å°.\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "輸入è¦ç•¶ä½œç…§ç‰‡ ID çš„ JPEG 檔å: " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "無法開啟 JPEG 圖檔 `%s': %s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "這個 JPEG 檔案真的很大 (%d ä½å…ƒçµ„) !\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "妳確定è¦ç”¨å®ƒå—Ž? (y/N) " -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "`%s' ä¸æ˜¯ä¸€å€‹ JPEG 圖檔\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "這張照片正確嗎? (y/N/q) " -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "沒有設定照片檢視程å¼\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "無法顯示照片 ID!\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "未指定原因" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "金鑰被代æ›äº†" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "金鑰已經被洩æ¼äº†" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "金鑰ä¸å†è¢«ä½¿ç”¨äº†" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "使用者 ID ä¸å†æœ‰æ•ˆäº†" @@ -4904,44 +5030,44 @@ msgid "No trust value assigned to:\n" msgstr "下列項目沒有å°æ‡‰çš„信任值:\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " äº¦å³ \"%s\"\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "妳有多信任這把金鑰真的屬於å«é€™å€‹å字的使用者?\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = 我ä¸çŸ¥é“或ä¸æƒ³èªª\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = 我*ä¸*ä¿¡ä»»\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = 我徹底信任\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = 回到主é¸å–®\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = è·³éŽé€™æŠŠé‡‘é‘°\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = 離開\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -4950,37 +5076,37 @@ "這把金鑰的最å°ä¿¡ä»»ç­‰ç´šç‚º: %s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "妳的決定是甚麼? " -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "è«‹å•å¦³æ˜¯å¦çœŸçš„想把這把金鑰設æˆå¾¹åº•ä¿¡ä»»å‘¢? (y/N) " -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "被徹底信任金鑰的憑證:\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s: 沒法ä¿è­‰é€™æŠŠé‡‘鑰真的屬於å«é€™å€‹å字的使用者\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:426 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s: 祇能有é™çš„ä¿è­‰é€™æŠŠé‡‘鑰真的屬於å«é€™å€‹å字的使用者\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:432 msgid "This key probably belongs to the named user\n" msgstr "這把金鑰很å¯èƒ½å±¬æ–¼å«é€™å€‹å字的使用者\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "這把金鑰是屬於我們自己的\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 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" @@ -4990,105 +5116,105 @@ "除éžå¦³ **真的** 知é“自己在åšç”šéº¼,\n" "å¦å‰‡å¦³æœ€å¥½åœ¨ä¸‹ä¸€å€‹å•é¡Œå›žç­” no\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "無論如何還是使用這把金鑰嗎? (y/N) " -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "警告: 正在使用ä¸è¢«ä¿¡ä»»çš„金鑰!\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "警告: 這把金鑰å¯èƒ½å·²æ’¤éŠ· (撤銷金鑰未出ç¾)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "警告: 這把金鑰已被其æŒæœ‰äººæ‰€æ’¤éŠ·!\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " 這很有å¯èƒ½è¡¨ç¤ºæ­¤ç°½ç« æ˜¯å½é€ çš„.\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "警告: 這把å­é‘°å·²è¢«å…¶æŒæœ‰äººæ‰€æ’¤éŠ·!\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "請注æ„: 這把金鑰已åœç”¨.\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "請注æ„: 已驗證的簽署者地å€ç‚º `%s'\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "請注æ„: ç°½ç½²è€…åœ°å€ `%s' 與 DNS 項目並ä¸å»åˆ\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "信任等級因ä¸è‰¯çš„ PKA 資訊而調整為 *æ°¸é ä¸æœƒ*\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "請注æ„: 這把金鑰已經éŽæœŸäº†!\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "警告: 這把金鑰並éžä»¥å—信任的簽章所èªè­‰!\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " 沒有證據指出這個簽章屬於這個æŒæœ‰è€….\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "警告: 我們 *ä¸* 信任這把金鑰!\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " 這個簽章很有å¯èƒ½æ˜¯ *å½é€ çš„*.\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "警告: 這把金鑰並éžä»¥è¶³å¤ ä¿¡ä»»çš„簽章所èªè­‰!\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " 這份簽章並ä¸å±¬æ–¼é€™å€‹æŒæœ‰è€…\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: 已跳éŽ: %s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳éŽ: 公鑰已存在\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "妳沒有指定使用者 ID. (妳å¯èƒ½å¾—用 \"-r\")\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "ç›®å‰çš„收件者:\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5096,33 +5222,33 @@ "\n" "請輸入使用者 ID. 以空白列çµæŸ: " -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "沒有這個使用者 ID.\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "已跳éŽ: 公鑰已經被設æˆé è¨­æ”¶ä»¶è€…\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "公鑰已åœç”¨.\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "已跳éŽ: 公鑰已設éŽ\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的é è¨­æ”¶ä»¶è€… \"%s\"\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: 已跳éŽ: 公鑰已åœç”¨\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "沒有有效的地å€\n" @@ -5189,7 +5315,7 @@ msgstr "請注æ„: 金鑰已撤銷" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失敗: %s\n" @@ -5211,11 +5337,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "è¦ç‚ºé€™æŠŠé‡‘鑰建立一份指定撤銷憑證嗎? (y/N) " -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "已強迫使用 ASCII å°è£éŽçš„輸出.\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失敗: %s\n" @@ -5234,28 +5360,28 @@ msgid "secret key \"%s\" not found: %s\n" msgstr "找ä¸åˆ°ç§é‘° \"%s\": %s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "沒有相å°æ‡‰çš„公鑰: %s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "公鑰與ç§é‘°ä¸¦ä¸å»åˆ!\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "è¦ç‚ºé€™æŠŠé‡‘鑰建立一份撤銷憑證嗎? (y/N) " -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "未知的ä¿è­·æ¼”算法\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "請注æ„: 這把金鑰未å—ä¿è­·!\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5274,33 +5400,33 @@ "但是åƒè¬å°å¿ƒ: 妳的機器上的列å°ç³»çµ±å¯èƒ½æœƒåœ¨åˆ—å°éŽ\n" "程中把這些資料暫存在æŸå€‹å…¶ä»–人也能夠看得到的地方!\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "è«‹é¸æ“‡æ’¤éŠ·çš„原因:\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "å–消" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(也許妳會想è¦åœ¨é€™è£¡é¸æ“‡ %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "請輸入é¸ç”¨çš„æè¿°; 以空白列çµæŸ:\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "撤銷原因: %s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(沒有給定æè¿°)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "這樣å¯ä»¥å—Ž? (y/N) " @@ -5372,44 +5498,44 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "警告: 簽署å­é‘° %s 有無效的交å‰æ†‘è­‰\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "公鑰 %s 比簽章還è¦æ–°äº† %lu 秒\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "公鑰 %s 比簽章還è¦æ–°äº† %lu 秒\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (å¯èƒ½æ˜¯å› ç‚ºæ™‚光旅行或時é˜çš„å•é¡Œ)\n" -#: g10/sig-check.c:193 +#: g10/sig-check.c:205 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (å¯èƒ½æ˜¯å› ç‚ºæ™‚光旅行或時é˜çš„å•é¡Œ)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "請注æ„: 簽章金鑰 %s 已於 %s éŽæœŸ\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "å‡è¨­é‡‘é‘° %s çš„æ壞簽章導因於æŸå€‹æœªçŸ¥çš„é—œéµä½å…ƒ\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "金鑰 %s: 沒有å­é‘°å¯ä¾›å­é‘°æ’¤éŠ·ç°½ç« ä½¿ç”¨\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "金鑰 %s: 沒有å­é‘°å¯ä¾›é™„å­é‘°ç°½ç« ä¹‹ç”¨\n" @@ -5537,12 +5663,12 @@ msgid "trustdb: sync failed: %s\n" msgstr "信任資料庫: åŒæ­¥åŒ–失敗: %s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "信任資料庫記錄 %lu: 本機æœå°‹å¤±æ•—: %s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n" @@ -5586,84 +5712,85 @@ msgid "%s: trustdb created\n" msgstr "%s: 建立了信任資料庫\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "請注æ„: 信任資料庫ä¸å¯å¯«å…¥\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: 無效的信任資料庫\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: 建立雜湊表失敗: %s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: 更新版本記錄時錯誤: %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: 讀å–版本記錄時錯誤: %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: 寫入版本記錄時錯誤: %s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "信任資料庫: 本機æœå°‹å¤±æ•—: %s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "信任資料庫: 讀å–失敗 (n=%d): %s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ä¸æ˜¯ä¸€å€‹ä¿¡ä»»è³‡æ–™åº«æª”案\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: 記錄編號為 %lu 的版本記錄\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: 無效的檔案版本 %d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: 讀å–å¯ç”¨ç©ºé–“記錄時出錯: %s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: 寫入目錄記錄時出錯: %s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: 記錄歸零失敗: %s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: 附加記錄失敗: %s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "信任資料庫已æ毀; 請執行 \"gpg --fix-trustdb\".\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s: 建立了信任資料庫\n" #: g10/textfilter.c:147 #, c-format @@ -5710,126 +5837,134 @@ msgid "trust record %lu is not of requested type %d\n" msgstr "信任記錄 %lu ä¸æ˜¯æ‰€è«‹æ±‚的類別 %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "無法使用未知的信任模型 (%d) - ç¾åœ¨æŽ¡ç”¨ %s 信任模型\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:472 #, c-format msgid "using %s trust model\n" msgstr "正在使用 %s 信任模型\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 譯者請åƒè¦‹ trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:526 msgid "[ revoked]" msgstr "[ 已撤銷 ]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[ å·²éŽæœŸ ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ 未知 ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[ 未定義 ]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ 勉強 ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ 完全 ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ 徹底 ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "未定義" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "æ°¸é ä¸æœƒ" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "勉強" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "完全" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "徹底" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "ä¸éœ€è¦æª¢æŸ¥ä¿¡ä»»è³‡æ–™åº«\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任資料庫檢查將於 %s 進行\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "在 `%s' 信任模型中並ä¸éœ€è¦æª¢æŸ¥ä¿¡ä»»è³‡æ–™åº«\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "在 `%s' 信任模型中並ä¸éœ€è¦æ›´æ–°ä¿¡ä»»è³‡æ–™åº«\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "找ä¸åˆ°å…¬é‘° %s: %s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "è«‹åšä¸€æ¬¡ --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "正在檢查信任資料庫\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "已經處ç†äº† %d 把金鑰 (共計已解決了 %d 份有效性)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "沒有找到任何徹底信任的金鑰\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "找ä¸åˆ°å¾¹åº•ä¿¡ä»»é‡‘é‘° %s 的公鑰\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d å€‹å‹‰å¼·ä¿¡ä»»ä»¥åŠ %d 個完全信任是 %s 信任模型的最å°éœ€æ±‚\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, 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:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n" @@ -6088,47 +6223,47 @@ msgstr "妳找到一個瑕疵了 ... (%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:380 util/miscutil.c:417 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:381 util/miscutil.c:422 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:383 util/miscutil.c:419 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:384 util/miscutil.c:423 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:421 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:424 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:457 msgid "okay|okay" msgstr "okay|okay" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:459 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:460 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:461 msgid "cC" msgstr "cC" @@ -6148,6 +6283,15 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(也許妳é¸éŒ¯ç¨‹å¼ä¾†åšé€™ä»¶äº‹äº†)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA 金鑰å°æœƒæœ‰ %u ä½å…ƒé•·.\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "信任資料庫已æ毀; 請執行 \"gpg --fix-trustdb\".\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|管ç†è€… PIN" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "無法在 v3 (PGP 2.x åž‹æ…‹) 的簽章內放入標記資料\n" diff -Nru gnupg-1.4.9/README gnupg-1.4.10/README --- gnupg-1.4.9/README 2008-03-26 17:26:38.000000000 +0000 +++ gnupg-1.4.10/README 2009-09-02 13:48:24.000000000 +0100 @@ -1,10 +1,11 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 1.4.9 + Version 1.4.10 - Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005, 2006, 2007, 2008, + 2009 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 @@ -29,15 +30,16 @@ See http://www.gnupg.org/download/supported_systems.html for a list of systems which are known to work. - See the file COPYING for copyright and warranty information. + GnuPG is distributed under the terms of the GNU General Public + License. See the file COPYING for copyright and warranty + information. Because GnuPG does not use use any patented algorithms it is not by default fully compatible with PGP 2.x, which uses the patented IDEA algorithm. See http://www.gnupg.org/why-not-idea.html for - more information on this subject, including what to do if you are - legally entitled to use IDEA. + more information on this subject. - The default public key algorithms are DSA and Elgamal, but RSA is + The default public key algorithm is RSA, but DSA and Elgamal are also supported. Symmetric algorithms available are AES (with 128, 192, and 256 bit keys), 3DES, Blowfish, CAST5 and Twofish. Digest algorithms available are MD5, RIPEMD/160, SHA-1, SHA-256, SHA-384, @@ -70,7 +72,9 @@ 8) To avoid swapping out of sensitive data, you can install "gpg" setuid root. If you don't do so, you may want to add the - option "no-secmem-warning" to ~/.gnupg/gpg.conf + option "no-secmem-warning" to ~/.gnupg/gpg.conf. Note that on + modern GNU/Linux systems swapping protection does not anymore + require GPG to be installed setuid root. How to Verify the Source @@ -598,7 +602,8 @@ right, so if you want to have an "almost minimal" configuration, you can do (for example) "--enable-minimal --enable-rsa" to have RSA added - to the minimal build. + to the minimal build. Adding the option + --disable-nls may be useful too. --enable-key-cache=SIZE Set the internal key and UID cache size. This has diff -Nru gnupg-1.4.9/scripts/w32installer.nsi gnupg-1.4.10/scripts/w32installer.nsi --- gnupg-1.4.9/scripts/w32installer.nsi 2008-01-30 17:29:50.000000000 +0000 +++ gnupg-1.4.10/scripts/w32installer.nsi 2008-12-11 16:39:45.000000000 +0000 @@ -570,7 +570,7 @@ "GnuPG is GNU's tool for secure communication and data storage. \ It can be used to encrypt data and to create digital signatures. \ It includes an advanced key management facility and is compliant \ - with the proposed OpenPGP Internet standard as described in RFC2440. \ + with the proposed OpenPGP Internet standard as described in RFC4880. \ \r\n\r\n$_CLICK \ \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\ built on $%BUILDINFO%\r\n\ diff -Nru gnupg-1.4.9/tools/Makefile.in gnupg-1.4.10/tools/Makefile.in --- gnupg-1.4.9/tools/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/tools/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -62,11 +62,11 @@ $(srcdir)/gpg-zip.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -117,7 +117,7 @@ shmtest_DEPENDENCIES = $(needed_libs) $(am__DEPENDENCIES_2) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -159,7 +159,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -480,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -493,8 +492,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -504,13 +503,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -Nru gnupg-1.4.9/util/ChangeLog gnupg-1.4.10/util/ChangeLog --- gnupg-1.4.9/util/ChangeLog 2008-03-20 09:06:44.000000000 +0000 +++ gnupg-1.4.10/util/ChangeLog 2009-08-25 19:44:45.000000000 +0100 @@ -1,3 +1,107 @@ +2009-08-25 Werner Koch + + * compat.c: Change license to all-permissive. The GPL and the + exception does no make sense here. + (do_strconcat, xstrconcat): New. + +2009-08-18 Werner Koch + + * iobuf.c (fd_cache_close): Change debug printf format assuming + that FILEP_OR_FD is today always an int. + + * miscutil.c (print_string2): Loose check for control characters + to better cope with utf-8. The range 0x80..0x9f is nowadays not + anymore accidently used for control charaters. Fixes bug#1103. + +2009-08-11 David Shaw + + * strgutil.c (string_to_utf8): New function to convert a Latin-1 + string to UTF8. From GPA. + +2009-07-23 David Shaw + + * srv.c (getsrv): Fix type-punning warning. + (main): Allow testing any SRV. + +2009-07-21 Werner Koch + + * ttyio.c (tty_printf): Replace vasprintf by xtryasprintf. + (tty_fprintf): Ditto. + + * strgutil.c: Include estream-printf.h. + (xasprintf, xtryasprintf): New. + (vasprintf, asprintf): Remove. + + * estream-printf.c: New. Taken from libestream. + * Makefile.am (libutil_a_SOURCES): Add it. + + * memory.c (trymalloc,trystrdup): New. + + * convert.c: New. Taken from GnuPG 2.0 SVN. + * Makefile.am (libutil_a_SOURCES): Add it. + +2009-05-26 David Shaw + + * http.c (send_request): Pass in a STRLIST for additional headers. + Change all callers. + +2009-05-22 Werner Koch + + * ttyio.c (tty_cleanup_after_signal): New. + +2009-05-05 Werner Koch + + * dotlock.c: Merged changes from GnuPG-2. Better detection of + stale lockfiles and actual locking support on W32. Fixes bug#1028. + + * miscutil.c (isotime2seconds): New. + +2009-04-05 David Shaw + + * srv.h: Move to include/srv.h. + + * http.c (send_request): Pass in srvtag... + (http_open): ...from here. + +2009-04-02 David Shaw + + * http.c (connect_server): free (rather than xfree) the result of + getsrv(). + (http_open, http_open_document): Allow passing srvtag to http_open + and http_open_document. + + * Makefile.am: Make srv.c part of libcompat instead of libutil. + + * srv.c (getsrv): Raise maximum packet size to 2048, as PACKETSZ + is too small these days. Use libc malloc and free as we're part + of libcompat now which may not be linked to memory.c. + +2009-03-20 David Shaw + + * iobuf.c (fd_cache_synchronize): New. fsync() a file in cache. + (iobuf_ioctl): Called here, for ioctl 4. + (fd_cache_invalidate): Pass return code from close() back to + iobuf_ioctl(). + +2009-03-13 David Shaw + + * http.c (do_parse_uri): Properly handle IPv6 literal addresses as + per RFC-2732. Adapted from patch by Phil Pennock. + + * Makefile.am, http.c (start_server): Minor tweaks to get + http-test compiling again. + +2008-09-05 David Shaw + + * Makefile.am: Use $(CC) instead of "cc" to compile, as the user + might be overriding the compiler. + +2008-08-19 Werner Koch + + * iobuf.c: Avoid passing a NULL (iobuf_t)->desc to the log + function. Should in general never be NULL, but well. Reported by + M. Heneka. + 2008-03-06 David Shaw * argparse.c (default_strusage): Update copyright date. diff -Nru gnupg-1.4.9/util/compat.c gnupg-1.4.10/util/compat.c --- gnupg-1.4.9/util/compat.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/compat.c 2009-08-25 19:41:11.000000000 +0100 @@ -1,5 +1,42 @@ +/* compat.c - Simple compatibility functions + * Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. + * + * The origin of this code is GnuPG. + * + * 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. + * + * History: + * 2006-09-28 dshaw Created. Added function hextobyte from GnuPG. + * 2007-04-16 dshaw Added ascii_toupper, ascii_tolower, ascii_strcasecmp, + * ascii_strncasecmp from GnuPG. + * 2009-08-25 wk License changed by GnuPG maintainer from GPL with + * OpenSSL exception to this all permissive license. + * 2009-08-25 wk Wrote new function xstrconcat. + */ + +#include +#include +#include +#include +#include #include +/* We require an external malloc function named xtrymalloc. */ +void *xtrymalloc (size_t n); + + +#ifndef DIM +#define DIM(v) (sizeof(v)/sizeof((v)[0])) +#endif + + + int hextobyte (const char *s) { @@ -92,3 +129,73 @@ return c1 - c2; } + + +static char * +do_strconcat (const char *s1, va_list arg_ptr) +{ + const char *argv[48]; + size_t argc; + size_t needed; + char *buffer, *p; + const char *r; + + argc = 0; + argv[argc++] = s1; + needed = strlen (s1); + while (((argv[argc] = va_arg (arg_ptr, const char *)))) + { + needed += strlen (argv[argc]); + if (argc >= DIM (argv)-1) + { + errno = EINVAL; + return NULL; + } + argc++; + } + needed++; + buffer = xtrymalloc (needed); + if (buffer) + { + for (p = buffer, argc=0; argv[argc]; argc++) + { + for (r = argv[argc]; *r; ) + *p++ = *r++; + *p = 0; + } + } + return buffer; +} + + +/* Concatenate the string S1 with all the following strings up to a + NULL. Returns a malloced buffer. */ +char * +xstrconcat (const char *s1, ...) +{ + va_list arg_ptr; + char *result; + + if (!s1) + { + result = xtrymalloc (1); + if (result) + *result = 0; + } + else + { + va_start (arg_ptr, s1); + result = do_strconcat (s1, arg_ptr); + va_end (arg_ptr); + } + if (!result) + { + if (errno == EINVAL) + fputs ("\nfatal: too many args for xstrconcat\n", stderr); + else + fputs ("\nfatal: out of memory\n", stderr); + exit (2); + } + return result; +} + diff -Nru gnupg-1.4.9/util/convert.c gnupg-1.4.10/util/convert.c --- gnupg-1.4.9/util/convert.c 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/util/convert.c 2009-07-20 09:21:54.000000000 +0100 @@ -0,0 +1,249 @@ +/* convert.c - Hex conversion functions. + * Copyright (C) 2006, 2008 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 3 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, see . + */ + +#include +#include +#include +#include + +#include "util.h" + + +#define tohex(n) ((n) < 10 ? ((n) + '0') : (((n) - 10) + 'A')) + + +/* Convert STRING consisting of hex characters into its binary + representation and store that at BUFFER. BUFFER needs to be of + LENGTH bytes. The function checks that the STRING will convert + exactly to LENGTH bytes. The string is delimited by either end of + string or a white space character. The function returns -1 on + error or the length of the parsed string. */ +int +hex2bin (const char *string, void *buffer, size_t length) +{ + int i; + const char *s = string; + + for (i=0; i < length; ) + { + if (!hexdigitp (s) || !hexdigitp (s+1)) + return -1; /* Invalid hex digits. */ + ((unsigned char*)buffer)[i++] = xtoi_2 (s); + s += 2; + } + if (*s && (!isascii (*s) || !isspace (*s)) ) + return -1; /* Not followed by Nul or white space. */ + if (i != length) + return -1; /* Not of expected length. */ + if (*s) + s++; /* Skip the delimiter. */ + return s - string; +} + + +/* Convert STRING consisting of hex characters into its binary representation + and store that at BUFFER. BUFFER needs to be of LENGTH bytes. The + function check that the STRING will convert exactly to LENGTH + bytes. Colons inbetween the hex digits are allowed, if one colon + has been given a colon is expected very 2 characters. The string + is delimited by either end of string or a white space character. + The function returns -1 on error or the length of the parsed + string. */ +int +hexcolon2bin (const char *string, void *buffer, size_t length) +{ + int i; + const char *s = string; + int need_colon = 0; + + for (i=0; i < length; ) + { + if (i==1 && *s == ':') /* Skip colons between hex digits. */ + { + need_colon = 1; + s++; + } + else if (need_colon && *s == ':') + s++; + else if (need_colon) + return -1; /* Colon expected. */ + if (!hexdigitp (s) || !hexdigitp (s+1)) + return -1; /* Invalid hex digits. */ + ((unsigned char*)buffer)[i++] = xtoi_2 (s); + s += 2; + } + if (*s == ':') + return -1; /* Trailing colons are not allowed. */ + if (*s && (!isascii (*s) || !isspace (*s)) ) + return -1; /* Not followed by Nul or white space. */ + if (i != length) + return -1; /* Not of expected length. */ + if (*s) + s++; /* Skip the delimiter. */ + return s - string; +} + + + +static char * +do_bin2hex (const void *buffer, size_t length, char *stringbuf, int with_colon) +{ + const unsigned char *s; + char *p; + + if (!stringbuf) + { + /* Not really correct for with_colon but we don't care about the + one wasted byte. */ + size_t n = with_colon? 3:2; + size_t nbytes = n * length + 1; + if (length && (nbytes-1) / n != length) + { + errno = ENOMEM; + return NULL; + } + stringbuf = xtrymalloc (nbytes); + if (!stringbuf) + return NULL; + } + + for (s = buffer, p = stringbuf; length; length--, s++) + { + if (with_colon && s != buffer) + *p++ = ':'; + *p++ = tohex ((*s>>4)&15); + *p++ = tohex (*s&15); + } + *p = 0; + + return stringbuf; +} + + +/* Convert LENGTH bytes of data in BUFFER into hex encoding and store + that at the provided STRINGBUF. STRINGBUF must be allocated of at + least (2*LENGTH+1) bytes or be NULL so that the function mallocs an + appropriate buffer. Returns STRINGBUF or NULL on error (which may + only occur if STRINGBUF has been NULL and the internal malloc + failed). */ +char * +bin2hex (const void *buffer, size_t length, char *stringbuf) +{ + return do_bin2hex (buffer, length, stringbuf, 0); +} + +/* Convert LENGTH bytes of data in BUFFER into hex encoding and store + that at the provided STRINGBUF. STRINGBUF must be allocated of at + least (3*LENGTH+1) bytes or be NULL so that the function mallocs an + appropriate buffer. Returns STRINGBUF or NULL on error (which may + only occur if STRINGBUF has been NULL and the internal malloc + failed). */ +char * +bin2hexcolon (const void *buffer, size_t length, char *stringbuf) +{ + return do_bin2hex (buffer, length, stringbuf, 1); +} + + + +/* Convert HEXSTRING consisting of hex characters into string and + store that at BUFFER. HEXSTRING is either delimited by end of + string or a white space character. The function makes sure that + the resulting string in BUFFER is terminated by a Nul character. + BUFSIZE is the availabe length of BUFFER; if the converted result + plus a possible required Nul character does not fit into this + buffer, the function returns NULL and won't change the existing + conent of buffer. In-place conversion is possible as long as + BUFFER points to HEXSTRING. + + If BUFFER is NULL and bufsize is 0 the function scans HEXSTRING but + does not store anything. This may be used to find the end of + hexstring. + + On sucess the function returns a pointer to the next character + after HEXSTRING (which is either end-of-string or a the next white + space). If BUFLEN is not NULL the strlen of buffer is stored + there; this will even be done if BUFFER has been passed as NULL. */ +const char * +hex2str (const char *hexstring, char *buffer, size_t bufsize, size_t *buflen) +{ + const char *s = hexstring; + int idx, count; + int need_nul = 0; + + if (buflen) + *buflen = 0; + + for (s=hexstring, count=0; hexdigitp (s) && hexdigitp (s+1); s += 2, count++) + ; + if (*s && (!isascii (*s) || !isspace (*s)) ) + return NULL; /* Not followed by Nul or white space. */ + /* We need to append a nul character. However we don't want that if + the hexstring already ends with "00". */ + need_nul = ((s == hexstring) || !(s[-2] == '0' && s[-1] == '0')); + if (need_nul) + count++; + + if (buffer) + { + if (count > bufsize) + return NULL; /* Too long. */ + + for (s=hexstring, idx=0; hexdigitp (s) && hexdigitp (s+1); s += 2) + ((unsigned char*)buffer)[idx++] = xtoi_2 (s); + if (need_nul) + buffer[idx] = 0; + } + + if (buflen) + *buflen = count - 1; + return s; +} + + +/* Same as hex2str but this function allocated a new string. Returns + NULL on error. If R_COUNT is not NULL, the number of scanned bytes + will be stored there. ERRNO is set on error. */ +char * +hex2str_alloc (const char *hexstring, size_t *r_count) +{ + const char *tail; + size_t nbytes; + char *result; + + tail = hex2str (hexstring, NULL, 0, &nbytes); + if (!tail) + { + if (r_count) + *r_count = 0; + errno = EINVAL; + return NULL; + } + if (r_count) + *r_count = tail - hexstring; + result = xtrymalloc (nbytes+1); + if (!result) + return NULL; + if (!hex2str (hexstring, result, nbytes+1, NULL)) + BUG (); + return result; +} + + + diff -Nru gnupg-1.4.9/util/dotlock.c gnupg-1.4.10/util/dotlock.c --- gnupg-1.4.9/util/dotlock.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/dotlock.c 2009-05-05 14:44:01.000000000 +0100 @@ -1,6 +1,6 @@ /* dotlock.c - dotfile locking * Copyright (C) 1998, 1999, 2000, 2001, 2004, - * 2005 Free Software Foundation, Inc. + * 2005, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -25,8 +25,11 @@ #include #include #include -#if !defined (HAVE_DOSISH_SYSTEM) -#include +#ifdef HAVE_DOSISH_SYSTEM +# define WIN32_LEAN_AND_MEAN +# include +#else +# include #endif #include #ifndef _WIN32 @@ -38,25 +41,50 @@ #include "types.h" #include "util.h" #include "memory.h" +#include "i18n.h" + +/* The object describing a lock. */ struct dotlock_handle { struct dotlock_handle *next; char *tname; /* name of lockfile template */ char *lockname; /* name of the real lockfile */ int locked; /* lock status */ int disable; /* locking */ +#ifdef HAVE_DOSISH_SYSTEM + HANDLE lockhd; /* The W32 handle of the lock file. */ +#else + size_t nodename_off; /* Offset in TNAME to the nodename part. */ + size_t nodename_len; /* Length of the nodename part. */ +#endif }; +/* A list of of all lock handles. */ static volatile DOTLOCK all_lockfiles; + +/* If this has the value true all locking is disabled. */ static int never_lock; + +#ifdef _REENTRANT + /* fixme: acquire mutex on all_lockfiles */ +# define lock_all_lockfiles(h) do { } while (0) +# define unlock_all_lockfiles(h) do { } while (0) +#else +# define lock_all_lockfiles(h) do { } while (0) +# define unlock_all_lockfiles(h) do { } while (0) +#endif + + + void disable_dotlock(void) { - never_lock = 1; + never_lock = 1; } + /**************** * Create a lockfile with the given name and return an object of * type DOTLOCK which may be used later to actually do the lock. @@ -78,14 +106,16 @@ { static int initialized; DOTLOCK h; -#if !defined (HAVE_DOSISH_SYSTEM) +#ifndef HAVE_DOSISH_SYSTEM int fd = -1; char pidstr[16]; struct utsname utsbuf; const char *nodename; const char *dirpart; int dirpartlen; -#endif + size_t tnamelen; + int n; +#endif /*!HAVE_DOSISH_SYSTEM*/ if( !initialized ) { atexit( remove_lockfiles ); @@ -97,18 +127,15 @@ h = xmalloc_clear( sizeof *h ); if( never_lock ) { h->disable = 1; -#ifdef _REENTRANT - /* fixme: aquire mutex on all_lockfiles */ -#endif + lock_all_lockfiles (h); h->next = all_lockfiles; all_lockfiles = h; return h; } -#if !defined (HAVE_DOSISH_SYSTEM) - sprintf( pidstr, "%10d\n", (int)getpid() ); - /* fixme: add the hostname to the second line (FQDN or IP addr?) */ +#ifndef HAVE_DOSISH_SYSTEM + snprintf (pidstr, sizeof pidstr, "%10d\n", (int)getpid() ); /* create a temporary file */ if( uname( &utsbuf ) ) @@ -116,14 +143,14 @@ else nodename = utsbuf.nodename; -#ifdef __riscos__ +# ifdef __riscos__ { char *iter = (char *) nodename; for (; iter[0]; iter++) if (iter[0] == '.') iter[0] = '/'; } -#endif /* __riscos__ */ +# endif /* __riscos__ */ if( !(dirpart = strrchr( file_to_lock, DIRSEP_C )) ) { dirpart = EXTSEP_S; @@ -134,25 +161,27 @@ dirpart = file_to_lock; } -#ifdef _REENTRANT - /* fixme: aquire mutex on all_lockfiles */ -#endif + lock_all_lockfiles (h); h->next = all_lockfiles; all_lockfiles = h; - h->tname = xmalloc( dirpartlen + 6+30+ strlen(nodename) + 11 ); -#ifndef __riscos__ - sprintf( h->tname, "%.*s/.#lk%p.%s.%d", - dirpartlen, dirpart, (void *)h, nodename, (int)getpid() ); -#else /* __riscos__ */ - sprintf( h->tname, "%.*s.lk%p/%s/%d", - dirpartlen, dirpart, (void *)h, nodename, (int)getpid() ); -#endif /* __riscos__ */ + tnamelen = dirpartlen + 6+30+ strlen(nodename) + 10; + h->tname = xmalloc (tnamelen + 1); + h->nodename_len = strlen (nodename); + +# ifndef __riscos__ + snprintf (h->tname, tnamelen, "%.*s/.#lk%p.%n%s.%d", + dirpartlen, dirpart, (void *)h, &n, nodename, (int)getpid ()); +# else /* __riscos__ */ + snprintf (h->tname, tnamelen, "%.*s.lk%p/%n%s/%d", + dirpartlen, dirpart, (void *)h, &n, nodename, (int)getpid ()); +# endif /* __riscos__ */ + h->nodename_off = n; do { errno = 0; - fd = open( h->tname, O_WRONLY|O_CREAT|O_EXCL, - S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR ); + fd = open (h->tname, O_WRONLY|O_CREAT|O_EXCL, + S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR); } while( fd == -1 && errno == EINTR ); if( fd == -1 ) { all_lockfiles = h->next; @@ -162,78 +191,110 @@ xfree(h); return NULL; } - if( write(fd, pidstr, 11 ) != 11 ) { - all_lockfiles = h->next; -#ifdef _REENTRANT - /* release mutex */ -#endif - log_fatal( "error writing to `%s': %s\n", h->tname, strerror(errno) ); - close(fd); - unlink(h->tname); - xfree(h->tname); - xfree(h); - return NULL; - } - if( close(fd) ) { - all_lockfiles = h->next; -#ifdef _REENTRANT - /* release mutex */ -#endif - log_error( "error closing `%s': %s\n", h->tname, strerror(errno)); - unlink(h->tname); - xfree(h->tname); - xfree(h); - return NULL; - } + if (write (fd, pidstr, 11) != 11) + goto write_failed; + if (write (fd, nodename, strlen (nodename)) != strlen (nodename)) + goto write_failed; + if (write (fd, "\n", 1 ) != 1) + goto write_failed; + if (close (fd)) + goto write_failed; -#ifdef _REENTRANT - /* release mutex */ -#endif -#endif + unlock_all_lockfiles (h); h->lockname = xmalloc( strlen(file_to_lock) + 6 ); strcpy(stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock"); return h; + + write_failed: + all_lockfiles = h->next; + unlock_all_lockfiles (h); + log_error ("error writing to `%s': %s\n", h->tname, strerror(errno)); + close (fd); + unlink (h->tname); + xfree (h->tname); + xfree (h); + return NULL; + +#else /* HAVE_DOSISH_SYSTEM */ + + /* The Windows version does not need a temporary file but uses the + plain lock file along with record locking. We create this file + here so that we later do only need to do the file locking. For + error reporting it is useful to keep the name of the file in the + handle. */ + h->next = all_lockfiles; + all_lockfiles = h; + + h->lockname = xmalloc ( strlen (file_to_lock) + 6 ); + strcpy (stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock"); + + /* If would be nice if we would use the FILE_FLAG_DELETE_ON_CLOSE + along with FILE_SHARE_DELETE but that does not work due to a race + condition: Despite the OPEN_ALWAYS flag CreateFile may return an + error and we can't reliable create/open the lock file unless we + would wait here until it works - however there are other valid + reasons why a lock file can't be created and thus the process + would not stop as expected but spin until Windows crashes. Our + solution is to keep the lock file open; that does not harm. */ + h->lockhd = CreateFile (h->lockname, + GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_ALWAYS, 0, NULL); + if (h->lockhd == INVALID_HANDLE_VALUE) + { + log_error (_("can't create `%s': %s\n"), h->lockname, w32_strerror (-1)); + all_lockfiles = h->next; + xfree (h->lockname); + xfree (h); + return NULL; + } + return h; + +#endif /* HAVE_DOSISH_SYSTEM */ } void destroy_dotlock ( DOTLOCK h ) { -#if !defined (HAVE_DOSISH_SYSTEM) - if ( h ) - { - DOTLOCK hprev, htmp; + DOTLOCK hprev, htmp; - /* First remove the handle from our global list of all locks. */ - for (hprev=NULL, htmp=all_lockfiles; htmp; hprev=htmp, htmp=htmp->next) - if (htmp == h) - { - if (hprev) - hprev->next = htmp->next; - else - all_lockfiles = htmp->next; - h->next = NULL; - break; - } - - /* Second destroy the lock. */ - if (!h->disable) - { - if (h->locked && h->lockname) - unlink (h->lockname); - if (h->tname) - unlink (h->tname); - xfree (h->tname); - xfree (h->lockname); - } - xfree(h); + if (!h) + return; + /* First remove the handle from our global list of all locks. */ + for (hprev=NULL, htmp=all_lockfiles; htmp; hprev=htmp, htmp=htmp->next) + if (htmp == h) + { + if (hprev) + hprev->next = htmp->next; + else + all_lockfiles = htmp->next; + h->next = NULL; + break; } + + /* Second destroy the lock. */ + if (!h->disable) + { +#ifdef HAVE_DOSISH_SYSTEM + if (h->locked) + UnlockFile (h->lockhd, 0, 0, 1, 0); + CloseHandle (h->lockhd); +#else + if (h->locked && h->lockname) + unlink (h->lockname); + if (h->tname) + unlink (h->tname); + xfree (h->tname); #endif + xfree (h->lockname); + } + xfree(h); } -#ifndef HAVE_DOSISH_SYSTEM +#ifndef HAVE_DOSISH_SYSTEM static int maybe_deadlock( DOTLOCK h ) { @@ -245,44 +306,101 @@ } return 0; } +#endif /* !HAVE_DOSISH_SYSTEM */ -/**************** - * Read the lock file and return the pid, returns -1 on error. - */ + +/* Read the lock file and return the pid, returns -1 on error. True + will be stored in the integer at address SAME_NODE if the lock file + has been created on the same node. */ +#ifndef HAVE_DOSISH_SYSTEM static int -read_lockfile( const char *name ) +read_lockfile (DOTLOCK h, int *same_node ) { - int fd, pid; - char pidstr[16]; + char buffer_space[10+1+70+1]; /* 70 is just an estimated value; node + names are usually shorter. */ + int fd; + int pid = -1; + char *buffer, *p; + size_t expected_len; + int res, nread; + + *same_node = 0; + expected_len = 10 + 1 + h->nodename_len + 1; + if ( expected_len >= sizeof buffer_space) + buffer = xmalloc (expected_len); + else + buffer = buffer_space; - if( (fd = open(name, O_RDONLY)) == -1 ) { - int e = errno; - log_debug("error opening lockfile `%s': %s\n", name, strerror(errno) ); - errno = e; - return -1; - } - if( read(fd, pidstr, 10 ) != 10 ) { /* Read 10 digits w/o newline */ - log_debug("error reading lockfile `%s'", name ); - close(fd); - errno = 0; - return -1; + if ( (fd = open (h->lockname, O_RDONLY)) == -1 ) + { + int e = errno; + log_info ("error opening lockfile `%s': %s\n", + h->lockname, strerror(errno) ); + if (buffer != buffer_space) + xfree (buffer); + errno = e; /* Need to return ERRNO here. */ + return -1; + } + + p = buffer; + nread = 0; + do + { + res = read (fd, p, expected_len - nread); + if (res == -1 && errno == EINTR) + continue; + if (res < 0) + { + log_info ("error reading lockfile `%s'", h->lockname ); + close (fd); + if (buffer != buffer_space) + xfree (buffer); + errno = 0; /* Do not return an inappropriate ERRNO. */ + return -1; + } + p += res; + nread += res; + } + while (res && nread != expected_len); + close (fd); + + if (nread < 11) + { + log_info ("invalid size of lockfile `%s'", h->lockname ); + if (buffer != buffer_space) + xfree (buffer); + errno = 0; /* Better don't return an inappropriate ERRNO. */ + return -1; } - pidstr[10] = 0; /* terminate pid string */ - close(fd); - pid = atoi(pidstr); + + if (buffer[10] != '\n' + || (buffer[10] = 0, pid = atoi (buffer)) == -1 #ifndef __riscos__ - if( !pid || pid == -1 ) { + || !pid #else /* __riscos__ */ - if( (!pid && riscos_getpid()) || pid == -1 ) { + || (!pid && riscos_getpid()) #endif /* __riscos__ */ - log_error("invalid pid %d in lockfile `%s'", pid, name ); - errno = 0; - return -1; + ) + { + log_error ("invalid pid %d in lockfile `%s'", pid, h->lockname ); + if (buffer != buffer_space) + xfree (buffer); + errno = 0; + return -1; } - return pid; + + if (nread == expected_len + && !memcmp (h->tname+h->nodename_off, buffer+11, h->nodename_len) + && buffer[11+h->nodename_len] == '\n') + *same_node = 1; + + if (buffer != buffer_space) + xfree (buffer); + return pid; } #endif /* !HAVE_DOSISH_SYSTEM */ + /**************** * Do a lock on H. A TIMEOUT of 0 returns immediately, * -1 waits forever (hopefully not), other @@ -292,90 +410,129 @@ int make_dotlock( DOTLOCK h, long timeout ) { -#if defined (HAVE_DOSISH_SYSTEM) + int backoff=0; +#ifndef HAVE_DOSISH_SYSTEM + int pid; + const char *maybe_dead=""; + int same_node; +#endif + + if (h->disable) return 0; -#else - int pid; - const char *maybe_dead=""; - int backoff=0; - if( h->disable ) { - return 0; - } - - if( h->locked ) { + if (h->locked) + { #ifndef __riscos__ - log_debug("oops, `%s' is already locked\n", h->lockname ); + log_debug ("oops, `%s' is already locked\n", h->lockname); #endif /* !__riscos__ */ - return 0; + return 0; } - - for(;;) { -#ifndef __riscos__ - if( !link(h->tname, h->lockname) ) { - /* fixme: better use stat to check the link count */ - h->locked = 1; - return 0; /* okay */ + + for (;;) + { +#ifndef HAVE_DOSISH_SYSTEM +# ifndef __riscos__ + if( !link(h->tname, h->lockname) ) + { + /* fixme: better use stat to check the link count */ + h->locked = 1; + return 0; /* okay */ } - if( errno != EEXIST ) { - log_error( "lock not made: link() failed: %s\n", strerror(errno) ); - return -1; + if (errno != EEXIST) + { + log_error ("lock not made: link() failed: %s\n", strerror(errno)); + return -1; } -#else /* __riscos__ */ - if( !riscos_renamefile(h->tname, h->lockname) ) { - h->locked = 1; - return 0; /* okay */ +# else /* __riscos__ */ + if ( !riscos_renamefile(h->tname, h->lockname) ) + { + h->locked = 1; + return 0; /* okay */ } - if( errno != EEXIST ) { - log_error( "lock not made: rename() failed: %s\n", strerror(errno) ); - return -1; + if (errno != EEXIST) + { + log_error ("lock not made: rename() failed: %s\n", strerror(errno)); + return -1; } -#endif /* __riscos__ */ - if( (pid = read_lockfile(h->lockname)) == -1 ) { - if( errno != ENOENT ) { - log_info("cannot read lockfile\n"); - return -1; +# endif /* __riscos__ */ + + if ((pid = read_lockfile (h, &same_node)) == -1 ) + { + if (errno != ENOENT) + { + log_info ("cannot read lockfile\n"); + return -1; } - log_info( "lockfile disappeared\n"); - continue; + log_info ("lockfile disappeared\n"); + continue; } - else if( pid == getpid() ) { - log_info( "Oops: lock already held by us\n"); - h->locked = 1; - return 0; /* okay */ + else if (pid == getpid ()) + { + log_info ("Oops: lock already held by us\n"); + h->locked = 1; + return 0; /* okay */ } - else if( kill(pid, 0) && errno == ESRCH ) { -#ifndef __riscos__ - maybe_dead = " - probably dead"; -#if 0 /* we should not do this without checking the permissions */ - /* and the hostname */ - log_info( "removing stale lockfile (created by %d)", pid ); -#endif -#else /* __riscos__ */ - /* we are *pretty* sure that the other task is dead and therefore - we remove the other lock file */ - maybe_dead = " - probably dead - removing lock"; - unlink(h->lockname); -#endif /* __riscos__ */ + else if (same_node && kill(pid, 0) && errno == ESRCH) + { +# ifndef __riscos__ + log_info (_("removing stale lockfile (created by %d)\n"), pid ); + unlink (h->lockname); + continue; +# else /* __riscos__ */ + /* We are *pretty* sure that the other task is dead and + therefore we remove the other lock file. */ + maybe_dead = " - probably dead - removing lock"; + unlink (h->lockname); +# endif /* __riscos__ */ } - if( timeout == -1 ) { - struct timeval tv; - log_info( "waiting for lock (held by %d%s) %s...\n", - pid, maybe_dead, maybe_deadlock(h)? "(deadlock?) ":""); + if (timeout == -1) + { + struct timeval tv; + + log_info ("waiting for lock (held by %d%s) %s...\n", + pid, maybe_dead, maybe_deadlock(h)? "(deadlock?) ":""); - /* can't use sleep, cause signals may be blocked */ + + /* We can't use sleep, because signals may be blocked. */ tv.tv_sec = 1 + backoff; tv.tv_usec = 0; - select(0, NULL, NULL, NULL, &tv); - if( backoff < 10 ) - backoff++ ; + select (0, NULL, NULL, NULL, &tv); + if (backoff < 10) + backoff++ ; + } + else + return -1; + +#else /*HAVE_DOSISH_SYSTEM*/ + int w32err; + + if (LockFile (h->lockhd, 0, 0, 1, 0)) + { + h->locked = 1; + return 0; /* okay */ + } + w32err = GetLastError (); + if (w32err != ERROR_LOCK_VIOLATION) + { + log_error (_("lock `%s' not made: %s\n"), + h->lockname, w32_strerror (w32err)); + return -1; + } + + if (timeout == -1) + { + /* Wait until lock has been released. */ + log_info (_("waiting for lock %s...\n"), h->lockname); + Sleep ((1 + backoff)*1000); + if ( backoff < 10 ) + backoff++ ; } - else - return -1; + else + return -1; +#endif /*HAVE_DOSISH_SYSTEM*/ } - /*not reached */ -#endif + /*NOTREACHED */ } @@ -384,56 +541,71 @@ * Returns: 0 := success */ int -release_dotlock( DOTLOCK h ) +release_dotlock (DOTLOCK h) { -#if defined (HAVE_DOSISH_SYSTEM) +#ifndef HAVE_DOSISH_SYSTEM + int pid, same_node; +#endif + + /* To avoid atexit race conditions we first check whether there are + any locks left. It might happen that another atexit handler + tries to release the lock while the atexit handler of this module + already ran and thus H is undefined. */ + if (!all_lockfiles) + return 0; + + if (h->disable) return 0; -#else - int pid; - /* To avoid atexit race conditions we first check whether there - are any locks left. It might happen that another atexit - handler tries to release the lock while the atexit handler of - this module already ran and thus H is undefined. */ - if(!all_lockfiles) - return 0; - - if( h->disable ) - return 0; - - if( !h->locked ) { - log_debug("oops, `%s' is not locked\n", h->lockname ); - return 0; - } - - pid = read_lockfile( h->lockname ); - if( pid == -1 ) { - log_error( "release_dotlock: lockfile error\n"); - return -1; - } - if( pid != getpid() ) { - log_error( "release_dotlock: not our lock (pid=%d)\n", pid); - return -1; + if (!h->locked) + { + log_debug("oops, `%s' is not locked\n", h->lockname ); + return 0; } -#ifndef __riscos__ - if( unlink( h->lockname ) ) { - log_error( "release_dotlock: error removing lockfile `%s'", - h->lockname); - return -1; + +#ifndef HAVE_DOSISH_SYSTEM + pid = read_lockfile (h, &same_node); + if (pid == -1) + { + log_error ("release_dotlock: lockfile error\n"); + return -1; } -#else /* __riscos__ */ - if( riscos_renamefile(h->lockname, h->tname) ) { - log_error( "release_dotlock: error renaming lockfile `%s' to `%s'", - h->lockname, h->tname); - return -1; + if (pid != getpid () || !same_node) + { + log_error ("release_dotlock: not our lock (pid=%d)\n", pid); + return -1; } -#endif /* __riscos__ */ - /* fixme: check that the link count is now 1 */ - h->locked = 0; - return 0; -#endif +# ifndef __riscos__ + if (unlink (h->lockname)) + { + log_error ("release_dotlock: error removing lockfile `%s'", + h->lockname); + return -1; + } +# else /* __riscos__ */ + if( riscos_renamefile(h->lockname, h->tname) ) + { + log_error( "release_dotlock: error renaming lockfile `%s' to `%s'", + h->lockname, h->tname); + return -1; + } +# endif /* __riscos__ */ + +#else /*HAVE_DOSISH_SYSTEM*/ + + if (!UnlockFile (h->lockhd, 0, 0, 1, 0)) + { + log_error ("release_dotlock: error removing lockfile `%s': %s\n", + h->lockname, w32_strerror (-1)); + return -1; + } +#endif /*HAVE_DOSISH_SYSTEM*/ + + h->locked = 0; + return 0; } + void remove_lockfiles() { diff -Nru gnupg-1.4.9/util/estream-printf.c gnupg-1.4.10/util/estream-printf.c --- gnupg-1.4.9/util/estream-printf.c 1970-01-01 01:00:00.000000000 +0100 +++ gnupg-1.4.10/util/estream-printf.c 2009-07-21 13:50:56.000000000 +0100 @@ -0,0 +1,2110 @@ +/* estream-printf.c - Versatile C-99 compliant printf formatting + * Copyright (C) 2007, 2008 g10 Code GmbH + * + * This file is part of Libestream. + * + * Libestream 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. + * + * Libestream is distributed in the hope that 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 Libestream; if not, see . + */ + +/* Required autoconf tests: + + AC_TYPE_LONG_LONG_INT defines HAVE_LONG_LONG_INT + AC_TYPE_LONG_DOUBLE defines HAVE_LONG_DOUBLE + AC_TYPE_INTMAX_T defines HAVE_INTMAX_T + AC_TYPE_UINTMAX_T defines HAVE_UINTMAX_T + AC_CHECK_TYPES([ptrdiff_t]) defines HAVE_PTRDIFF_T + AC_CHECK_SIZEOF([unsigned long]) defines SIZEOF_UNSIGNED_LONG + AC_CHECK_SIZEOF([void *]) defines SIZEOF_VOID_P + HAVE_LANGINFO_THOUSANDS_SEP + + Note that the file estream.m4 provides the autoconf macro + ESTREAM_PRINTF_INIT which runs all required checks. + See estream-printf.h for ways to tune this code. + + Missing stuff: wchar and wint_t + thousands_sep in pr_float. +*/ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#if defined(HAVE_INTMAX_T) || defined(HAVE_UINTMAX_T) +# include +#endif +#ifdef HAVE_LANGINFO_THOUSANDS_SEP +#include +#endif +#ifdef TEST +# include +#else +# ifdef _ESTREAM_PRINTF_EXTRA_INCLUDE +# include _ESTREAM_PRINTF_EXTRA_INCLUDE +# endif +#endif +#include "estream-printf.h" + +/* Allow redefinition of asprintf used malloc functions. */ +#if defined(_ESTREAM_PRINTF_MALLOC) && !defined(TEST) +#define my_printf_malloc(a) _ESTREAM_PRINTF_MALLOC((a)) +#else +#define my_printf_malloc(a) malloc((a)) +#endif +#if defined(_ESTREAM_PRINTF_FREE) && !defined(TEST) +#define my_printf_free(a) _ESTREAM_PRINTF_FREE((a)) +#else +#define my_printf_free(a) free((a)) +#endif + + +/* Calculate array dimension. */ +#ifndef DIM +#define DIM(array) (sizeof (array) / sizeof (*array)) +#endif + + +/* We allow for that many args without requiring malloced memory. */ +#define DEFAULT_MAX_ARGSPECS 5 + +/* We allow for that many values without requiring malloced memory. */ +#define DEFAULT_MAX_VALUES 8 + +/* We allocate this many new array argspec elements each time. */ +#define ARGSPECS_BUMP_VALUE 10 + +/* Special values for the field width and the precision. */ +#define NO_FIELD_VALUE (-1) +#define STAR_FIELD_VALUE (-2) + +/* Bit valuues used for the conversion flags. */ +#define FLAG_GROUPING 1 +#define FLAG_LEFT_JUST 2 +#define FLAG_PLUS_SIGN 4 +#define FLAG_SPACE_PLUS 8 +#define FLAG_ALT_CONV 16 +#define FLAG_ZERO_PAD 32 + +/* Constants used the length modifiers. */ +typedef enum + { + LENMOD_NONE = 0, + LENMOD_CHAR, /* "hh" */ + LENMOD_SHORT, /* "h" */ + LENMOD_LONG, /* "l" */ + LENMOD_LONGLONG, /* "ll" */ + LENMOD_INTMAX, /* "j" */ + LENMOD_SIZET, /* "z" */ + LENMOD_PTRDIFF, /* "t" */ + LENMOD_LONGDBL /* "L" */ + } lenmod_t; + +/* All the conversion specifiers. */ +typedef enum + { + CONSPEC_UNKNOWN = 0, + CONSPEC_DECIMAL, + CONSPEC_OCTAL, + CONSPEC_UNSIGNED, + CONSPEC_HEX, + CONSPEC_HEX_UP, + CONSPEC_FLOAT, + CONSPEC_FLOAT_UP, + CONSPEC_EXP, + CONSPEC_EXP_UP, + CONSPEC_F_OR_G, + CONSPEC_F_OR_G_UP, + CONSPEC_HEX_EXP, + CONSPEC_HEX_EXP_UP, + CONSPEC_CHAR, + CONSPEC_STRING, + CONSPEC_POINTER, + CONSPEC_STRERROR, + CONSPEC_BYTES_SO_FAR + } conspec_t; + + +/* Constants describing all the suppoorted types. Note that we list + all the types we know about even if certain types are not available + on this system. */ +typedef enum + { + VALTYPE_UNSUPPORTED = 0, /* Artificial type for error detection. */ + VALTYPE_CHAR, + VALTYPE_SCHAR, + VALTYPE_UCHAR, + VALTYPE_SHORT, + VALTYPE_USHORT, + VALTYPE_INT, + VALTYPE_UINT, + VALTYPE_LONG, + VALTYPE_ULONG, + VALTYPE_LONGLONG, + VALTYPE_ULONGLONG, + VALTYPE_DOUBLE, + VALTYPE_LONGDOUBLE, + VALTYPE_STRING, + VALTYPE_INTMAX, + VALTYPE_UINTMAX, + VALTYPE_SIZE, + VALTYPE_PTRDIFF, + VALTYPE_POINTER, + VALTYPE_CHAR_PTR, + VALTYPE_SCHAR_PTR, + VALTYPE_SHORT_PTR, + VALTYPE_INT_PTR, + VALTYPE_LONG_PTR, + VALTYPE_LONGLONG_PTR, + VALTYPE_INTMAX_PTR, + VALTYPE_SIZE_PTR, + VALTYPE_PTRDIFF_PTR + } valtype_t; + + +/* A union used to store the actual values. */ +typedef union +{ + char a_char; + signed char a_schar; + unsigned char a_uchar; + short a_short; + unsigned short a_ushort; + int a_int; + unsigned int a_uint; + long int a_long; + unsigned long int a_ulong; +#ifdef HAVE_LONG_LONG_INT + long long int a_longlong; + unsigned long long int a_ulonglong; +#endif + double a_double; +#ifdef HAVE_LONG_DOUBLE + long double a_longdouble; +#endif + const char *a_string; +#ifdef HAVE_INTMAX_T + intmax_t a_intmax; +#endif +#ifdef HAVE_UINTMAX_T + intmax_t a_uintmax; +#endif + size_t a_size; +#ifdef HAVE_PTRDIFF_T + ptrdiff_t a_ptrdiff; +#endif + void *a_void_ptr; + char *a_char_ptr; + signed char *a_schar_ptr; + short *a_short_ptr; + int *a_int_ptr; + long *a_long_ptr; +#ifdef HAVE_LONG_LONG_INT + long long int *a_longlong_ptr; +#endif +#ifdef HAVE_INTMAX_T + intmax_t *a_intmax_ptr; +#endif + size_t *a_size_ptr; +#ifdef HAVE_PTRDIFF_T + ptrdiff_t *a_ptrdiff_ptr; +#endif +} value_t; + +/* An object used to keep track of a format option and arguments. */ +struct argspec_s +{ + size_t length; /* The length of these args including the percent. */ + unsigned int flags; /* The conversion flags (bits defined by FLAG_foo). */ + int width; /* The field width. */ + int precision; /* The precision. */ + lenmod_t lenmod; /* The length modifier. */ + conspec_t conspec; /* The conversion specifier. */ + int arg_pos; /* The position of the argument. This one may + be -1 to indicate that no value is expected + (e.g. for "%m"). */ + int width_pos; /* The position of the argument for a field + width star's value. 0 for not used. */ + int precision_pos; /* The position of the argument for the a + precision star's value. 0 for not used. */ + valtype_t vt; /* The type of the corresponding argument. */ +}; +typedef struct argspec_s *argspec_t; + +/* An object to build up a table of values and their types. */ +struct valueitem_s +{ + valtype_t vt; /* The type of the value. */ + value_t value; /* The value. */ +}; +typedef struct valueitem_s *valueitem_t; + + +#ifdef TEST +static int verbose; + +static void +dump_argspecs (argspec_t arg, size_t argcount) +{ + int idx; + + for (idx=0; argcount; argcount--, arg++, idx++) + fprintf (stderr, + "%2d: len=%u flags=%u width=%d prec=%d mod=%d " + "con=%d vt=%d pos=%d-%d-%d\n", + idx, + (unsigned int)arg->length, + arg->flags, + arg->width, + arg->precision, + arg->lenmod, + arg->conspec, + arg->vt, + arg->arg_pos, + arg->width_pos, + arg->precision_pos); +} +#endif /*TEST*/ + + +/* Set the vt field for ARG. */ +static void +compute_type (argspec_t arg) +{ + switch (arg->conspec) + { + case CONSPEC_UNKNOWN: + arg->vt = VALTYPE_UNSUPPORTED; + break; + + case CONSPEC_DECIMAL: + switch (arg->lenmod) + { + case LENMOD_CHAR: arg->vt = VALTYPE_SCHAR; break; + case LENMOD_SHORT: arg->vt = VALTYPE_SHORT; break; + case LENMOD_LONG: arg->vt = VALTYPE_LONG; break; + case LENMOD_LONGLONG: arg->vt = VALTYPE_LONGLONG; break; + case LENMOD_INTMAX: arg->vt = VALTYPE_INTMAX; break; + case LENMOD_SIZET: arg->vt = VALTYPE_SIZE; break; + case LENMOD_PTRDIFF: arg->vt = VALTYPE_PTRDIFF; break; + default: arg->vt = VALTYPE_INT; break; + } + break; + + case CONSPEC_OCTAL: + case CONSPEC_UNSIGNED: + case CONSPEC_HEX: + case CONSPEC_HEX_UP: + switch (arg->lenmod) + { + case LENMOD_CHAR: arg->vt = VALTYPE_UCHAR; break; + case LENMOD_SHORT: arg->vt = VALTYPE_USHORT; break; + case LENMOD_LONG: arg->vt = VALTYPE_ULONG; break; + case LENMOD_LONGLONG: arg->vt = VALTYPE_ULONGLONG; break; + case LENMOD_INTMAX: arg->vt = VALTYPE_UINTMAX; break; + case LENMOD_SIZET: arg->vt = VALTYPE_SIZE; break; + case LENMOD_PTRDIFF: arg->vt = VALTYPE_PTRDIFF; break; + default: arg->vt = VALTYPE_UINT; break; + } + break; + + case CONSPEC_FLOAT: + case CONSPEC_FLOAT_UP: + case CONSPEC_EXP: + case CONSPEC_EXP_UP: + case CONSPEC_F_OR_G: + case CONSPEC_F_OR_G_UP: + case CONSPEC_HEX_EXP: + case CONSPEC_HEX_EXP_UP: + switch (arg->lenmod) + { + case LENMOD_LONGDBL: arg->vt = VALTYPE_LONGDOUBLE; break; + case LENMOD_LONG: arg->vt = VALTYPE_DOUBLE; break; + default: arg->vt = VALTYPE_DOUBLE; break; + } + break; + + case CONSPEC_CHAR: + arg->vt = VALTYPE_INT; + break; + + case CONSPEC_STRING: + arg->vt = VALTYPE_STRING; + break; + + case CONSPEC_POINTER: + arg->vt = VALTYPE_POINTER; + break; + + case CONSPEC_STRERROR: + arg->vt = VALTYPE_STRING; + break; + + case CONSPEC_BYTES_SO_FAR: + switch (arg->lenmod) + { + case LENMOD_CHAR: arg->vt = VALTYPE_SCHAR_PTR; break; + case LENMOD_SHORT: arg->vt = VALTYPE_SHORT_PTR; break; + case LENMOD_LONG: arg->vt = VALTYPE_LONG_PTR; break; + case LENMOD_LONGLONG: arg->vt = VALTYPE_LONGLONG_PTR; break; + case LENMOD_INTMAX: arg->vt = VALTYPE_INTMAX_PTR; break; + case LENMOD_SIZET: arg->vt = VALTYPE_SIZE_PTR; break; + case LENMOD_PTRDIFF: arg->vt = VALTYPE_PTRDIFF_PTR; break; + default: arg->vt = VALTYPE_INT_PTR; break; + } + break; + + } +} + + + +/* Parse the FORMAT string and populate the specification array stored + at the address ARGSPECS_ADDR. The caller has provided enough space + to store up to MAX_ARGSPECS in that buffer. The function may + however ignore the provided buffer and malloc a larger one. On + success the addrrss of that larger buffer will be stored at + ARGSPECS_ADDR. The actual number of specifications will be + returned at R_ARGSPECS_COUNT. */ +static int +parse_format (const char *format, + argspec_t *argspecs_addr, size_t max_argspecs, + size_t *r_argspecs_count) +{ + const char *s; + argspec_t argspecs = *argspecs_addr; + argspec_t arg; + size_t argcount = 0; + + if (!format) + goto leave_einval; + + for (; *format; format++) + { + unsigned int flags; + int width, precision; + lenmod_t lenmod; + conspec_t conspec; + int arg_pos, width_pos, precision_pos; + + if (*format != '%') + continue; + s = ++format; + if (!*s) + goto leave_einval; + if (*s == '%') + continue; /* Just a quoted percent. */ + + /* First check whether there is a positional argument. */ + arg_pos = 0; /* No positional argument given. */ + if (*s >= '1' && *s <= '9') + { + const char *save_s = s; + + arg_pos = (*s++ - '0'); + for (; *s >= '0' && *s <= '9'; s++) + arg_pos = 10*arg_pos + (*s - '0'); + if (arg_pos < 0) + goto leave_einval; /* Overflow during conversion. */ + if (*s == '$') + s++; + else + { + arg_pos = 0; + s = save_s; + } + } + + /* Parse the flags. */ + flags = 0; + for ( ; *s; s++) + { + switch (*s) + { + case '\'': flags |= FLAG_GROUPING; break; + case '-': flags |= FLAG_LEFT_JUST; break; + case '+': flags |= FLAG_PLUS_SIGN; break; + case ' ': flags |= FLAG_SPACE_PLUS; break; + case '#': flags |= FLAG_ALT_CONV; break; + case '0': flags |= FLAG_ZERO_PAD; break; + default: + goto flags_parsed; + } + } + flags_parsed: + + /* Parse the field width. */ + width_pos = 0; + if (*s == '*') + { + width = STAR_FIELD_VALUE; + s++; + /* If we have a positional argument, another one might also + be used to give the position of the star's value. */ + if (arg_pos && *s >= '1' && *s <= '9') + { + width_pos = (*s++ - '0'); + for (; *s >= '0' && *s <= '9'; s++) + width_pos = 10*width_pos + (*s - '0'); + if (width_pos < 1) + goto leave_einval; /* Overflow during conversion. */ + if (*s != '$') + goto leave_einval; /* Not followed by $. */ + s++; + } + } + else if ( *s >= '0' && *s <= '9') + { + width = (*s++ - '0'); + for (; *s >= '0' && *s <= '9'; s++) + { + if (!width && *s == '0') + goto leave_einval; /* Leading zeroes are not allowed. + Fixme: check what other + implementations do. */ + width = 10*width + (*s - '0'); + } + if (width < 0) + goto leave_einval; /* Overflow during conversion. */ + } + else + width = NO_FIELD_VALUE; + + /* Parse the precision. */ + precision_pos = 0; + precision = NO_FIELD_VALUE; + if (*s == '.') + { + int ignore_value = (s[1] == '-'); + + s++; + if (*s == '*') + { + precision = STAR_FIELD_VALUE; + s++; + /* If we have a positional argument, another one might also + be used to give the position of the star's value. */ + if (arg_pos && *s >= '1' && *s <= '9') + { + precision_pos = (*s++ - '0'); + for (; *s >= '0' && *s <= '9'; s++) + precision_pos = 10*precision_pos + (*s - '0'); + if (precision_pos < 1) + goto leave_einval; /* Overflow during conversion. */ + if (*s != '$') + goto leave_einval; /* Not followed by $. */ + s++; + } + } + else if ( *s >= '0' && *s <= '9') + { + precision = (*s++ - '0'); + for (; *s >= '0' && *s <= '9'; s++) + { + if (!precision && *s == '0') + goto leave_einval; /* Leading zeroes are not allowed. + Fixme: check what other + implementations do. */ + precision = 10*precision + (*s - '0'); + } + if (precision < 0) + goto leave_einval; /* Overflow during conversion. */ + } + else + precision = 0; + if (ignore_value) + precision = NO_FIELD_VALUE; + } + + /* Parse the length modifiers. */ + switch (*s) + { + case 'h': + if (s[1] == 'h') + { + lenmod = LENMOD_CHAR; + s++; + } + else + lenmod = LENMOD_SHORT; + s++; + break; + case 'l': + if (s[1] == 'l') + { + lenmod = LENMOD_LONGLONG; + s++; + } + else + lenmod = LENMOD_LONG; + s++; + break; + case 'j': lenmod = LENMOD_INTMAX; s++; break; + case 'z': lenmod = LENMOD_SIZET; s++; break; + case 't': lenmod = LENMOD_PTRDIFF; s++; break; + case 'L': lenmod = LENMOD_LONGDBL; s++; break; + default: lenmod = LENMOD_NONE; break; + } + + /* Parse the conversion specifier. */ + switch (*s) + { + case 'd': + case 'i': conspec = CONSPEC_DECIMAL; break; + case 'o': conspec = CONSPEC_OCTAL; break; + case 'u': conspec = CONSPEC_UNSIGNED; break; + case 'x': conspec = CONSPEC_HEX; break; + case 'X': conspec = CONSPEC_HEX_UP; break; + case 'f': conspec = CONSPEC_FLOAT; break; + case 'F': conspec = CONSPEC_FLOAT_UP; break; + case 'e': conspec = CONSPEC_EXP; break; + case 'E': conspec = CONSPEC_EXP_UP; break; + case 'g': conspec = CONSPEC_F_OR_G; break; + case 'G': conspec = CONSPEC_F_OR_G_UP; break; + case 'a': conspec = CONSPEC_HEX_EXP; break; + case 'A': conspec = CONSPEC_HEX_EXP_UP; break; + case 'c': conspec = CONSPEC_CHAR; break; + case 's': conspec = CONSPEC_STRING; break; + case 'p': conspec = CONSPEC_POINTER; break; + case 'n': conspec = CONSPEC_BYTES_SO_FAR; break; + case 'C': conspec = CONSPEC_CHAR; lenmod = LENMOD_LONG; break; + case 'S': conspec = CONSPEC_STRING; lenmod = LENMOD_LONG; break; + case 'm': conspec = CONSPEC_STRERROR; arg_pos = -1; break; + default: conspec = CONSPEC_UNKNOWN; + } + + /* Save the args. */ + if (argcount >= max_argspecs) + { + /* We either need to allocate a new array instead of the + caller provided one or realloc the array. Instead of + using realloc we allocate a new one and release the + original one then. */ + size_t n, newmax; + argspec_t newarg; + + newmax = max_argspecs + ARGSPECS_BUMP_VALUE; + if (newmax <= max_argspecs) + goto leave_einval; /* Too many arguments. */ + newarg = calloc (newmax, sizeof *newarg); + if (!newarg) + goto leave; + for (n=0; n < argcount; n++) + newarg[n] = argspecs[n]; + if (argspecs != *argspecs_addr) + free (argspecs); + argspecs = newarg; + max_argspecs = newmax; + } + + arg = argspecs + argcount; + arg->length = s - format + 2; + arg->flags = flags; + arg->width = width; + arg->precision = precision; + arg->lenmod = lenmod; + arg->conspec = conspec; + arg->arg_pos = arg_pos; + arg->width_pos = width_pos; + arg->precision_pos = precision_pos; + compute_type (arg); + argcount++; + format = s; + } + + *argspecs_addr = argspecs; + *r_argspecs_count = argcount; + return 0; /* Success. */ + + leave_einval: + errno = EINVAL; + leave: + if (argspecs != *argspecs_addr) + free (argspecs); + *argspecs_addr = NULL; + return -1; +} + + +/* This function reads all the values as specified by VALUETABLE into + VALUETABLE. The values are expected in VAARGS. The function + returns -1 if a specified type is not supported. */ +static int +read_values (valueitem_t valuetable, size_t valuetable_len, va_list vaargs) +{ + int validx; + + for (validx=0; validx < valuetable_len; validx++) + { + value_t *value = &valuetable[validx].value; + valtype_t vt = valuetable[validx].vt; + + switch (vt) + { + case VALTYPE_CHAR: value->a_char = va_arg (vaargs, int); break; + case VALTYPE_CHAR_PTR: + value->a_char_ptr = va_arg (vaargs, char *); + break; + case VALTYPE_SCHAR: value->a_schar = va_arg (vaargs, int); break; + case VALTYPE_SCHAR_PTR: + value->a_schar_ptr = va_arg (vaargs, signed char *); + break; + case VALTYPE_UCHAR: value->a_uchar = va_arg (vaargs, int); break; + case VALTYPE_SHORT: value->a_short = va_arg (vaargs, int); break; + case VALTYPE_USHORT: value->a_ushort = va_arg (vaargs, int); break; + case VALTYPE_SHORT_PTR: + value->a_short_ptr = va_arg (vaargs, short *); + break; + case VALTYPE_INT: + value->a_int = va_arg (vaargs, int); + break; + case VALTYPE_INT_PTR: + value->a_int_ptr = va_arg (vaargs, int *); + break; + case VALTYPE_UINT: + value->a_uint = va_arg (vaargs, unsigned int); + break; + case VALTYPE_LONG: + value->a_long = va_arg (vaargs, long); + break; + case VALTYPE_ULONG: + value->a_ulong = va_arg (vaargs, unsigned long); + break; + case VALTYPE_LONG_PTR: + value->a_long_ptr = va_arg (vaargs, long *); + break; +#ifdef HAVE_LONG_LONG_INT + case VALTYPE_LONGLONG: + value->a_longlong = va_arg (vaargs, long long int); + break; + case VALTYPE_ULONGLONG: + value->a_ulonglong = va_arg (vaargs, unsigned long long int); + break; + case VALTYPE_LONGLONG_PTR: + value->a_longlong_ptr = va_arg (vaargs, long long *); + break; +#endif + case VALTYPE_DOUBLE: + value->a_double = va_arg (vaargs, double); + break; +#ifdef HAVE_LONG_DOUBLE + case VALTYPE_LONGDOUBLE: + value->a_longdouble = va_arg (vaargs, long double); + break; +#endif + case VALTYPE_STRING: + value->a_string = va_arg (vaargs, const char *); + break; + case VALTYPE_POINTER: + value->a_void_ptr = va_arg (vaargs, void *); + break; +#ifdef HAVE_INTMAX_T + case VALTYPE_INTMAX: + value->a_intmax = va_arg (vaargs, intmax_t); + break; + case VALTYPE_INTMAX_PTR: + value->a_intmax_ptr = va_arg (vaargs, intmax_t *); + break; +#endif +#ifdef HAVE_UINTMAX_T + case VALTYPE_UINTMAX: + value->a_uintmax = va_arg (vaargs, uintmax_t); + break; +#endif + case VALTYPE_SIZE: + value->a_size = va_arg (vaargs, size_t); + break; + case VALTYPE_SIZE_PTR: + value->a_size_ptr = va_arg (vaargs, size_t *); + break; +#ifdef HAVE_PTRDIFF_T + case VALTYPE_PTRDIFF: + value->a_ptrdiff = va_arg (vaargs, ptrdiff_t); + break; + case VALTYPE_PTRDIFF_PTR: + value->a_ptrdiff_ptr = va_arg (vaargs, ptrdiff_t *); + break; +#endif + default: /* Unsupported type. */ + return -1; + } + } + return 0; +} + + + +/* Output COUNT padding characters PADCHAR and update NBYTES by the + number of bytes actually written. */ +static int +pad_out (estream_printf_out_t outfnc, void *outfncarg, + int padchar, int count, size_t *nbytes) +{ + char buf[32]; + size_t n; + int rc; + + while (count > 0) + { + n = (count <= sizeof buf)? count : sizeof buf; + memset (buf, padchar, n); + rc = outfnc (outfncarg, buf, n); + if (rc) + return rc; + *nbytes += n; + count -= n; + } + + return 0; +} + + +/* "d,i,o,u,x,X" formatting. OUTFNC and OUTFNCARG describes the + output routine, ARG gives the argument description and VALUE the + actual value (its type is available through arg->vt). */ +static int +pr_integer (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + int rc; +#ifdef HAVE_LONG_LONG_INT + unsigned long long aulong; +#else + unsigned long aulong; +#endif + char numbuf[100]; + char *p, *pend; + size_t n; + char signchar = 0; + int n_prec; /* Number of extra precision digits required. */ + int n_extra; /* Extra number of prefix or sign characters. */ + + if (arg->conspec == CONSPEC_DECIMAL) + { +#ifdef HAVE_LONG_LONG_INT + long long along; +#else + long along; +#endif + + switch (arg->vt) + { + case VALTYPE_SHORT: along = value.a_short; break; + case VALTYPE_INT: along = value.a_int; break; + case VALTYPE_LONG: along = value.a_long; break; +#ifdef HAVE_LONG_LONG_INT + case VALTYPE_LONGLONG: along = value.a_longlong; break; + case VALTYPE_SIZE: along = value.a_size; break; +# ifdef HAVE_INTMAX_T + case VALTYPE_INTMAX: along = value.a_intmax; break; +# endif +# ifdef HAVE_PTRDIFF_T + case VALTYPE_PTRDIFF: along = value.a_ptrdiff; break; +# endif +#endif /*HAVE_LONG_LONG_INT*/ + default: + return -1; + } + if (along < 0) + { + aulong = -along; + signchar = '-'; + } + else + aulong = along; + } + else + { + switch (arg->vt) + { + case VALTYPE_USHORT: aulong = value.a_ushort; break; + case VALTYPE_UINT: aulong = value.a_uint; break; + case VALTYPE_ULONG: aulong = value.a_ulong; break; +#ifdef HAVE_LONG_LONG_INT + case VALTYPE_ULONGLONG: aulong = value.a_ulonglong; break; + case VALTYPE_SIZE: aulong = value.a_size; break; +# ifdef HAVE_UINTMAX_T + case VALTYPE_UINTMAX: aulong = value.a_uintmax; break; +# endif +# ifdef HAVE_PTRDIFF_T + case VALTYPE_PTRDIFF: aulong = value.a_ptrdiff; break; +# endif +#endif /*HAVE_LONG_LONG_INT*/ + default: + return -1; + } + } + + if (signchar == '-') + ; + else if ((arg->flags & FLAG_PLUS_SIGN)) + signchar = '+'; + else if ((arg->flags & FLAG_SPACE_PLUS)) + signchar = ' '; + + n_extra = !!signchar; + + /* We build the string up backwards. */ + p = pend = numbuf + DIM(numbuf); + if ((!aulong && !arg->precision)) + ; + else if (arg->conspec == CONSPEC_DECIMAL + || arg->conspec == CONSPEC_UNSIGNED) + { + int grouping = -1; + const char * grouping_string = +#ifdef HAVE_LANGINFO_THOUSANDS_SEP + nl_langinfo(THOUSANDS_SEP); +#else + "'"; +#endif + + do + { + if ((arg->flags & FLAG_GROUPING) + && (++grouping == 3) && *grouping_string) + { + *--p = *grouping_string; + grouping = 0; + } + *--p = '0' + (aulong % 10); + aulong /= 10; + } + while (aulong); + } + else if (arg->conspec == CONSPEC_OCTAL) + { + do + { + *--p = '0' + (aulong % 8); + aulong /= 8; + } + while (aulong); + if ((arg->flags & FLAG_ALT_CONV) && *p != '0') + *--p = '0'; + } + else /* HEX or HEXUP */ + { + const char *digits = ((arg->conspec == CONSPEC_HEX) + ? "0123456789abcdef" : "0123456789ABCDEF"); + do + { + *--p = digits[(aulong % 16)]; + aulong /= 16; + } + while (aulong); + if ((arg->flags & FLAG_ALT_CONV)) + n_extra += 2; + } + + n = pend - p; + + if ((arg->flags & FLAG_ZERO_PAD) + && arg->precision == NO_FIELD_VALUE && !(arg->flags & FLAG_LEFT_JUST) + && n && arg->width - n_extra > n ) + n_prec = arg->width - n_extra - n; + else if (arg->precision > 0 && arg->precision > n) + n_prec = arg->precision - n; + else + n_prec = 0; + + if (!(arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width - n_extra > n + && arg->width - n_extra - n >= n_prec ) + { + rc = pad_out (outfnc, outfncarg, ' ', + arg->width - n_extra - n - n_prec, nbytes); + if (rc) + return rc; + } + + if (signchar) + { + rc = outfnc (outfncarg, &signchar, 1); + if (rc) + return rc; + *nbytes += 1; + } + + if ((arg->flags & FLAG_ALT_CONV) + && (arg->conspec == CONSPEC_HEX || arg->conspec == CONSPEC_HEX_UP)) + { + rc = outfnc (outfncarg, arg->conspec == CONSPEC_HEX? "0x": "0X", 2); + if (rc) + return rc; + *nbytes += 2; + } + + if (n_prec) + { + rc = pad_out (outfnc, outfncarg, '0', n_prec, nbytes); + if (rc) + return rc; + } + + rc = outfnc (outfncarg, p, pend - p); + if (rc) + return rc; + *nbytes += pend - p; + + if ((arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width - n_extra - n_prec > n) + { + rc = pad_out (outfnc, outfncarg, ' ', + arg->width - n_extra - n_prec - n, nbytes); + if (rc) + return rc; + } + + return 0; +} + + +/* "e,E,f,F,g,G,a,A" formatting. OUTFNC and OUTFNCARG describes the + output routine, ARG gives the argument description and VALUE the + actual value (its type is available through arg->vt). For + portability reasons sprintf is used for the actual formatting. + This is useful because sprint is the only standard function to + convert a floating number into its ascii representation. To avoid + using malloc we just pass the precision to sprintf and do the final + formatting with our own code. */ +static int +pr_float (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + int rc; +#ifdef HAVE_LONG_DOUBLE + long double adblfloat = 0; /* Just to please gcc. */ + int use_dbl = 0; +#endif + double afloat; + char numbuf[350]; + char formatstr[20]; + char *p, *pend; + size_t n; + char signchar = 0; + int n_extra; /* Extra number of prefix or sign characters. */ + + switch (arg->vt) + { + case VALTYPE_DOUBLE: afloat = value.a_double; break; +#ifdef HAVE_LONG_DOUBLE + case VALTYPE_LONGDOUBLE: + afloat = 0; /* Just to please gcc. */ + adblfloat = value.a_longdouble; + use_dbl=1; break; +#endif + default: + return -1; + } + + /* We build the string using sprint. */ + p = formatstr + sizeof formatstr; + *--p = 0; + switch (arg->conspec) + { + case CONSPEC_FLOAT: *--p = 'f'; break; + case CONSPEC_FLOAT_UP: *--p = 'F'; break; + case CONSPEC_EXP: *--p = 'e'; break; + case CONSPEC_EXP_UP: *--p = 'E'; break; + case CONSPEC_F_OR_G: *--p = 'g'; break; + case CONSPEC_F_OR_G_UP: *--p = 'G'; break; + case CONSPEC_HEX_EXP: *--p = 'a'; break; + case CONSPEC_HEX_EXP_UP: *--p = 'A'; break; + default: + return -1; /* Actually a bug. */ + } +#ifdef HAVE_LONG_DOUBLE + if (use_dbl) + *--p = 'L'; +#endif + if (arg->precision != NO_FIELD_VALUE) + { + /* Limit it to a meaningful value so that even a stupid sprintf + won't overflow our buffer. */ + n = arg->precision <= 100? arg->precision : 100; + do + { + *--p = '0' + (n % 10); + n /= 10; + } + while (n); + *--p = '.'; + } + if ((arg->flags & FLAG_ALT_CONV)) + *--p = '#'; + *--p = '%'; +#ifdef HAVE_LONG_DOUBLE + if (use_dbl) + sprintf (numbuf, p, adblfloat); + else +#endif /*HAVE_LONG_DOUBLE*/ + sprintf (numbuf, p, afloat); + p = numbuf; + n = strlen (numbuf); + pend = p + n; + + if (*p =='-') + { + signchar = '-'; + p++; + n--; + } + else if ((arg->flags & FLAG_PLUS_SIGN)) + signchar = '+'; + else if ((arg->flags & FLAG_SPACE_PLUS)) + signchar = ' '; + + n_extra = !!signchar; + + if (!(arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width - n_extra > n) + { + rc = pad_out (outfnc, outfncarg, ' ', arg->width - n_extra - n, nbytes); + if (rc) + return rc; + } + + if (signchar) + { + rc = outfnc (outfncarg, &signchar, 1); + if (rc) + return rc; + *nbytes += 1; + } + + rc = outfnc (outfncarg, p, pend - p); + if (rc) + return rc; + *nbytes += pend - p; + + if ((arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width - n_extra > n) + { + rc = pad_out (outfnc, outfncarg, ' ', arg->width - n_extra - n, nbytes); + if (rc) + return rc; + } + + return 0; +} + + +/* "c" formatting. */ +static int +pr_char (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + int rc; + char buf[1]; + + if (arg->vt != VALTYPE_INT) + return -1; + buf[0] = (unsigned int)value.a_int; + rc = outfnc (outfncarg, buf, 1); + if(rc) + return rc; + *nbytes += 1; + + return 0; +} + + +/* "s" formatting. */ +static int +pr_string (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + int rc; + size_t n; + const char *string, *s; + + if (arg->vt != VALTYPE_STRING) + return -1; + string = value.a_string; + if (!string) + string = "(null)"; + if (arg->precision >= 0) + { + for (n=0,s=string; *s && n < arg->precision; s++) + n++; + } + else + n = strlen (string); + + if (!(arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width > n ) + { + rc = pad_out (outfnc, outfncarg, ' ', arg->width - n, nbytes); + if (rc) + return rc; + } + + rc = outfnc (outfncarg, string, n); + if (rc) + return rc; + *nbytes += n; + + if ((arg->flags & FLAG_LEFT_JUST) + && arg->width >= 0 && arg->width > n) + { + rc = pad_out (outfnc, outfncarg, ' ', arg->width - n, nbytes); + if (rc) + return rc; + } + + return 0; +} + + +/* "p" formatting. */ +static int +pr_pointer (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + int rc; +#ifdef HAVE_LONG_LONG_INT + unsigned long long aulong; +#else + unsigned long aulong; +#endif + char numbuf[100]; + char *p, *pend; + + if (arg->vt != VALTYPE_POINTER) + return -1; + /* We assume that a pointer can be converted to an unsigned long. + That is not correct for a 64 bit Windows, but then we assume that + long long is supported and usable for storing a pointer. */ +#if defined(HAVE_LONG_LONG_INT) && (SIZEOF_UNSIGNED_LONG < SIZEOF_VOID_P) + aulong = (unsigned long long)value.a_void_ptr; +#else + aulong = (unsigned long)value.a_void_ptr; +#endif + + p = pend = numbuf + DIM(numbuf); + do + { + *--p = "0123456789abcdefx"[(aulong % 16)]; + aulong /= 16; + } + while (aulong); + while ((pend-p) < 2*sizeof (aulong)) + *--p = '0'; + *--p = 'x'; + *--p = '0'; + + rc = outfnc (outfncarg, p, pend - p); + if (rc) + return rc; + *nbytes += pend - p; + + return 0; +} + +/* "n" pesudo format operation. */ +static int +pr_bytes_so_far (estream_printf_out_t outfnc, void *outfncarg, + argspec_t arg, value_t value, size_t *nbytes) +{ + (void)outfnc; + (void)outfncarg; + + switch (arg->vt) + { + case VALTYPE_SCHAR_PTR: + *value.a_schar_ptr = (signed char)(unsigned int)(*nbytes); + break; + case VALTYPE_SHORT_PTR: + *value.a_short_ptr = (short)(unsigned int)(*nbytes); + break; + case VALTYPE_LONG_PTR: + *value.a_long_ptr = (long)(*nbytes); + break; +#ifdef HAVE_LONG_LONG_INT + case VALTYPE_LONGLONG_PTR: + *value.a_longlong_ptr = (long long)(*nbytes); + break; +#endif +#ifdef HAVE_INTMAX_T + case VALTYPE_INTMAX_PTR: + *value.a_intmax_ptr = (intmax_t)(*nbytes); + break; +#endif + case VALTYPE_SIZE_PTR: + *value.a_size_ptr = (*nbytes); + break; +#ifdef HAVE_PTRDIFF_T + case VALTYPE_PTRDIFF_PTR: + *value.a_ptrdiff_ptr = (ptrdiff_t)(*nbytes); + break; +#endif + case VALTYPE_INT_PTR: + *value.a_int_ptr = (int)(*nbytes); + break; + default: + return -1; /* An unsupported type has been used. */ + } + + return 0; +} + + + +/* Run the actual formatting. OUTFNC and OUTFNCARG are the output + functions. FORMAT is format string ARGSPECS is the parsed format + string, ARGSPECS_LEN the number of items in ARGSPECS. VALUETABLE + holds the values and may be directly addressed using the position + arguments given by ARGSPECS. MYERRNO is used for the "%m" + conversion. NBYTES well be updated to reflect the number of bytes + send to the output function. */ +static int +do_format (estream_printf_out_t outfnc, void *outfncarg, + const char *format, argspec_t argspecs, size_t argspecs_len, + valueitem_t valuetable, int myerrno, size_t *nbytes) +{ + int rc = 0; + const char *s; + argspec_t arg = argspecs; + int argidx = 0; /* Only used for assertion. */ + size_t n; + value_t value; + + s = format; + while ( *s ) + { + if (*s != '%') + { + s++; + continue; + } + if (s != format) + { + rc = outfnc (outfncarg, format, (n=s-format)); + if (rc) + return rc; + *nbytes += n; + } + if (s[1] == '%') + { + /* Note that this code ignores one trailing percent escape - + this is however okay as the args parser must have + detected this already. */ + rc = outfnc (outfncarg, s, 1); + if (rc) + return rc; + *nbytes += 1; + s += 2; + format = s; + continue; + } + + /* Save the next start. */ + s += arg->length; + format = s; + + assert (argidx < argspecs_len); + argidx++; + + /* Apply indirect field width and precision values. */ + if (arg->width == STAR_FIELD_VALUE) + { + assert (valuetable[arg->width_pos-1].vt == VALTYPE_INT); + arg->width = valuetable[arg->width_pos-1].value.a_int; + if (arg->width < 0) + { + arg->width = -arg->width; + arg->flags |= FLAG_LEFT_JUST; + } + } + if (arg->precision == STAR_FIELD_VALUE) + { + assert (valuetable[arg->precision_pos-1].vt == VALTYPE_INT); + arg->precision = valuetable[arg->precision_pos-1].value.a_int; + if (arg->precision < 0) + arg->precision = NO_FIELD_VALUE; + } + + if (arg->arg_pos == -1 && arg->conspec == CONSPEC_STRERROR) + value.a_string = strerror (myerrno); + else + { + assert (arg->vt == valuetable[arg->arg_pos-1].vt); + value = valuetable[arg->arg_pos-1].value; + } + + switch (arg->conspec) + { + case CONSPEC_UNKNOWN: assert (!"bug"); break; + + case CONSPEC_DECIMAL: + case CONSPEC_UNSIGNED: + case CONSPEC_OCTAL: + case CONSPEC_HEX: + case CONSPEC_HEX_UP: + rc = pr_integer (outfnc, outfncarg, arg, value, nbytes); + break; + case CONSPEC_FLOAT: + case CONSPEC_FLOAT_UP: + case CONSPEC_EXP: + case CONSPEC_EXP_UP: + case CONSPEC_F_OR_G: + case CONSPEC_F_OR_G_UP: + case CONSPEC_HEX_EXP: + case CONSPEC_HEX_EXP_UP: + rc = pr_float (outfnc, outfncarg, arg, value, nbytes); + break; + case CONSPEC_CHAR: + rc = pr_char (outfnc, outfncarg, arg, value, nbytes); + break; + case CONSPEC_STRING: + case CONSPEC_STRERROR: + rc = pr_string (outfnc, outfncarg, arg, value, nbytes); + break; + case CONSPEC_POINTER: + rc = pr_pointer (outfnc, outfncarg, arg, value, nbytes); + break; + case CONSPEC_BYTES_SO_FAR: + rc = pr_bytes_so_far (outfnc, outfncarg, arg, value, nbytes); + break; + } + if (rc) + return rc; + arg++; + } + + /* Print out any trailing stuff. */ + n = s - format; + rc = n? outfnc (outfncarg, format, n) : 0; + if (!rc) + *nbytes += n; + + return rc; +} + + + + +/* The versatile printf formatting routine. It expects a callback + function OUTFNC and an opaque argument OUTFNCARG used for actual + output of the formatted stuff. FORMAT is the format specification + and VAARGS a variable argumemt list matching the arguments of + FORMAT. */ +int +estream_format (estream_printf_out_t outfnc, + void *outfncarg, + const char *format, va_list vaargs) +{ + /* Buffer to hold the argspecs and a pointer to it.*/ + struct argspec_s argspecs_buffer[DEFAULT_MAX_ARGSPECS]; + argspec_t argspecs = argspecs_buffer; + size_t argspecs_len; /* Number of specifications in ARGSPECS. */ + + /* Buffer to hold the description for the values. */ + struct valueitem_s valuetable_buffer[DEFAULT_MAX_VALUES]; + valueitem_t valuetable = valuetable_buffer; + + int rc; /* Return code. */ + size_t argidx; /* Used to index the argspecs array. */ + size_t validx; /* Used to index the valuetable. */ + int max_pos;/* Highest argument position. */ + + size_t nbytes = 0; /* Keep track of the number of bytes passed to + the output function. */ + + int myerrno = errno; /* Save the errno for use with "%m". */ + + + /* Parse the arguments to come up with descriptive list. We can't + do this on the fly because we need to support positional + arguments. */ + rc = parse_format (format, &argspecs, DIM(argspecs_buffer), &argspecs_len); + if (rc) + goto leave; + + /* Check that all ARG_POS fields are set. */ + for (argidx=0,max_pos=0; argidx < argspecs_len; argidx++) + { + if (argspecs[argidx].arg_pos != -1 + && argspecs[argidx].arg_pos > max_pos) + max_pos = argspecs[argidx].arg_pos; + if (argspecs[argidx].width_pos > max_pos) + max_pos = argspecs[argidx].width_pos; + if (argspecs[argidx].precision_pos > max_pos) + max_pos = argspecs[argidx].precision_pos; + } + if (!max_pos) + { + /* Fill in all the positions. */ + for (argidx=0; argidx < argspecs_len; argidx++) + { + if (argspecs[argidx].width == STAR_FIELD_VALUE) + argspecs[argidx].width_pos = ++max_pos; + if (argspecs[argidx].precision == STAR_FIELD_VALUE) + argspecs[argidx].precision_pos = ++max_pos; + if (argspecs[argidx].arg_pos != -1 ) + argspecs[argidx].arg_pos = ++max_pos; + } + } + else + { + /* Check that they are all filled. More test are done later. */ + for (argidx=0; argidx < argspecs_len; argidx++) + { + if (!argspecs[argidx].arg_pos + || (argspecs[argidx].width == STAR_FIELD_VALUE + && !argspecs[argidx].width_pos) + || (argspecs[argidx].precision == STAR_FIELD_VALUE + && !argspecs[argidx].precision_pos)) + goto leave_einval; + } + } + /* Check that there is no overflow in max_pos and that it has a + reasonable length. There may never be more elements than the + number of characters in FORMAT. */ + if (max_pos < 0 || max_pos >= strlen (format)) + goto leave_einval; + +#ifdef TEST + if (verbose > 1) + dump_argspecs (argspecs, argspecs_len); +#endif + + /* Allocate a table to hold the values. If it is small enough we + use a stack allocated buffer. */ + if (max_pos > DIM(valuetable_buffer)) + { + valuetable = calloc (max_pos, sizeof *valuetable); + if (!valuetable) + goto leave_error; + } + else + { + for (validx=0; validx < DIM(valuetable_buffer); validx++) + valuetable[validx].vt = VALTYPE_UNSUPPORTED; + } + for (argidx=0; argidx < argspecs_len; argidx++) + { + if (argspecs[argidx].arg_pos != - 1) + { + validx = argspecs[argidx].arg_pos - 1; + if (valuetable[validx].vt) + goto leave_einval; /* Already defined. */ + valuetable[validx].vt = argspecs[argidx].vt; + } + if (argspecs[argidx].width == STAR_FIELD_VALUE) + { + validx = argspecs[argidx].width_pos - 1; + if (valuetable[validx].vt) + goto leave_einval; /* Already defined. */ + valuetable[validx].vt = VALTYPE_INT; + } + if (argspecs[argidx].precision == STAR_FIELD_VALUE) + { + validx = argspecs[argidx].precision_pos - 1; + if (valuetable[validx].vt) + goto leave_einval; /* Already defined. */ + valuetable[validx].vt = VALTYPE_INT; + } + } + + /* Read all the arguments. This will error out for unsupported + types and for not given positional arguments. */ + rc = read_values (valuetable, max_pos, vaargs); + if (rc) + goto leave_einval; + +/* for (validx=0; validx < max_pos; validx++) */ +/* fprintf (stderr, "%2d: vt=%d\n", validx, valuetable[validx].vt); */ + + /* Everything has been collected, go ahead with the formatting. */ + rc = do_format (outfnc, outfncarg, format, + argspecs, argspecs_len, valuetable, myerrno, &nbytes); + + goto leave; + + leave_einval: + errno = EINVAL; + leave_error: + rc = -1; + leave: + if (valuetable != valuetable_buffer) + free (valuetable); + if (argspecs != argspecs_buffer) + free (argspecs); + return rc; +} + + + + +/* A simple output handler utilizing stdio. */ +static int +plain_stdio_out (void *outfncarg, const char *buf, size_t buflen) +{ + FILE *fp = (FILE*)outfncarg; + + if ( fwrite (buf, buflen, 1, fp) != 1 ) + return -1; + return 0; +} + + +/* A replacement for printf. */ +int +estream_printf (const char *format, ...) +{ + int rc; + va_list arg_ptr; + + va_start (arg_ptr, format); + rc = estream_format (plain_stdio_out, stderr, format, arg_ptr); + va_end (arg_ptr); + + return rc; +} + +/* A replacement for fprintf. */ +int +estream_fprintf (FILE *fp, const char *format, ...) +{ + int rc; + va_list arg_ptr; + + va_start (arg_ptr, format); + rc = estream_format (plain_stdio_out, fp, format, arg_ptr); + va_end (arg_ptr); + + return rc; +} + +/* A replacement for vfprintf. */ +int +estream_vfprintf (FILE *fp, const char *format, va_list arg_ptr) +{ + return estream_format (plain_stdio_out, fp, format, arg_ptr); +} + + + +/* Communication object used between estream_snprintf and + fixed_buffer_out. */ +struct fixed_buffer_parm_s +{ + size_t size; /* Size of the buffer. */ + size_t count; /* Number of bytes requested for output. */ + size_t used; /* Used size of the buffer. */ + char *buffer; /* Provided buffer. */ +}; + +/* A simple malloced buffer output handler. */ +static int +fixed_buffer_out (void *outfncarg, const char *buf, size_t buflen) +{ + struct fixed_buffer_parm_s *parm = outfncarg; + + parm->count += buflen; + + if (!parm->buffer) + ; + else if (parm->used + buflen < parm->size) + { + /* Handle the common case that everything fits into the buffer + separately. */ + memcpy (parm->buffer + parm->used, buf, buflen); + parm->used += buflen; + } + else + { + /* The slow version of above. */ + for ( ;buflen && parm->used < parm->size; buflen--) + parm->buffer[parm->used++] = *buf++; + } + + return 0; +} + + +/* A replacement for vsnprintf. */ +int +estream_vsnprintf (char *buf, size_t bufsize, + const char *format, va_list arg_ptr) +{ + struct fixed_buffer_parm_s parm; + int rc; + + parm.size = bufsize; + parm.count = 0; + parm.used = 0; + parm.buffer = bufsize?buf:NULL; + rc = estream_format (fixed_buffer_out, &parm, format, arg_ptr); + if (!rc) + rc = fixed_buffer_out (&parm, "", 1); /* Print terminating Nul. */ + if (rc == -1) + return -1; + if (bufsize && buf && parm.size && parm.count >= parm.size) + buf[parm.size-1] = 0; + + parm.count--; /* Do not count the trailing nul. */ + return (int)parm.count; /* Return number of bytes which would have + been written. */ +} + +/* A replacement for snprintf. */ +int +estream_snprintf (char *buf, size_t bufsize, const char *format, ...) +{ + int rc; + va_list arg_ptr; + + va_start (arg_ptr, format); + rc = estream_vsnprintf (buf, bufsize, format, arg_ptr); + va_end (arg_ptr); + + return rc; +} + + + +/* Communication object used between estream_asprintf and + dynamic_buffer_out. */ +struct dynamic_buffer_parm_s +{ + int error_flag; /* Internal helper. */ + size_t alloced; /* Allocated size of the buffer. */ + size_t used; /* Used size of the buffer. */ + char *buffer; /* Malloced buffer. */ +}; + +/* A simple malloced buffer output handler. */ +static int +dynamic_buffer_out (void *outfncarg, const char *buf, size_t buflen) +{ + struct dynamic_buffer_parm_s *parm = outfncarg; + + if (parm->error_flag) + { + /* Just in case some formatting routine did not checked for an + error. */ + errno = parm->error_flag; + return -1; + } + + if (parm->used + buflen >= parm->alloced) + { + char *p; + + parm->alloced += buflen + 512; + p = realloc (parm->buffer, parm->alloced); + if (!p) + { + parm->error_flag = errno ? errno : ENOMEM; + /* Wipe out what we already accumulated. This is useful in + case sensitive data is formated. */ + memset (parm->buffer, 0, parm->used); + return -1; + } + parm->buffer = p; + } + memcpy (parm->buffer + parm->used, buf, buflen); + parm->used += buflen; + + return 0; +} + + +/* A replacement for vasprintf. As with the BSD of vasprintf version -1 + will be returned on error and NULL stored at BUFP. On success the + number of bytes printed will be returned. */ +int +estream_vasprintf (char **bufp, const char *format, va_list arg_ptr) +{ + struct dynamic_buffer_parm_s parm; + int rc; + + parm.error_flag = 0; + parm.alloced = 512; + parm.used = 0; + parm.buffer = my_printf_malloc (parm.alloced); + if (!parm.buffer) + { + *bufp = NULL; + return -1; + } + + rc = estream_format (dynamic_buffer_out, &parm, format, arg_ptr); + if (!rc) + rc = dynamic_buffer_out (&parm, "", 1); /* Print terminating Nul. */ + /* Fixme: Should we shrink the resulting buffer? */ + if (rc != -1 && parm.error_flag) + { + rc = -1; + errno = parm.error_flag; + } + if (rc == -1) + { + memset (parm.buffer, 0, parm.used); + my_printf_free (parm.buffer); + *bufp = NULL; + return -1; + } + assert (parm.used); /* We have at least the terminating Nul. */ + *bufp = parm.buffer; + return parm.used - 1; /* Do not include that Nul. */ +} + +/* A replacement for asprintf. As with the BSD of asprintf version -1 + will be returned on error and NULL stored at BUFP. On success the + number of bytes printed will be returned. */ +int +estream_asprintf (char **bufp, const char *format, ...) +{ + int rc; + va_list arg_ptr; + + va_start (arg_ptr, format); + rc = estream_vasprintf (bufp, format, arg_ptr); + va_end (arg_ptr); + + return rc; +} + + +#ifdef TEST + +static int +one_test (const char *format, ...) +{ +#ifdef _WIN32 + { + static int show; + + if (!show) + { + /* We do not have a system vasprintf. */ + printf ("one-test: disabled under W32\n"); + show = 1; + } + } +#else + int rc1, rc2; + va_list arg_ptr; + char *buf1, *buf2; + + if (verbose) + printf ("format: ->%s<-\n", format); + + va_start (arg_ptr, format); + rc1 = vasprintf (&buf1, format, arg_ptr); + va_end (arg_ptr); + if (rc1 == -1) + { + printf (" sys: errno=%d (%s)\n", errno, strerror (errno)); + buf1 = NULL; + } + else if (verbose) + printf (" sys: ->%s<-\n", buf1); + + va_start (arg_ptr, format); + rc2 = estream_vasprintf (&buf2, format, arg_ptr); + va_end (arg_ptr); + if (rc2 == -1) + printf (" our: errno=%d (%s)\n", errno, strerror (errno)); + else if (verbose) + printf (" our: ->%s<-\n", buf2); + + if (rc1 != -1 && rc2 != -1 && strcmp (buf1, buf2)) + printf ("error: output does not match\n" + "format: ->%s<-\n sys: ->%s<-\n our: ->%s<-\n", + format, buf1, buf2); + else if ( rc1 != rc2 ) + printf ("error: return codes are different: sys_rc=%d our_rc=%d\n", + rc1, rc2); + + free (buf2); + free (buf1); +#endif + return 0; +} + + +static void +run_tests (void) +{ + /*one_test ("%d %% %'d", 17, 19681977);*/ + + one_test ("%d %% %d", 17, 768114563); + one_test ("%d %% %d", 17, -768114563); + + one_test ("%d", 17); + one_test ("%4d", 17); + one_test ("%40d", 17); + one_test ("%-d", 17); + one_test ("%-4d", 17); + one_test ("%-140d", 17); + one_test ("%d", -17); + one_test ("%4d", -17); + one_test ("%40d", -17); + one_test ("%-d", -17); + one_test ("%-4d", -17); + one_test ("%-40d", -17); + + one_test ("%+4d", 17); + one_test ("%+4d", -17); + one_test ("%-+4d", 17); + one_test ("%-+4d", -17); + one_test ("% 4d", 17); + one_test ("% 4d", -17); + one_test ("%- +4d", 17); + one_test ("%- +4d", -17); + + one_test ("%.4d", 17); + one_test ("%.0d", 17); + one_test ("%.0d", 0); + one_test ("%.4d", -17); + one_test ("%.0d", -17); + one_test ("%6.4d", 17); + one_test ("%6.4d", -17); + one_test ("%6.0d", 0); + one_test ("%4.6d", 17); + one_test ("%4.6d", -17); + + one_test ("% 4.6d", 17); + one_test ("% 6.0d", 0); + + one_test ("%.4d", 17); + one_test ("%04d", 17); + one_test ("%.4d", -17); + one_test ("%04d", -17); + one_test ("%0.d", 0); + + one_test ("%*d", 7, 42); + one_test ("%*d", -7, 42); + one_test ("%.*d", 7, 42); + one_test ("%.*d", -7, 42); + one_test ("%*.*d", 10, 7, 42); + one_test ("%*.*d", 10, -7, 42); + one_test ("%*.*d", -10, 7, 42); + one_test ("%*.*d", -10, -7, 42); + + one_test ("%*x", 7, 42); + one_test ("%*x", -7, 42); + one_test ("%.*x", 7, 42); + one_test ("%.*x", -7, 42); + one_test ("%*.*x", 10, 7, 42); + one_test ("%*.*x", 10, -7, 42); + one_test ("%*.*x", -10, 7, 42); + one_test ("%*.*x", -10, -7, 42); + one_test ("%#*x", 7, 42); + one_test ("%#*x", -7, 42); + one_test ("%#.*x", 7, 42); + one_test ("%#.*x", -7, 42); + one_test ("%#*.*x", 10, 7, 42); + one_test ("%#*.*x", 10, -7, 42); + one_test ("%#*.*x", -10, 7, 42); + one_test ("%#*.*x", -10, -7, 42); + + one_test ("%*X", 7, 42); + one_test ("%*X", -7, 42); + one_test ("%.*X", 7, 42); + one_test ("%.*X", -7, 42); + one_test ("%*.*X", 10, 7, 42); + one_test ("%*.*X", 10, -7, 42); + one_test ("%*.*X", -10, 7, 42); + one_test ("%*.*X", -10, -7, 42); + one_test ("%#*X", 7, 42); + one_test ("%#*X", -7, 42); + one_test ("%#.*X", 7, 42); + one_test ("%#.*X", -7, 42); + one_test ("%#*.*X", 10, 7, 42); + one_test ("%#*.*X", 10, -7, 42); + one_test ("%#*.*X", -10, 7, 42); + one_test ("%#*.*X", -10, -7, 42); + + one_test ("%*o", 7, 42); + one_test ("%*o", -7, 42); + one_test ("%.*o", 7, 42); + one_test ("%.*o", -7, 42); + one_test ("%*.*o", 10, 7, 42); + one_test ("%*.*o", 10, -7, 42); + one_test ("%*.*o", -10, 7, 42); + one_test ("%*.*o", -10, -7, 42); + one_test ("%#*o", 7, 42); + one_test ("%#*o", -7, 42); + one_test ("%#.*o", 7, 42); + one_test ("%#.*o", -7, 42); + one_test ("%#*.*o", 10, 7, 42); + one_test ("%#*.*o", 10, -7, 42); + one_test ("%#*.*o", -10, 7, 42); + one_test ("%#*.*o", -10, -7, 42); + + one_test ("%s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.0s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.10s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.48s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.49s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.50s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%.51s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%48s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%49s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%50s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%51s", "the quick brown fox jumps over the lazy dogs back"); + one_test ("%-51s", "the quick brown fox jumps over the lazy dogs back"); + + one_test ("/%s=", "CN"); + + one_test ("%f", 3.1415926535); + one_test ("%f", -3.1415926535); + one_test ("%.10f", 3.1415926535); + one_test ("%.2f", 3.1415926535); + one_test ("%.1f", 3.1415926535); + one_test ("%.0f", 3.1415926535); + one_test ("%.20f", 3.1415926535); + one_test ("%10.10f", 3.1415926535); + one_test ("%10.2f", 3.1415926535); + one_test ("%10.1f", 3.1415926535); + one_test ("%10.0f", 3.1415926535); + one_test ("%30.20f", 3.1415926535); + one_test ("%10.10f", -3.1415926535); + one_test ("%10.2f", -3.1415926535); + one_test ("%10.1f", -3.1415926535); + one_test ("%10.0f", -3.1415926535); + one_test ("%30.20f", -3.1415926535); + + one_test ("%-10f", 3.1415926535); + one_test ("%-10.10f", 3.1415926535); + one_test ("%-10.2f", 3.1415926535); + one_test ("%-10.1f", 3.1415926535); + one_test ("%-10.0f", 3.1415926535); + one_test ("%-30.20f", 3.1415926535); + one_test ("%-10f", -3.1415926535); + one_test ("%-10.10f", -3.1415926535); + one_test ("%-10.2f", -3.1415926535); + one_test ("%-10.1f", -3.1415926535); + one_test ("%-10.0f", -3.1415926535); + one_test ("%-30.20f", -3.1415926535); + + one_test ("%#.0f", 3.1415926535); + one_test ("%#10.0f", 3.1415926535); + one_test ("%#10.0f", -3.1415926535); + one_test ("%-#10.0f", 3.1415926535); + one_test ("%-#10.0f", -3.1415926535); + + one_test ("%e", 3.1415926535); + one_test ("%g", 3.1415926535); + + one_test ("%a", 1); + one_test ("%a", -1); + one_test ("%a", 3.1415926535); + +#ifdef HAVE_LONG_DOUBLE + one_test ("%La", 1); + one_test ("%La", -1); + one_test ("%La", 3.1415926535); +#endif + +#ifdef __GLIBC__ + /* "%m" is a glibc extension so this _test_ will only work on such a + system. */ + errno = ENOENT; + one_test ("%m"); + errno = ENOENT; + one_test ("%d=%m", 17); + errno = ENOENT; + one_test ("%2$d:%m:%1$d", 42, 17); +#endif /*__GLIBC__*/ + +} + +static void +check_snprintf (void) +{ + char buffer[20]; + int rc, rc2; + size_t tmplen, blen, blen2; + + rc = estream_snprintf (buffer, 0, "%*s", 18, ""); + if (rc != 18) + printf ("rc=%d\n", rc ); + rc = estream_snprintf (buffer, sizeof buffer, "%*s", 18, ""); + if (rc != 18) + printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer)); + rc = estream_snprintf (buffer, sizeof buffer, "%*s", 19, ""); + if (rc != 19) + printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer)); + rc = estream_snprintf (buffer, sizeof buffer, "%*s", 20, ""); + if (rc != 20) + printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer)); + rc = estream_snprintf (buffer, sizeof buffer, "%*s", 21, ""); + if (rc != 21) + printf ("rc=%d, strlen(buffer)=%d\n", rc, (int)strlen (buffer)); + + for (tmplen = 0; tmplen <= sizeof buffer; tmplen++) + { + rc = estream_snprintf (buffer, tmplen, "%04d%02d%02dT%02d%02d%02d", + 1998, 9, 7, 16, 56, 05); + blen = strlen (buffer); + rc2 = snprintf (buffer, tmplen, "%04d%02d%02dT%02d%02d%02d", + 1998, 9, 7, 16, 56, 05); + blen2 = strlen (buffer); + if (rc != rc2 || blen != blen2) + printf ("snprintf test with len %u gives %d instead of %d (%d,%d)\n", + (unsigned int)tmplen, rc, rc2, blen, blen2); + } +} + + + +int +main (int argc, char **argv) +{ + int rc; + + if (argc) {argc--; argv++; } + + setlocale (LC_NUMERIC, ""); + + while (argc && !strcmp (*argv, "--verbose")) + { + verbose++; + argc--; + argv++; + } + + if (!argc) + { + run_tests (); + check_snprintf () ; + } + else + { + rc = estream_vfprintf (stdout, argv[0], NULL); + fflush (stdout); + fprintf (stderr, "[estream_vfprintf returns: %d]\n", rc); + } + + return 0; +} +#endif /*TEST*/ +/* +Local Variables: +compile-command: "cc -Wall -O3 -g -I.. -DHAVE_CONFIG_H -DTEST -o estream-printf estream-printf.c" +End: +*/ diff -Nru gnupg-1.4.9/util/http.c gnupg-1.4.10/util/http.c --- gnupg-1.4.9/util/http.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/http.c 2009-07-08 15:18:16.000000000 +0100 @@ -1,6 +1,6 @@ /* http.c - HTTP protocol handler - * Copyright (C) 1999, 2001, 2002, 2003, 2004, - * 2005 Free Software Foundation, Inc. + * Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -68,7 +68,8 @@ static int insert_escapes( byte *buffer, const byte *string, const byte *special ); static URI_TUPLE parse_tuple( byte *string ); -static int send_request( HTTP_HD hd, const char *auth, const char *proxy ); +static int send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag, STRLIST headers); static byte *build_rel_path( PARSED_URI uri ); static int parse_response( HTTP_HD hd ); @@ -148,7 +149,8 @@ int http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, - char *auth, unsigned int flags, const char *proxy ) + char *auth, unsigned int flags, const char *proxy, + const char *srvtag, STRLIST headers ) { int rc; @@ -164,7 +166,7 @@ rc = parse_uri( &hd->uri, url ); if( !rc ) { - rc = send_request( hd, auth, proxy ); + rc = send_request( hd, auth, proxy, srvtag, headers ); if( !rc ) { hd->fp_write = iobuf_sockopen( hd->sock , "w" ); if( hd->fp_write ) @@ -232,11 +234,13 @@ int http_open_document( HTTP_HD hd, const char *document, char *auth, - unsigned int flags, const char *proxy ) + unsigned int flags, const char *proxy, const char *srvtag, + STRLIST headers ) { int rc; - rc = http_open(hd, HTTP_REQ_GET, document, auth, flags, proxy ); + rc = http_open(hd, HTTP_REQ_GET, document, auth, flags, proxy, srvtag, + headers ); if( rc ) return rc; @@ -343,16 +347,27 @@ } strlwr( p ); - uri->host = p; - if( (p3=strchr( p, ':' )) ) { - *p3++ = 0; + + /* Handle a host of [IP] so that [IP:V6]:port works */ + if( *p == '[' && (p3=strchr( p, ']' )) ) + { + *p3++ = '\0'; + /* worst case, uri->host should have length 0, points to \0 */ + uri->host = p + 1; + p = p3; + } + else + uri->host = p; + + if( (p3=strchr( p, ':' )) ) + { + *p3++ = '\0'; uri->port = atoi( p3 ); - } + } - uri->host = p; if( (n = remove_escapes( uri->host )) < 0 ) return G10ERR_BAD_URI; - if( n != strlen( p ) ) + if( n != strlen( uri->host ) ) return G10ERR_BAD_URI; /* hostname with a Nul in it */ p = p2 ? p2 : NULL; } @@ -507,7 +522,8 @@ * Returns 0 if the request was successful */ static int -send_request( HTTP_HD hd, const char *auth, const char *proxy ) +send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag, STRLIST headers ) { const byte *server; byte *request, *p; @@ -544,7 +560,7 @@ release_parsed_uri( uri ); } else - hd->sock = connect_server( server, port, hd->flags, hd->uri->scheme ); + hd->sock = connect_server( server, port, hd->flags, srvtag ); if(auth || hd->uri->auth) { @@ -599,6 +615,19 @@ xfree(p); rc = write_server( hd->sock, request, strlen(request) ); + + if(rc==0) + for(;headers;headers=headers->next) + { + rc = write_server( hd->sock, headers->d, strlen(headers->d) ); + if(rc) + break; + + rc = write_server( hd->sock, "\r\n", 2 ); + if(rc) + break; + } + xfree( request ); xfree(proxy_authstr); xfree(authstr); @@ -713,7 +742,7 @@ #ifdef TEST static int -start_server() +start_server(void) { struct sockaddr_in mya; struct sockaddr_in peer; @@ -825,7 +854,7 @@ #ifdef USE_DNS_SRV /* Do the SRV thing */ - if(flags&HTTP_FLAG_TRY_SRV && srvtag) + if(srvtag) { /* We're using SRV, so append the tags */ if(1+strlen(srvtag)+6+strlen(server)+1<=MAXDNAME) @@ -845,7 +874,9 @@ { /* Either we're not using SRV, or the SRV lookup failed. Make up a fake SRV record. */ - srvlist=xmalloc_clear(sizeof(struct srventry)); + srvlist=calloc(1,sizeof(struct srventry)); + if(!srvlist) + return -1; srvlist->port=port; strncpy(srvlist->target,server,MAXDNAME); srvlist->target[MAXDNAME-1]='\0'; @@ -948,7 +979,7 @@ } #endif /* !HAVE_GETADDRINFO */ - xfree(srvlist); + free(srvlist); if(!connected) { @@ -1062,7 +1093,7 @@ } release_parsed_uri( uri ); uri = NULL; - rc = http_open_document( &hd, *argv, 0, NULL ); + rc = http_open_document( &hd, *argv, NULL, 0, NULL, NULL, NULL ); if( rc ) { log_error("can't get `%s': %s\n", *argv, g10_errstr(rc)); return 1; diff -Nru gnupg-1.4.9/util/iobuf.c gnupg-1.4.10/util/iobuf.c --- gnupg-1.4.9/util/iobuf.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/iobuf.c 2009-08-18 10:34:29.000000000 +0100 @@ -1,6 +1,6 @@ /* iobuf.c - file handling - * Copyright (C) 1998, 1999, 2000, 2001, 2003, - * 2004 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008, + * 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -162,10 +162,11 @@ * Invalidate (i.e. close) a cached iobuf or all iobufs if NULL is * used for FNAME. */ -static void +static int fd_cache_invalidate (const char *fname) { CLOSE_CACHE cc; + int err=0; if (!fname) { if( DBG_IOBUF ) @@ -181,7 +182,7 @@ cc->fp = INVALID_FP; } } - return; + return err; } if( DBG_IOBUF ) @@ -192,16 +193,43 @@ if( DBG_IOBUF ) log_debug (" did (%s)\n", cc->fname); #ifdef HAVE_DOSISH_SYSTEM - CloseHandle (cc->fp); + if(CloseHandle (cc->fp)==0) + err=-1; #else - close(cc->fp); + err=close(cc->fp); #endif cc->fp = INVALID_FP; } } + + return err; } +static int +fd_cache_synchronize(const char *fname) +{ + int err=0; + +#ifndef HAVE_DOSISH_SYSTEM + CLOSE_CACHE cc; + + if( DBG_IOBUF ) + log_debug ("fd_cache_synchronize (%s)\n", fname); + for (cc=close_cache; cc; cc = cc->next ) + { + if ( cc->fp != INVALID_FP && !fd_cache_strcmp (cc->fname, fname) ) + { + if( DBG_IOBUF ) + log_debug (" did (%s)\n", cc->fname); + + err=fsync(cc->fp); + } + } +#endif + + return err; +} static FILEP_OR_FD direct_open (const char *fname, const char *mode) @@ -291,7 +319,7 @@ close(fp); #endif if( DBG_IOBUF ) - log_debug ("fd_cache_close (%p) real\n", (void*)fp); + log_debug ("fd_cache_close (%d) real\n", (int)fp); return; } /* try to reuse a slot */ @@ -883,7 +911,7 @@ (byte*)&desc, &dummy_len ); log_debug("iobuf chain: %d.%d `%s' filter_eof=%d start=%d len=%d\n", - a->no, a->subno, desc, a->filter_eof, + a->no, a->subno, desc?desc:"?", a->filter_eof, (int)a->d.start, (int)a->d.len ); } } @@ -938,7 +966,8 @@ log_error("iobuf_flush failed on close: %s\n", g10_errstr(rc)); if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: close `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: close `%s'\n", a->no, a->subno, + a->desc?a->desc:"?"); if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE, a->chain, NULL, &dummy_len)) ) log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) ); @@ -1199,7 +1228,8 @@ file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: create `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: create `%s'\n", a->no, a->subno, + a->desc?a->desc:"?" ); return a; } @@ -1232,7 +1262,8 @@ file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: append `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: append `%s'\n", a->no, a->subno, + a->desc?a->desc:"?" ); return a; } @@ -1260,7 +1291,8 @@ file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len ); file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len ); if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno, + a->desc?a->desc:"?"); return a; } @@ -1272,7 +1304,8 @@ if ( cmd == 1 ) { /* keep system filepointer/descriptor open */ if( DBG_IOBUF ) log_debug("iobuf-%d.%d: ioctl `%s' keep=%d\n", - a? a->no:-1, a?a->subno:-1, a?a->desc:"?", intval ); + a? a->no:-1, a?a->subno:-1, + a&&a->desc?a->desc:"?", intval ); for( ; a; a = a->chain ) if( !a->chain && a->filter == file_filter ) { file_filter_ctx_t *b = a->filter_ov; @@ -1293,15 +1326,16 @@ ptrval? (char*)ptrval:"[all]"); if ( !a && !intval ) { #ifndef FILE_FILTER_USES_STDIO - fd_cache_invalidate (ptrval); + return fd_cache_invalidate (ptrval); #endif return 0; - } + } } else if ( cmd == 3 ) { /* disallow/allow caching */ if( DBG_IOBUF ) log_debug("iobuf-%d.%d: ioctl `%s' no_cache=%d\n", - a? a->no:-1, a?a->subno:-1, a?a->desc:"?", intval ); + a? a->no:-1, a?a->subno:-1, + a&&a->desc?a->desc:"?", intval ); for( ; a; a = a->chain ) if( !a->chain && a->filter == file_filter ) { file_filter_ctx_t *b = a->filter_ov; @@ -1316,6 +1350,23 @@ } #endif } + else if(cmd==4) + { + /* Do a fsync on the open fd and return any errors to the + caller of iobuf_ioctl */ + if( DBG_IOBUF ) + log_debug("iobuf-*.*: ioctl `%s' fsync\n", + ptrval? (char*)ptrval:""); + + if(!a && !intval && ptrval) + { +#ifndef FILE_FILTER_USES_STDIO + return fd_cache_synchronize (ptrval); +#else + return 0; +#endif + } + } return -1; } @@ -1393,7 +1444,8 @@ f( ov, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &dummy_len ); if( DBG_IOBUF ) { - log_debug("iobuf-%d.%d: push `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: push `%s'\n", a->no, a->subno, + a->desc?a->desc:"?" ); print_chain( a ); } @@ -1419,7 +1471,8 @@ BUG(); if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: pop `%s'\n", a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: pop `%s'\n", a->no, a->subno, + a->desc?a->desc:"?" ); if( !a->filter ) { /* this is simple */ b = a->chain; assert(b); @@ -1497,7 +1550,7 @@ IOBUF b = a->chain; if( DBG_IOBUF ) log_debug("iobuf-%d.%d: pop `%s' in underflow\n", - a->no, a->subno, a->desc ); + a->no, a->subno, a->desc?a->desc:"?" ); xfree(a->d.buf); xfree(a->real_fname); memcpy(a, b, sizeof *a); @@ -1562,8 +1615,8 @@ if( !len && a->chain ) { IOBUF b = a->chain; if( DBG_IOBUF ) - log_debug("iobuf-%d.%d: pop `%s' in underflow (!len)\n", - a->no, a->subno, a->desc ); + log_debug("iobuf-%d.%d: pop in underflow (!len)\n", + a->no, a->subno); xfree(a->d.buf); xfree(a->real_fname); memcpy(a,b, sizeof *a); diff -Nru gnupg-1.4.9/util/Makefile.am gnupg-1.4.10/util/Makefile.am --- gnupg-1.4.9/util/Makefile.am 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/Makefile.am 2009-07-21 13:44:19.000000000 +0100 @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2008 +# 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -22,7 +23,8 @@ libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \ ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \ - dotlock.c http.c pka.c membuf.c cert.c \ + dotlock.c http.c pka.c membuf.c cert.c convert.c \ + estream-printf.c \ $(libcompat_a_SOURCES) if USE_SIMPLE_GETTEXT @@ -43,10 +45,6 @@ libutil_a_SOURCES+=regex.c endif -if USE_DNS_SRV -libutil_a_SOURCES+=srv.c srv.h -endif - # The internal regex code #includes these. EXTRA_libutil_a_SOURCES = regcomp.c regexec.c regex_internal.c \ regex_internal.h @@ -63,18 +61,22 @@ libcompat_a_DEPENDENCIES = @LIBOBJS@ libcompat_a_LIBADD = @LIBOBJS@ +if USE_DNS_SRV +libcompat_a_SOURCES+=srv.c +endif + http-test: http.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ srv-test: srv.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ pka-test: pka.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ cert-test: cert.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ diff -Nru gnupg-1.4.9/util/Makefile.in gnupg-1.4.10/util/Makefile.in --- gnupg-1.4.9/util/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/util/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -14,7 +14,8 @@ @SET_MAKE@ -# Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2008 +# 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -56,17 +57,17 @@ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-connect.c assuan-socket.c assuan-util.c @USE_INTERNAL_REGEX_TRUE@am__append_4 = regex.c -@USE_DNS_SRV_TRUE@am__append_5 = srv.c srv.h +@USE_DNS_SRV_TRUE@am__append_5 = srv.c subdir = util DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \ isascii.c memrchr.c mkdtemp.c strsep.c timegm.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -90,20 +91,22 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libcompat_a_AR = $(AR) $(ARFLAGS) -am_libcompat_a_OBJECTS = compat.$(OBJEXT) +am__libcompat_a_SOURCES_DIST = compat.c srv.c +@USE_DNS_SRV_TRUE@am__objects_1 = srv.$(OBJEXT) +am_libcompat_a_OBJECTS = compat.$(OBJEXT) $(am__objects_1) libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS) libutil_a_AR = $(AR) $(ARFLAGS) am__libutil_a_SOURCES_DIST = logger.c fileutil.c miscutil.c strgutil.c \ ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \ - dotlock.c http.c pka.c membuf.c cert.c compat.c \ - simple-gettext.c w32reg.c assuan-buffer.c assuan-client.c \ - assuan-defs.h assuan-errors.c assuan-logging.c \ - assuan-socket-connect.c assuan-connect.c assuan-socket.c \ - assuan-util.c regex.c srv.c srv.h -am__objects_1 = compat.$(OBJEXT) -@USE_SIMPLE_GETTEXT_TRUE@am__objects_2 = simple-gettext.$(OBJEXT) -@HAVE_W32_SYSTEM_TRUE@am__objects_3 = w32reg.$(OBJEXT) -@ENABLE_AGENT_SUPPORT_TRUE@am__objects_4 = assuan-buffer.$(OBJEXT) \ + dotlock.c http.c pka.c membuf.c cert.c convert.c \ + estream-printf.c compat.c srv.c simple-gettext.c w32reg.c \ + assuan-buffer.c assuan-client.c assuan-defs.h assuan-errors.c \ + assuan-logging.c assuan-socket-connect.c assuan-connect.c \ + assuan-socket.c assuan-util.c regex.c +am__objects_2 = compat.$(OBJEXT) $(am__objects_1) +@USE_SIMPLE_GETTEXT_TRUE@am__objects_3 = simple-gettext.$(OBJEXT) +@HAVE_W32_SYSTEM_TRUE@am__objects_4 = w32reg.$(OBJEXT) +@ENABLE_AGENT_SUPPORT_TRUE@am__objects_5 = assuan-buffer.$(OBJEXT) \ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-client.$(OBJEXT) \ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-errors.$(OBJEXT) \ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-logging.$(OBJEXT) \ @@ -111,17 +114,17 @@ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-connect.$(OBJEXT) \ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-socket.$(OBJEXT) \ @ENABLE_AGENT_SUPPORT_TRUE@ assuan-util.$(OBJEXT) -@USE_INTERNAL_REGEX_TRUE@am__objects_5 = regex.$(OBJEXT) -@USE_DNS_SRV_TRUE@am__objects_6 = srv.$(OBJEXT) +@USE_INTERNAL_REGEX_TRUE@am__objects_6 = regex.$(OBJEXT) am_libutil_a_OBJECTS = logger.$(OBJEXT) fileutil.$(OBJEXT) \ miscutil.$(OBJEXT) strgutil.$(OBJEXT) ttyio.$(OBJEXT) \ argparse.$(OBJEXT) memory.$(OBJEXT) secmem.$(OBJEXT) \ errors.$(OBJEXT) iobuf.$(OBJEXT) dotlock.$(OBJEXT) \ http.$(OBJEXT) pka.$(OBJEXT) membuf.$(OBJEXT) cert.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) $(am__objects_6) + convert.$(OBJEXT) estream-printf.$(OBJEXT) $(am__objects_2) \ + $(am__objects_3) $(am__objects_4) $(am__objects_5) \ + $(am__objects_6) libutil_a_OBJECTS = $(am_libutil_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -130,8 +133,8 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libcompat_a_SOURCES) $(libutil_a_SOURCES) \ $(EXTRA_libutil_a_SOURCES) -DIST_SOURCES = $(libcompat_a_SOURCES) $(am__libutil_a_SOURCES_DIST) \ - $(EXTRA_libutil_a_SOURCES) +DIST_SOURCES = $(am__libcompat_a_SOURCES_DIST) \ + $(am__libutil_a_SOURCES_DIST) $(EXTRA_libutil_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -163,7 +166,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -312,9 +314,9 @@ noinst_LIBRARIES = libutil.a libcompat.a libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c ttyio.c \ argparse.c memory.c secmem.c errors.c iobuf.c dotlock.c http.c \ - pka.c membuf.c cert.c $(libcompat_a_SOURCES) $(am__append_1) \ - $(am__append_2) $(am__append_3) $(am__append_4) \ - $(am__append_5) + pka.c membuf.c cert.c convert.c estream-printf.c \ + $(libcompat_a_SOURCES) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) # The internal regex code #includes these. EXTRA_libutil_a_SOURCES = regcomp.c regexec.c regex_internal.c \ @@ -327,7 +329,7 @@ # libutil.a, by definition, includes everything that libcompat.a does. libutil_a_DEPENDENCIES = @LIBOBJS@ libutil_a_LIBADD = @LIBOBJS@ -libcompat_a_SOURCES = compat.c +libcompat_a_SOURCES = compat.c $(am__append_5) libcompat_a_DEPENDENCIES = @LIBOBJS@ libcompat_a_LIBADD = @LIBOBJS@ all: all-am @@ -397,8 +399,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dotlock.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/estream-printf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iobuf.Po@am__quote@ @@ -437,8 +441,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -450,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -461,13 +465,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -608,19 +611,19 @@ http-test: http.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ srv-test: srv.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ pka-test: pka.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ cert-test: cert.c - cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gnupg-1.4.9/util/memory.c gnupg-1.4.10/util/memory.c --- gnupg-1.4.9/util/memory.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/memory.c 2009-07-20 09:39:06.000000000 +0100 @@ -62,6 +62,7 @@ #define M_GUARD 1 #endif #undef xmalloc +#undef xtrymalloc #undef xmalloc_clear #undef xmalloc_secure #undef xmalloc_secure_clear @@ -69,6 +70,7 @@ #undef xfree #undef m_check #undef xstrdup +#undef xtrystrdup #define FNAME(a) m_debug_ ##a #define FNAMEX(a) m_debug_ ##a #define FNAMEXM(a) m_debug_ ##a @@ -444,6 +446,30 @@ #endif } +/* Allocate memory of size n. This function returns NULL if we do not + have enough memory. */ +void * +FNAMEX(trymalloc)(size_t n FNAMEPRT) +{ +#ifdef M_GUARD + char *p; + + if (!n) + n = 1; + p = malloc (n + EXTRA_ALIGN+5); + if (!p) + return NULL; + store_len(p,n,0); + used_memory += n; + p[4+EXTRA_ALIGN+n] = MAGIC_END_BYTE; + return p+EXTRA_ALIGN+4; +#else + /* Mallocing zero bytes is undefined by ISO-C, so we better make + sure that it won't happen. */ + return malloc (n? n: 1); +#endif +} + /**************** * Allocate memory of size n from the secure memory pool. * This function gives up if we do not have enough memory @@ -616,6 +642,16 @@ return p; } +char * +FNAMEX(trystrdup)(const char *a FNAMEPRT) +{ + size_t n = strlen (a); + char *p = FNAMEX(trymalloc)(n+1 FNAMEARG); + if (p) + strcpy (p, a); + return p; +} + /* Wrapper around xmalloc_clear to take the usual 2 arguments of a calloc style function. */ diff -Nru gnupg-1.4.9/util/miscutil.c gnupg-1.4.10/util/miscutil.c --- gnupg-1.4.9/util/miscutil.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/miscutil.c 2009-08-18 10:03:17.000000000 +0100 @@ -152,6 +152,57 @@ return buffer; } + +/* Scan am ISO timestamp and return an Epoch based timestamp. The only + supported format is "yyyymmddThhmmss" delimited by white space, nul, a + colon or a comma. Returns 0 for an invalid string. */ +u32 +isotime2seconds (const char *string) +{ + const char *s; + int year, month, day, hour, minu, sec; + struct tm tmbuf; + int i; + time_t result; + + if (!*string) + return 0; + for (s=string, i=0; i < 8; i++, s++) + if (!digitp (s)) + return 0; + if (*s != 'T') + return 0; + for (s++, i=9; i < 15; i++, s++) + if (!digitp (s)) + return 0; + if ( !(!*s || (isascii (*s) && isspace(*s)) || *s == ':' || *s == ',')) + return 0; /* Wrong delimiter. */ + + year = atoi_4 (string); + month = atoi_2 (string + 4); + day = atoi_2 (string + 6); + hour = atoi_2 (string + 9); + minu = atoi_2 (string + 11); + sec = atoi_2 (string + 13); + + /* Basic checks. */ + if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 + || hour > 23 || minu > 59 || sec > 61 ) + return 0; + + memset (&tmbuf, 0, sizeof tmbuf); + tmbuf.tm_sec = sec; + tmbuf.tm_min = minu; + tmbuf.tm_hour = hour; + tmbuf.tm_mday = day; + tmbuf.tm_mon = month-1; + tmbuf.tm_year = year - 1900; + tmbuf.tm_isdst = -1; + result = timegm (&tmbuf); + return (result == (time_t)(-1))? 0 : (u32)result; +} + + /**************** * Note: this function returns local time */ @@ -205,7 +256,8 @@ print_string2( FILE *fp, const byte *p, size_t n, int delim, int delim2 ) { for( ; n; n--, p++ ) - if( *p < 0x20 || (*p >= 0x7f && *p < 0xa0) + if (*p < 0x20 + || *p == 0x7f || *p == delim || *p == delim2 || ((delim || delim2) && *p=='\\')) { diff -Nru gnupg-1.4.9/util/srv.c gnupg-1.4.10/util/srv.c --- gnupg-1.4.9/util/srv.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/srv.c 2009-07-24 09:12:36.000000000 +0100 @@ -1,5 +1,5 @@ /* srv.c - DNS SRV code - * Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -31,8 +31,6 @@ #include #include #include -#include "memory.h" -#include "types.h" #include "srv.h" /* Not every installation has gotten around to supporting SRVs @@ -56,19 +54,19 @@ int getsrv(const char *name,struct srventry **list) { - unsigned char answer[PACKETSZ]; + unsigned char answer[2048]; int r,srvcount=0; unsigned char *pt,*emsg; u16 count,dlen; + HEADER *header=(HEADER *)answer; *list=NULL; - r=res_query(name,C_IN,T_SRV,answer,PACKETSZ); - if(rPACKETSZ) + r=res_query(name,C_IN,T_SRV,answer,2048); + if(r2048) return -1; - if((((HEADER *)answer)->rcode)==NOERROR && - (count=ntohs(((HEADER *)answer)->ancount))) + if(header->rcode==NOERROR && (count=ntohs(header->ancount))) { int i,rc; @@ -88,7 +86,11 @@ struct srventry *srv=NULL; u16 type,class; - *list=xrealloc(*list,(srvcount+1)*sizeof(struct srventry)); + srv=realloc(*list,(srvcount+1)*sizeof(struct srventry)); + if(!srv) + goto fail; + + *list=srv; memset(&(*list)[srvcount],0,sizeof(struct srventry)); srv=&(*list)[srvcount]; srvcount++; @@ -215,12 +217,12 @@ return srvcount; noanswer: - xfree(*list); + free(*list); *list=NULL; return 0; fail: - xfree(*list); + free(*list); *list=NULL; return -1; } @@ -232,7 +234,14 @@ struct srventry *srv; int rc,i; - rc=getsrv("_hkp._tcp.wwwkeys.pgp.net",&srv); + if(argc!=2) + { + fprintf(stderr,"%s {srv}\n",argv[0]); + fprintf(stderr," Try %s _hkp._tcp.wwwkeys.pgp.net\n",argv[0]); + return 1; + } + + rc=getsrv(argv[1],&srv); printf("Count=%d\n\n",rc); for(i=0;i. - */ - -#ifndef _SRV_H_ -#define _SRV_H_ - -#ifdef USE_DNS_SRV -#ifdef _WIN32 -#include -#else -#include -#include -#include -#endif /* !_WIN32 */ -#endif /* USE_DNS_SRV */ -#include "types.h" - -#ifndef MAXDNAME -#define MAXDNAME 1025 -#endif - -struct srventry -{ - u16 priority; - u16 weight; - u16 port; - int run_count; - char target[MAXDNAME]; -}; - -int getsrv(const char *name,struct srventry **list); - -#endif /* !_SRV_H_ */ diff -Nru gnupg-1.4.9/util/strgutil.c gnupg-1.4.10/util/strgutil.c --- gnupg-1.4.9/util/strgutil.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/strgutil.c 2009-08-13 08:07:19.000000000 +0100 @@ -1,6 +1,6 @@ /* strgutil.c - string utilities * Copyright (C) 1994, 1998, 1999, 2000, 2001, - * 2003, 2004, 2005 Free Software Foundation, Inc. + * 2003, 2004, 2005, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -47,6 +47,14 @@ #include "memory.h" #include "i18n.h" #include "dynload.h" +#include "estream-printf.h" + +/* Our xasprintf replacements are expected to work with our memory + allocator. Let's test for this here. */ +#if !defined(_ESTREAM_PRINTF_MALLOC) || !defined(_ESTREAM_PRINTF_FREE) +#error Please define _ESTREAM_PRINTF_MALLOC and _FREE +#endif + #ifndef USE_GNUPG_ICONV @@ -1040,6 +1048,111 @@ } } +/* This is similar to native_to_utf8, except it can take any input + (which may or may not be UTF8 encoded) and return something that is + (almost) definitely UTF8. This code is mostly borrowed from + GPA. */ + +char * +string_to_utf8 (const char *string) +{ + const char *s; + + if (!string) + return NULL; + + /* Due to a bug in old and not so old PGP versions user IDs have + been copied verbatim into the key. Thus many users with Umlauts + et al. in their name will see their names garbled. Although this + is not an issue for me (;-)), I have a couple of friends with + Umlauts in their name, so let's try to make their life easier by + detecting invalid encodings and convert that to Latin-1. We use + this even for X.509 because it may make things even better given + all the invalid encodings often found in X.509 certificates. */ + for (s = string; *s && !(*s & 0x80); s++) + ; + if (*s && ((s[1] & 0xc0) == 0x80) && ( ((*s & 0xe0) == 0xc0) + || ((*s & 0xf0) == 0xe0) + || ((*s & 0xf8) == 0xf0) + || ((*s & 0xfc) == 0xf8) + || ((*s & 0xfe) == 0xfc)) ) + { + /* Possible utf-8 character followed by continuation byte. + Although this might still be Latin-1 we better assume that it + is valid utf-8. */ + return xstrdup (string); + } + else if (*s && !strchr (string, 0xc3)) + { + size_t length=0; + char *buffer,*p; + + /* No 0xC3 character in the string; assume that it is Latin-1. */ + + for(s=string; *s; s++ ) + { + length++; + if( *s & 0x80 ) + length++; + } + buffer = xmalloc( length + 1 ); + for(p=buffer, s=string; *s; s++ ) + { + if( *s & 0x80 ) + { + *p++ = 0xc0 | ((*s >> 6) & 3); + *p++ = 0x80 | ( *s & 0x3f ); + } + else + *p++ = *s; + } + *p = 0; + + return buffer; + } + else + { + /* Everything else is assumed to be UTF-8. We do this even that + we know the encoding is not valid. However as we only test + the first non-ascii character, valid encodings might + follow. */ + return xstrdup (string); + } +} + +/* Same as asprintf but return an allocated buffer suitable to be + freed using xfree. This function simply dies on memory failure, + thus no extra check is required. */ +char * +xasprintf (const char *fmt, ...) +{ + va_list ap; + char *buf; + + va_start (ap, fmt); + if (estream_vasprintf (&buf, fmt, ap) < 0) + log_fatal ("estream_asprintf failed: %s\n", strerror (errno)); + va_end (ap); + return buf; +} + +/* Same as above but return NULL on memory failure. */ +char * +xtryasprintf (const char *fmt, ...) +{ + int rc; + va_list ap; + char *buf; + + va_start (ap, fmt); + rc = estream_vasprintf (&buf, fmt, ap); + va_end (ap); + if (rc < 0) + return NULL; + return buf; +} + + /**************************************************** ******** locale insensitive ctype functions ******** ****************************************************/ @@ -1127,111 +1240,6 @@ #ifdef _WIN32 -/* - * Like vsprintf but provides a pointer to malloc'd storage, which - * must be freed by the caller (xfree). 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 = xmalloc (total_width); - if (*result != NULL) - return vsprintf (*result, format, args); - else - return 0; -} - -int -asprintf (char **buf, const char *fmt, ...) -{ - int status; - va_list ap; - - va_start (ap, fmt); - status = vasprintf (buf, fmt, ap); - va_end (ap); - return status; -} - const char * w32_strerror (int w32_errno) { diff -Nru gnupg-1.4.9/util/ttyio.c gnupg-1.4.10/util/ttyio.c --- gnupg-1.4.9/util/ttyio.c 2007-10-23 08:55:31.000000000 +0100 +++ gnupg-1.4.10/util/ttyio.c 2009-07-21 14:02:14.000000000 +0100 @@ -122,6 +122,14 @@ } #endif +void +tty_cleanup_after_signal (void) +{ +#ifdef HAVE_TCGETATTR + cleanup (); +#endif +} + static void init_ttyfp(void) { @@ -231,13 +239,14 @@ va_start( arg_ptr, fmt ) ; #ifdef _WIN32 { - char *buf = NULL; + char *buf; int n; DWORD nwritten; - n = vasprintf(&buf, fmt, arg_ptr); - if( !buf ) - log_bug("vasprintf() failed\n"); + buf = xtryasprintf(fmt, arg_ptr); + if (!buf) + log_bug("xtryasprintf() failed\n"); + n = strlen (buf); if (!WriteConsoleA (con.out, buf, n, &nwritten, NULL)) log_fatal ("WriteConsole failed: %s", w32_strerror (0)); @@ -278,13 +287,14 @@ va_start( arg_ptr, fmt ) ; #ifdef _WIN32 { - char *buf = NULL; + char *buf; int n; DWORD nwritten; - n = vasprintf(&buf, fmt, arg_ptr); - if( !buf ) - log_bug("vasprintf() failed\n"); + buf = xtryasprintf (fmt, arg_ptr); + if (!buf) + log_bug ("xtryasprintf() failed\n"); + n = strlen (buf); if (!WriteConsoleA (con.out, buf, n, &nwritten, NULL)) log_fatal ("WriteConsole failed: %s", w32_strerror (0)); diff -Nru gnupg-1.4.9/VERSION gnupg-1.4.10/VERSION --- gnupg-1.4.9/VERSION 2008-03-26 17:34:13.000000000 +0000 +++ gnupg-1.4.10/VERSION 2009-09-02 17:21:13.000000000 +0100 @@ -1 +1 @@ -1.4.9 +1.4.10 diff -Nru gnupg-1.4.9/zlib/Makefile.in gnupg-1.4.10/zlib/Makefile.in --- gnupg-1.4.9/zlib/Makefile.in 2008-03-26 17:30:47.000000000 +0000 +++ gnupg-1.4.10/zlib/Makefile.in 2009-09-02 17:20:23.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -42,11 +42,11 @@ $(srcdir)/zconf.h $(srcdir)/zlib.h ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ - $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intmax.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/estream.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -77,7 +77,7 @@ infblock.$(OBJEXT) inftrees.$(OBJEXT) infcodes.$(OBJEXT) \ infutil.$(OBJEXT) inffast.$(OBJEXT) libzlib_a_OBJECTS = $(am_libzlib_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -117,7 +117,6 @@ DLLIBS = @DLLIBS@ DNSLIBS = @DNSLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -357,8 +356,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -370,8 +369,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -381,13 +380,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique