-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file to create version 1.2.3 from 1.2.2. Please check the signature of this patch file: zcat somepath/gnupg-1.2.2-1.2.3.diff.gz | gpg --verify Change to directory gnupg-1.2.2 (or however you renamed it) and give this command: zcat somepath/gnupg-1.2.2-1.2.3.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-1.2.3 now. Prereq: 1.2.2 diff -urpP gnupg-1.2.2/VERSION gnupg-1.2.3/VERSION --- gnupg-1.2.2/VERSION 2003-05-01 14:39:14.000000000 +0000 +++ gnupg-1.2.3/VERSION 2003-08-21 20:06:09.000000000 +0000 @@ -1 +1 @@ -1.2.2 +1.2.3 diff -urpP gnupg-1.2.2/AUTHORS gnupg-1.2.3/AUTHORS --- gnupg-1.2.2/AUTHORS 2003-04-24 10:40:16.000000000 +0000 +++ gnupg-1.2.3/AUTHORS 2003-08-21 16:43:06.000000000 +0000 @@ -25,7 +25,7 @@ Gaël Quéri Translati Gregory Steuck Translations [ru] -Nagy Ferenc László *** [hu] +Nagy Ferenc László Translations [hu] Ivo Timmermans Translations [nl] @@ -37,6 +37,8 @@ Jedi Lin Translations [z Jouni Hiltunen Translations [fi] +Laurentiu Buzdugan Translations [ro] + Magda Procha'zkova' Translations [cs] Michael Anckaert *** [nl] diff -urpP gnupg-1.2.2/ChangeLog gnupg-1.2.3/ChangeLog --- gnupg-1.2.2/ChangeLog 2003-05-01 11:19:03.000000000 +0000 +++ gnupg-1.2.3/ChangeLog 2003-08-21 19:47:25.000000000 +0000 @@ -1,3 +1,89 @@ +2003-08-21 Werner Koch + + Released 1.2.3. + +2003-08-20 David Shaw + + * THANKS: Thank Nelson H. F. Beebe. + +2003-07-30 Werner Koch + + Released 1.2.3rc1. + +2003-07-29 David Shaw + + * NEWS: Cite DETAILS. + + * README: Note problem with gcc < 2.96 and non-gnu as. + +2003-07-27 David Shaw + + * NEWS: Note %g and %p, the "tru" --with-colons record, and the + REVKEYSIG --status-fd tag. + + * README: Add a note about the SunOS symbol underscore problem and + how to fix it. + +2003-06-19 David Shaw + + * configure.ac: Include wsock32 in W32LIBS. This is different + from NETLIBS so we don't need to force other platforms to pull in + the netlibs when they aren't actually needed. + +2003-06-19 Werner Koch + + Released 1.2.3rc1. + + * configure.ac (ALL_LINGUAS): Added Romanian + +2003-06-18 David Shaw + + * NEWS: Note portability changes. + +2003-06-14 David Shaw + + * configure.ac: Check for sigset_t and struct sigaction. This is + for Forte c89 on Solaris which seems to define only the function + call half of the two pairs by default. + +2003-05-28 David Shaw + + * NEWS: Document --gnupg and the deprecation of --no-openpgp and + --no-pgpX. + + * configure.ac: Put wsock32 in NETLIBS. Put zlib in ZLIBS. Put + dl in DLLIBS. Check for getopt.h if available. Look for getopt() + in libiberty if libc doesn't have it. Enable GPGKEYS_HKP after + AC_PROG_CC so that any needed extension (i.e. ".exe") is defined. + +2003-05-21 David Shaw + + * configure.ac: Edit preprocessor instructions in g10defs.h to + remove whitespace before the '#'. This is not required by C89, + but there are some compilers out there that don't like it. + +2003-05-09 David Shaw + + * configure.ac: Simpler implementation for the 64-bit question - + we don't need to verify compiler support with a test program since + we just cast everything to the proper type. This also means that + cross compiling doesn't become a problem. + + * configure.ac: Check for 64-bit types, and how well the compiler + supports them (LL) before enabling TIGER/192, SHA-384, or SHA-512. + +2003-05-08 David Shaw + + * README: Remove note about HP/UX inline problem since autoconf + now handles this automatically. + + * configure.ac: Remove some stuff no longer needed with newer + autoconf. Use AC_GNU_SOURCE instead of defining _GNU_SOURCE + manually. Add check for strchr() for gettext. Add "ngettext" + check for gettext, since that check supposedly implies a check for + bind_textdomain_codeset. Add check for times() for random.c. Fix + URL for EGD. + 2003-05-01 Werner Koch Released 1.2.2. diff -urpP gnupg-1.2.2/Makefile.in gnupg-1.2.3/Makefile.in --- gnupg-1.2.2/Makefile.in 2003-05-01 14:34:45.000000000 +0000 +++ gnupg-1.2.3/Makefile.in 2003-08-21 19:49:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -79,6 +79,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -91,6 +92,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -153,6 +155,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -219,8 +222,9 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 \ aclocal.m4 config.h.in configure configure.ac scripts/ChangeLog \ - scripts/config.guess scripts/config.sub scripts/depcomp \ - scripts/install-sh scripts/missing scripts/mkinstalldirs + scripts/config.guess scripts/config.rpath scripts/config.sub \ + scripts/depcomp scripts/install-sh scripts/missing \ + scripts/mkinstalldirs DIST_SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc \ checks all: config.h @@ -344,9 +348,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -494,7 +504,7 @@ distcheck: dist @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' distuninstallcheck: - cd $(distuninstallcheck_dir) \ + @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -503,11 +513,11 @@ distuninstallcheck: $(distuninstallcheck_listfiles) ; \ exit 1; } >&2 distcleancheck: distclean - if test '$(srcdir)' = . ; then \ + @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 diff -urpP gnupg-1.2.2/NEWS gnupg-1.2.3/NEWS --- gnupg-1.2.2/NEWS 2003-05-01 11:17:52.000000000 +0000 +++ gnupg-1.2.3/NEWS 2003-08-21 19:46:01.000000000 +0000 @@ -1,3 +1,31 @@ +Noteworthy changes in version 1.2.3 (2003-08-21) +------------------------------------------------ + + * New "--gnupg" option (set by default) that disables --openpgp, + and the various --pgpX emulation options. This replaces + --no-openpgp, and --no-pgpX, and also means that GnuPG has + finally grown a --gnupg option to make GnuPG act like GnuPG. + + * A number of portability changes to make building GnuPG on + less-common platforms easier. + + * Romanian translation. + + * Two new %-expandos for use in notation and policy URLs. "%g" + expands to the fingerprint of the key making the signature + (which might be a subkey), and "%p" expands to the fingerprint + of the primary key that owns the key making the signature. + + * New "tru" record in --with-colons --list-keys listings. It + shows the status of the trust database that was used to + calculate the key validity in the listings. See doc/DETAILS for + the specifics of this. + + * New REVKEYSIG status tag for --status-fd. It indicates a valid + signature that was issued by a revoked key. See doc/DETAILS for + the specifics of this. + + Noteworthy changes in version 1.2.2 (2003-05-01) ------------------------------------------------ diff -urpP gnupg-1.2.2/README gnupg-1.2.3/README --- gnupg-1.2.2/README 2003-05-01 11:02:16.000000000 +0000 +++ gnupg-1.2.3/README 2003-08-21 19:46:37.000000000 +0000 @@ -1,7 +1,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 1.2.2 + Version 1.2.3 Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. @@ -543,7 +543,7 @@ --------------------- If you get unresolved externals "gettext" you should run configure again with the option "--with-included-gettext"; this is version - 0.10.35 which is available at alpha.gnu.org. + 0.10.40 which is available at ftp.gnu.org. If you have other compile problems, try the configure options "--with-included-zlib" or "--disable-nls" (See ABOUT-NLS) or @@ -558,7 +558,11 @@ replacements are in C and in mpi/generic; never delete udiv-qrnnd.S in any CPU directory, because there may be no C substitute. Don't forget to delete "config.cache" and run - "./config.status --recheck". + "./config.status --recheck". We have also heard reports of + problems when using versions of gcc earlier than 2.96 along with a + non-GNU assembler (as). If this applies to your platform, you can + either upgrade gcc to a more recent version, or use the GNU + assembler. Some make tools are broken - the best solution is to use GNU's make. Try gmake or grab the sources from a GNU archive and @@ -600,13 +604,9 @@ Due to problems with the ESIX as, you probably want to do CFLAGS="-O -K pentium" ./configure --disable-asm - * HP/UX 11 with HP's C compiler: - - This compiler has some issues with inline functions. If you - get an error like "Unexpected symbol: SWAP" in gettextP.h, - read and follow the instructions at the top of - intl/gettextP.h. + * SunOS 4.1.4 + ./configure ac_cv_sys_symbol_underscore=yes The Random Device ----------------- diff -urpP gnupg-1.2.2/THANKS gnupg-1.2.3/THANKS --- gnupg-1.2.2/THANKS 2003-04-09 08:03:17.000000000 +0000 +++ gnupg-1.2.3/THANKS 2003-08-21 16:15:12.000000000 +0000 @@ -66,13 +66,14 @@ Frank Tobin ftobin@uiuc.edu Gabriel Rosenkoetter gr@eclipsed.net Gaël Quéri gael@lautre.net Gene Carter gcarter@lanier.com +Geoff Keating geoffk@ozemail.com.au Georg Schwarz georg.schwarz@iname.com Giampaolo Tomassoni g.tomassoni@libero.it Gilbert Fernandes gilbert_fernandes@hotmail.com Greg Louis glouis@dynamicro.on.ca Greg Troxel gdt@ir.bbn.com Gregory Steuck steuck@iname.com -Geoff Keating geoffk@ozemail.com.au +Gregery Barton gregery20@yahoo.com.au Harald Denker harry@hal.westfalen.de Holger Baust Holger.Baust@freenet-ag.de Hendrik Buschkamp buschkamp@rheumanet.org @@ -103,6 +104,7 @@ Johnny Teveßen j.tevessen@gmx.de Jörg Schilling schilling@fokus.gmd.de Jos Backus Jos.Backus@nl.origin-it.com Joseph Walton joe@kafsemo.org +Juan F. Codagnone juam@arnet.com.ar Jun Kuriyama kuriyama@sky.rim.or.jp Kahil D. Jallad kdj4@cs.columbia.edu Karl Fogel kfogel@guanabana.onshore.com @@ -140,6 +142,7 @@ Michael Tokarev mjt@tls.msk.ru Nicolas Graner Nicolas.Graner@cri.u-psud.fr Mike McEwan mike@lotusland.demon.co.uk Neal H Walfield neal@cs.uml.edu +Nelson H. F. Beebe beebe@math.utah.edu NIIBE Yutaka gniibe@chroot.org Niklas Hernaeus Nimrod Zimerman zimerman@forfree.at @@ -191,6 +194,7 @@ Thijmen Klok thijmen@xs4al Thomas Roessler roessler@guug.de Tim Mooney mooney@dogbert.cc.ndsu.nodak.edu Timo Schulz towaday@freakmail.de +Todd Vierling tv@pobox.com TOGAWA Satoshi Satoshi.Togawa@jp.yokogawa.com Tom Spindler dogcow@home.merit.edu Tom Zerucha tzeruch@ceddec.com @@ -208,7 +212,7 @@ Walter Hofmann Walter.Hofmann@physik Walter Koch koch@hsp.de Wayne Chapeskie waynec@spinnaker.com Werner Koch wk@gnupg.org -Wim Vandeputte bunbun@reptile.rug.ac.be +Wim Vandeputte wim@kd85.com Winona Brown win@huh.org Yosiaki IIDA iida@ring.gr.jp Yoshihiro Kajiki kajiki@ylug.org @@ -224,7 +228,7 @@ Ministry for Economics and Technology un Many thanks to my wife Gerlinde for having so much patience with me while hacking late in the evening. - Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003 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 -urpP gnupg-1.2.2/aclocal.m4 gnupg-1.2.3/aclocal.m4 diff -urpP gnupg-1.2.2/aclocal.m4 gnupg-1.2.3/aclocal.m4 --- gnupg-1.2.2/aclocal.m4 2003-05-01 14:34:09.000000000 +0000 +++ gnupg-1.2.3/aclocal.m4 2003-08-21 19:49:09.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7.3 -*- Autoconf -*- +# generated automatically by aclocal 1.7.4 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -803,7 +803,7 @@ fi])]) # 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. -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -821,14 +821,7 @@ fi])]) # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 9 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - +# serial 10 AC_PREREQ([2.54]) @@ -957,7 +950,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.3])]) + [AM_AUTOMAKE_VERSION([1.7.4])]) # Helper functions for option handling. -*- Autoconf -*- diff -urpP gnupg-1.2.2/checks/ChangeLog gnupg-1.2.3/checks/ChangeLog --- gnupg-1.2.2/checks/ChangeLog 2003-05-01 13:17:57.000000000 +0000 +++ gnupg-1.2.3/checks/ChangeLog 2003-07-30 07:44:42.000000000 +0000 @@ -1,3 +1,16 @@ +2003-06-26 David Shaw + + * Makefile.am: Add --no-permission-warning to avoid spurious + warning when importing demo keys. + +2003-05-09 David Shaw + + * mds.test: Note that missing algorithms are not errors. + +2003-05-02 David Shaw + + * defs.inc: Fix shell warning messages. + 2003-05-01 Werner Koch * defs.inc (pgmname): Make sure there is a valid options file. diff -urpP gnupg-1.2.2/checks/Makefile.am gnupg-1.2.3/checks/Makefile.am --- gnupg-1.2.2/checks/Makefile.am 2003-05-01 13:38:40.000000000 +0000 +++ gnupg-1.2.3/checks/Makefile.am 2003-07-30 07:44:42.000000000 +0000 @@ -18,7 +18,7 @@ # Process this file with automake to create Makefile.in -GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import +GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --no-permission-warning --import TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ @@ -98,4 +98,3 @@ plain-large: cat $(srcdir)/../doc/HACKING \ $(srcdir)/../doc/DETAILS \ $(srcdir)/../doc/FAQ >plain-large - diff -urpP gnupg-1.2.2/checks/Makefile.in gnupg-1.2.3/checks/Makefile.in --- gnupg-1.2.2/checks/Makefile.in 2003-05-01 14:39:08.000000000 +0000 +++ gnupg-1.2.3/checks/Makefile.in 2003-08-21 20:03:39.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -80,6 +80,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -92,6 +93,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -154,6 +156,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -199,7 +202,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import +GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --no-permission-warning --import TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ @@ -231,6 +234,7 @@ CLEANFILES = prepared.stamp x y yy z out DISTCLEANFILES = pubring.gpg~ random_seed subdir = checks +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = diff -urpP gnupg-1.2.2/checks/defs.inc gnupg-1.2.3/checks/defs.inc --- gnupg-1.2.2/checks/defs.inc 2003-05-01 13:17:46.000000000 +0000 +++ gnupg-1.2.3/checks/defs.inc 2003-05-21 08:42:54.000000000 +0000 @@ -99,9 +99,9 @@ pgmname=`basename $0` [ -z "$srcdir" ] && fatal "not called from make" # Make sure we have a valid option files even with VPATH builds. -if [ -f ./options]; then +if [ -f ./options ]; then : -elif [ -f ./gpg.conf]; then +elif [ -f ./gpg.conf ]; then : elif [ -f $srcdir/options ]; then cat $srcdir/options >gpg.conf @@ -112,4 +112,4 @@ GPG="../g10/gpg --homedir . " exec 2> ${pgmname}.log : -# end \ No newline at end of file +# end diff -urpP gnupg-1.2.2/checks/mds.test gnupg-1.2.3/checks/mds.test --- gnupg-1.2.2/checks/mds.test 2003-04-24 11:15:56.000000000 +0000 +++ gnupg-1.2.3/checks/mds.test 2003-05-21 08:42:54.000000000 +0000 @@ -24,7 +24,7 @@ test_one ":3:" "9C1185A5C5E9FC5461280 if have_hash_algo "TIGER192"; then test_one ":6:" "24F0130C63AC933216166E76B1BB925FF373DE2D49584E7A" else - echo "Hash algorithm TIGER/192 is not installed" + echo "Hash algorithm TIGER/192 is not installed (not an error)" fi # SHA-256 test_one ":8:" "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855" @@ -32,13 +32,13 @@ test_one ":8:" "E3B0C44298FC1C149AFBF if have_hash_algo "SHA384"; then test_one ":9:" "38B060A751AC96384CD9327EB1B1E36A21FDB71114BE07434C0CC7BF63F6E1DA274EDEBFE76F65FBD51AD2F14898B95B" else - echo "Hash algorithm SHA-384 is not installed" + echo "Hash algorithm SHA-384 is not installed (not an error)" fi # SHA-512 if have_hash_algo "SHA512"; then test_one ":10:" "CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E" else - echo "Hash algorithm SHA-512 is not installed" + echo "Hash algorithm SHA-512 is not installed (not an error)" fi [ "$failed" != "" ] && error "$failed failed for empty string" diff -urpP gnupg-1.2.2/cipher/ChangeLog gnupg-1.2.3/cipher/ChangeLog --- gnupg-1.2.2/cipher/ChangeLog 2003-04-15 12:21:57.000000000 +0000 +++ gnupg-1.2.3/cipher/ChangeLog 2003-08-21 16:06:46.000000000 +0000 @@ -1,3 +1,47 @@ +2003-08-12 David Shaw + + * random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM + twice. Use NAME_OF_DEV_URANDOM. + +2003-07-30 Werner Koch + + * idea-stub.c, random.c: Replaced some __MINGW32__ by _WIN32 and + added some _WIN32. + +2003-05-21 David Shaw + + * bithelp.h, des.c, random.c, rndlinux.c, sha1.c, blowfish.c, + elgamal.c, rijndael.c, rndunix.c, sha256.c, cast5.c, idea-stub.c, + rmd160.c, rndw32.c, sha512.c, md5.c, rmd160test.c, rsa.c, tiger.c: + Edit all preprocessor instructions to remove whitespace before the + '#'. This is not required by C89, but there are some compilers + out there that don't like it. + +2003-05-13 David Shaw + + * tiger.c: Use the U64_C macro instead of LL. + + * md.c (string_to_digest_algo): Give a warning about TIGER192 not + being part of OpenPGP. + + * idea-stub.c (load_module): Catch an error if the idea module + file is unloadable for some reason (unreadable, bad permissions, + etc.) + +2003-05-09 David Shaw + + * sha512.c: Use the U64_C() macro rather than blindly suffixing + with LL. U64_C is defined in include/types.h and uses the correct + suffix depending on the underlying type of u64. + + * sha512.c: Suffix all 64-bit constants with LL. Note this makes + this file non-c89 compliant. That is okay since we have an + autoconf check for this, and many c89 compilers support LL anyway. + +2003-05-08 David Shaw + + * random.c (fast_random_poll): Only use times() if we HAVE_TIMES. + 2003-04-15 Werner Koch * md.c (md_start_debug): Need to open the file in binary mode. @@ -1045,7 +1089,6 @@ Mon Feb 16 10:08:47 1998 Werner Koch ( (digest_algo_to_string): New. - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is free software; as a special exception the author gives @@ -1055,5 +1098,3 @@ Mon Feb 16 10:08:47 1998 Werner Koch ( 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. - - diff -urpP gnupg-1.2.2/cipher/Makefile.in gnupg-1.2.3/cipher/Makefile.in --- gnupg-1.2.2/cipher/Makefile.in 2003-05-01 14:37:15.000000000 +0000 +++ gnupg-1.2.3/cipher/Makefile.in 2003-08-21 19:53:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -239,6 +242,7 @@ EXTRA_libcipher_a_SOURCES = idea-stub.c libcipher_a_DEPENDENCIES = @IDEA_O@ @TIGER_O@ @SHA512_O@ libcipher_a_LIBADD = @IDEA_O@ @TIGER_O@ @SHA512_O@ subdir = cipher +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -337,7 +341,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -348,7 +352,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ diff -urpP gnupg-1.2.2/cipher/bithelp.h gnupg-1.2.3/cipher/bithelp.h --- gnupg-1.2.2/cipher/bithelp.h 2002-06-29 13:13:47.000000000 +0000 +++ gnupg-1.2.3/cipher/bithelp.h 2003-06-07 18:55:18.000000000 +0000 @@ -34,7 +34,7 @@ rol( u32 x, int n) return x; } #else - #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) +#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif diff -urpP gnupg-1.2.2/cipher/blowfish.c gnupg-1.2.3/cipher/blowfish.c --- gnupg-1.2.2/cipher/blowfish.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/blowfish.c 2003-06-07 18:55:18.000000000 +0000 @@ -253,27 +253,27 @@ function_F( BLOWFISH_context *bc, u32 x { u16 a, b, c, d; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST a = ((byte*)&x)[0]; b = ((byte*)&x)[1]; c = ((byte*)&x)[2]; d = ((byte*)&x)[3]; - #else +#else a = ((byte*)&x)[3]; b = ((byte*)&x)[2]; c = ((byte*)&x)[1]; d = ((byte*)&x)[0]; - #endif +#endif return ((bc->s0[a] + bc->s1[b]) ^ bc->s2[c] ) + bc->s3[d]; } #endif #ifdef BIG_ENDIAN_HOST - #define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]]) \ +#define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]]) \ ^ s2[((byte*)&x)[2]]) + s3[((byte*)&x)[3]] ) #else - #define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]]) \ +#define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]]) \ ^ s2[((byte*)&x)[1]]) + s3[((byte*)&x)[0]] ) #endif #define R(l,r,i) do { l ^= p[i]; r ^= F(l); } while(0) @@ -293,7 +293,7 @@ burn_stack (int bytes) static void do_encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) { - #if BLOWFISH_ROUNDS == 16 +#if BLOWFISH_ROUNDS == 16 u32 xl, xr, *s0, *s1, *s2, *s3, *p; xl = *ret_xl; @@ -327,7 +327,7 @@ do_encrypt( BLOWFISH_context *bc, u32 * *ret_xl = xr; *ret_xr = xl; - #else +#else u32 xl, xr, temp, *p; int i; @@ -351,14 +351,14 @@ do_encrypt( BLOWFISH_context *bc, u32 * *ret_xl = xl; *ret_xr = xr; - #endif +#endif } static void decrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) { - #if BLOWFISH_ROUNDS == 16 +#if BLOWFISH_ROUNDS == 16 u32 xl, xr, *s0, *s1, *s2, *s3, *p; xl = *ret_xl; @@ -392,7 +392,7 @@ decrypt( BLOWFISH_context *bc, u32 *ret *ret_xl = xr; *ret_xr = xl; - #else +#else u32 xl, xr, temp, *p; int i; @@ -417,7 +417,7 @@ decrypt( BLOWFISH_context *bc, u32 *ret *ret_xl = xl; *ret_xr = xr; - #endif +#endif } #undef F @@ -534,17 +534,17 @@ do_bf_setkey( BLOWFISH_context *c, byte } for(i=j=0; i < BLOWFISH_ROUNDS+2; i++ ) { - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST ((byte*)&data)[0] = key[j]; ((byte*)&data)[1] = key[(j+1)%keylen]; ((byte*)&data)[2] = key[(j+2)%keylen]; ((byte*)&data)[3] = key[(j+3)%keylen]; - #else +#else ((byte*)&data)[3] = key[j]; ((byte*)&data)[2] = key[(j+1)%keylen]; ((byte*)&data)[1] = key[(j+2)%keylen]; ((byte*)&data)[0] = key[(j+3)%keylen]; - #endif +#endif c->p[i] ^= data; j = (j+4) % keylen; } @@ -630,4 +630,3 @@ blowfish_get_info( int algo, size_t *key return "BLOWFISH"; return NULL; } - diff -urpP gnupg-1.2.2/cipher/cast5.c gnupg-1.2.3/cipher/cast5.c --- gnupg-1.2.2/cipher/cast5.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/cast5.c 2003-06-07 18:55:18.000000000 +0000 @@ -345,7 +345,7 @@ rol(int n, u32 x) return x; } #else - #define rol(n,x) ( ((x) << (n)) | ((x) >> (32-(n))) ) +#define rol(n,x) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif #define F1(D,m,r) ( (I = ((m) + (D))), (I=rol((r),I)), \ @@ -495,7 +495,7 @@ selftest(void) if( memcmp( buffer, plain, 8 ) ) return "2"; - #if 0 /* full maintenance test */ +#if 0 /* full maintenance test */ { int i; byte a0[16] = { 0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78, @@ -519,7 +519,7 @@ selftest(void) return "3"; } - #endif +#endif return NULL; } @@ -528,8 +528,8 @@ static void key_schedule( u32 *x, u32 *z, u32 *k ) { - #define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) - #define zi(i) ((z[(i)/4] >> (8*(3-((i)%4)))) & 0xff) +#define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) +#define zi(i) ((z[(i)/4] >> (8*(3-((i)%4)))) & 0xff) z[0] = x[0] ^ s5[xi(13)]^s6[xi(15)]^s7[xi(12)]^s8[xi(14)]^s7[xi( 8)]; z[1] = x[2] ^ s5[zi( 0)]^s6[zi( 2)]^s7[zi( 1)]^s8[zi( 3)]^s8[xi(10)]; @@ -567,8 +567,8 @@ key_schedule( u32 *x, u32 *z, u32 *k ) k[14]= s5[xi(12)]^s6[xi(13)]^s7[xi( 3)]^s8[xi( 2)]^s7[xi( 8)]; k[15]= s5[xi(14)]^s6[xi(15)]^s7[xi( 1)]^s8[xi( 0)]^s8[xi(13)]; - #undef xi - #undef zi +#undef xi +#undef zi } @@ -610,8 +610,8 @@ do_cast_setkey( CAST5_context *c, byte * memset(&z,0, sizeof z); memset(&k,0, sizeof k); - #undef xi - #undef zi +#undef xi +#undef zi return 0; } @@ -652,4 +652,3 @@ cast5_get_info( int algo, size_t *keylen return "CAST5"; return NULL; } - diff -urpP gnupg-1.2.2/cipher/des.c gnupg-1.2.3/cipher/des.c --- gnupg-1.2.2/cipher/des.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/des.c 2003-06-07 18:55:19.000000000 +0000 @@ -141,9 +141,9 @@ working_memcmp( const char *a, const cha /* Some defines/checks to support standalone modules */ #ifndef CIPHER_ALGO_3DES - #define CIPHER_ALGO_3DES 2 +#define CIPHER_ALGO_3DES 2 #elif CIPHER_ALGO_3DES != 2 - #error CIPHER_ALGO_3DES is defined to a wrong value. +#error CIPHER_ALGO_3DES is defined to a wrong value. #endif @@ -1022,4 +1022,3 @@ des_get_info( int algo, size_t *keylen, } return NULL; } - diff -urpP gnupg-1.2.2/cipher/elgamal.c gnupg-1.2.3/cipher/elgamal.c --- gnupg-1.2.2/cipher/elgamal.c 2002-06-29 13:13:47.000000000 +0000 +++ gnupg-1.2.3/cipher/elgamal.c 2003-06-07 18:55:19.000000000 +0000 @@ -356,7 +356,7 @@ do_encrypt(MPI a, MPI b, MPI input, ELG_ */ mpi_powm( b, pkey->y, k, pkey->p ); mpi_mulm( b, b, input, pkey->p ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg encrypted y= ", pkey->y); log_mpidump("elg encrypted p= ", pkey->p); @@ -365,7 +365,7 @@ do_encrypt(MPI a, MPI b, MPI input, ELG_ log_mpidump("elg encrypted a= ", a); log_mpidump("elg encrypted b= ", b); } - #endif +#endif mpi_free(k); } @@ -381,7 +381,7 @@ decrypt(MPI output, MPI a, MPI b, ELG_se mpi_powm( t1, a, skey->x, skey->p ); mpi_invm( t1, t1, skey->p ); mpi_mulm( output, b, t1, skey->p ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg decrypted x= ", skey->x); log_mpidump("elg decrypted p= ", skey->p); @@ -389,7 +389,7 @@ decrypt(MPI output, MPI a, MPI b, ELG_se log_mpidump("elg decrypted b= ", b); log_mpidump("elg decrypted M= ", output); } - #endif +#endif mpi_free(t1); } @@ -424,7 +424,7 @@ sign(MPI a, MPI b, MPI input, ELG_secret mpi_invm(inv, k, p_1 ); mpi_mulm(b, t, inv, p_1 ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg sign p= ", skey->p); log_mpidump("elg sign g= ", skey->g); @@ -435,7 +435,7 @@ sign(MPI a, MPI b, MPI input, ELG_secret log_mpidump("elg sign a= ", a); log_mpidump("elg sign b= ", b); } - #endif +#endif mpi_free(k); mpi_free(t); mpi_free(inv); @@ -461,7 +461,7 @@ verify(MPI a, MPI b, MPI input, ELG_publ t1 = mpi_alloc( mpi_get_nlimbs(a) ); t2 = mpi_alloc( mpi_get_nlimbs(a) ); - #if 0 +#if 0 /* t1 = (y^a mod p) * (a^b mod p) mod p */ mpi_powm( t1, pkey->y, a, pkey->p ); mpi_powm( t2, a, b, pkey->p ); @@ -471,7 +471,7 @@ verify(MPI a, MPI b, MPI input, ELG_publ mpi_powm( t2, pkey->g, input, pkey->p ); rc = !mpi_cmp( t1, t2 ); - #elif 0 +#elif 0 /* t1 = (y^a mod p) * (a^b mod p) mod p */ base[0] = pkey->y; exp[0] = a; base[1] = a; exp[1] = b; @@ -482,7 +482,7 @@ verify(MPI a, MPI b, MPI input, ELG_publ mpi_powm( t2, pkey->g, input, pkey->p ); rc = !mpi_cmp( t1, t2 ); - #else +#else /* t1 = g ^ - input * y ^ a * a ^ b mod p */ mpi_invm(t2, pkey->g, pkey->p ); base[0] = t2 ; exp[0] = input; @@ -492,7 +492,7 @@ verify(MPI a, MPI b, MPI input, ELG_publ mpi_mulpowm( t1, base, exp, pkey->p ); rc = !mpi_cmp_ui( t1, 1 ); - #endif +#endif mpi_free(t1); mpi_free(t2); @@ -662,5 +662,3 @@ elg_get_info( int algo, int *npkey, int default: *use = 0; return NULL; } } - - diff -urpP gnupg-1.2.2/cipher/idea-stub.c gnupg-1.2.3/cipher/idea-stub.c --- gnupg-1.2.2/cipher/idea-stub.c 2002-08-03 18:35:15.000000000 +0000 +++ gnupg-1.2.3/cipher/idea-stub.c 2003-07-30 15:15:51.000000000 +0000 @@ -1,5 +1,5 @@ /* idea-stub.c - Dummy module for the deprecated IDEA cipher. - * Copyright (C) 2002 Free Software Foundation, Inc. + * Copyright (C) 2002, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -39,20 +39,20 @@ #include #include #ifdef HAVE_DL_DLOPEN - #include +#include #endif -#ifdef __MINGW32__ - #include +#ifdef _WIN32 +#include #endif #include "util.h" #include "algorithms.h" #ifndef RTLD_NOW - #define RTLD_NOW 1 +#define RTLD_NOW 1 #endif -#ifdef __MINGW32__ +#ifdef _WIN32 #define HAVE_DL_DLOPEN #define USE_DYNAMIC_LINKING @@ -101,7 +101,7 @@ dlsym ( void *handle, const char *name ) } return h; } -#endif /*__MINGW32__*/ +#endif /*_WIN32*/ /* We do only support dlopen and the Windows emulation of it. */ #ifndef HAVE_DL_DLOPEN @@ -117,16 +117,16 @@ load_module (const char *name) void *handle; void *sym; -#ifndef __MINGW32__ +#ifndef _WIN32 /* Make sure we are not setuid. */ if (getuid() != geteuid()) log_bug("trying to load an extension while still setuid\n"); #endif handle = dlopen (name, RTLD_NOW); - if (!name) + if (!handle) { - /*log_error ("error loading module `%s': %s\n", name, dlerror());*/ + err=dlerror(); goto failure; } @@ -134,14 +134,12 @@ load_module (const char *name) if (dlerror ()) sym = dlsym (handle, "_idea_get_info"); if ((err=dlerror())) - { - log_info ("invalid module `%s': %s\n", name, err); - goto failure; - } + goto failure; return sym; failure: + log_info ("invalid module `%s': %s\n", name?name:"???", err?err:"???"); if (handle) dlclose (handle); #endif /*USE_DYNAMIC_LINKING*/ @@ -195,4 +193,3 @@ idea_get_info( int algo, size_t *keylen, return rstr; return NULL; } - diff -urpP gnupg-1.2.2/cipher/md.c gnupg-1.2.3/cipher/md.c --- gnupg-1.2.2/cipher/md.c 2003-04-15 10:33:59.000000000 +0000 +++ gnupg-1.2.3/cipher/md.c 2003-05-21 08:42:54.000000000 +0000 @@ -142,6 +142,12 @@ string_to_digest_algo( const char *strin return 0; } +#ifdef USE_TIGER + if(!ascii_strcasecmp("tiger192",string)) + log_info(_("WARNING: digest `%s' is not part of OpenPGP. " + "Use at your own risk!\n"),string); +#endif + do { for(r = digest_list; r; r = r->next ) if( !ascii_strcasecmp( r->name, string ) ) diff -urpP gnupg-1.2.2/cipher/md5.c gnupg-1.2.3/cipher/md5.c --- gnupg-1.2.2/cipher/md5.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/md5.c 2003-06-07 18:55:19.000000000 +0000 @@ -100,7 +100,7 @@ transform( MD5_CONTEXT *ctx, byte *data u32 D = ctx->D; u32 *cwp = correct_words; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST { int i; byte *p2, *p1; for(i=0, p1=data, p2=(byte*)correct_words; i < 16; i++, p2 += 4 ) { @@ -110,9 +110,9 @@ transform( MD5_CONTEXT *ctx, byte *data p2[0] = *p1++; } } - #else +#else memcpy( correct_words, data, 64 ); - #endif +#endif #define OP(a, b, c, d, s, T) \ @@ -311,17 +311,17 @@ md5_final( MD5_CONTEXT *hd ) burn_stack (80+6*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *p++ = hd-> a ; *p++ = hd-> a >> 8; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *p++ = hd-> a ; *p++ = hd-> a >> 8; \ *p++ = hd-> a >> 16; *p++ = hd-> a >> 24; } while(0) - #else /* little endian */ - #define X(a) do { *(u32*)p = hd-> a ; p += 4; } while(0) - #endif +#else /* little endian */ +#define X(a) do { *(u32*)p = hd-> a ; p += 4; } while(0) +#endif X(A); X(B); X(C); X(D); - #undef X +#undef X } @@ -364,4 +364,3 @@ md5_get_info( int algo, size_t *contexts return "MD5"; } - diff -urpP gnupg-1.2.2/cipher/random.c gnupg-1.2.3/cipher/random.c --- gnupg-1.2.2/cipher/random.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/random.c 2003-08-21 16:06:46.000000000 +0000 @@ -1,5 +1,6 @@ /* random.c - random number generator - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -33,22 +34,27 @@ #include #include #include +#ifndef _WIN32 #include +#endif #include #include #include #include -#ifdef HAVE_GETHRTIME - #include +#ifdef HAVE_GETHRTIME +#include #endif #ifdef HAVE_GETTIMEOFDAY - #include +#include +#endif +#ifdef HAVE_TIMES +#include #endif #ifdef HAVE_GETRUSAGE - #include +#include #endif -#ifdef __MINGW32__ - #include +#ifdef _WIN32 +#include #endif #include "util.h" #include "rmd.h" @@ -59,16 +65,16 @@ #include "algorithms.h" #ifndef RAND_MAX /* for SunOS */ - #define RAND_MAX 32767 +#define RAND_MAX 32767 #endif #if SIZEOF_UNSIGNED_LONG == 8 - #define ADD_VALUE 0xa5a5a5a5a5a5a5a5 +#define ADD_VALUE 0xa5a5a5a5a5a5a5a5 #elif SIZEOF_UNSIGNED_LONG == 4 - #define ADD_VALUE 0xa5a5a5a5 +#define ADD_VALUE 0xa5a5a5a5 #else - #error weird size for an unsigned long +#error weird size for an unsigned long #endif #define BLOCKLEN 64 /* hash this amount of bytes */ @@ -81,7 +87,7 @@ #define POOLBLOCKS 30 #define POOLSIZE (POOLBLOCKS*DIGESTLEN) #if (POOLSIZE % SIZEOF_UNSIGNED_LONG) - #error Please make sure that poolsize is a multiple of ulong +#error Please make sure that poolsize is a multiple of ulong #endif #define POOLWORDS (POOLSIZE / SIZEOF_UNSIGNED_LONG) @@ -136,7 +142,7 @@ getfnc_gather_random (void))(void (*)(co return fnc; # ifdef USE_RNDLINUX if ( !access (NAME_OF_DEV_RANDOM, R_OK) - && !access (NAME_OF_DEV_RANDOM, R_OK)) + && !access (NAME_OF_DEV_URANDOM, R_OK)) { fnc = rndlinux_gather_random; return fnc; @@ -312,7 +318,7 @@ mix_pool(byte *pool) rmd160_init( &md ); #if DIGESTLEN != 20 - #error must have a digest length of 20 for ripe-md-160 +#error must have a digest length of 20 for ripe-md-160 #endif /* loop over the pool */ pend = pool + POOLSIZE; @@ -629,41 +635,40 @@ fast_random_poll() } /* fall back to the generic function */ - #if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME) +#if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME) { hrtime_t tv; /* On some Solaris and HPUX system gethrtime raises an SIGILL, but we * checked this with configure */ tv = gethrtime(); add_randomness( &tv, sizeof(tv), 1 ); } - #elif defined (HAVE_GETTIMEOFDAY) +#elif defined (HAVE_GETTIMEOFDAY) { struct timeval tv; if( gettimeofday( &tv, NULL ) ) BUG(); add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 ); } - #elif defined (HAVE_CLOCK_GETTIME) +#elif defined (HAVE_CLOCK_GETTIME) { struct timespec tv; if( clock_gettime( CLOCK_REALTIME, &tv ) == -1 ) BUG(); add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); add_randomness( &tv.tv_nsec, sizeof(tv.tv_nsec), 1 ); } - #else /* use times */ - #ifndef HAVE_DOSISH_SYSTEM +#elif defined (HAVE_TIMES) { struct tms buf; - times( &buf ); + if( times( &buf ) == -1 ) + BUG(); add_randomness( &buf, sizeof buf, 1 ); } - #endif - #endif - #ifdef HAVE_GETRUSAGE - #ifndef RUSAGE_SELF - #ifdef __GCC__ - #warning There is no RUSAGE_SELF on this system - #endif - #else +#endif +#ifdef HAVE_GETRUSAGE +#ifndef RUSAGE_SELF +#ifdef __GCC__ +#warning There is no RUSAGE_SELF on this system +#endif +#else { struct rusage buf; /* QNX/Neutrino does return ENOSYS - so we just ignore it and * add whatever is in buf. In a chroot environment it might not @@ -675,8 +680,8 @@ fast_random_poll() add_randomness( &buf, sizeof buf, 1 ); wipememory( &buf, sizeof buf ); } - #endif - #endif +#endif +#endif /* time and clock are available on all systems - so * we better do it just in case one of the above functions * didn't work */ @@ -725,25 +730,23 @@ gather_faked( void (*add)(const void*, s "it run - it is in no way a strong RNG!\n\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n\n")); initialized=1; - #ifdef HAVE_RAND +#ifdef HAVE_RAND srand(make_timestamp()*getpid()); - #else +#else srandom(make_timestamp()*getpid()); - #endif +#endif } p = buffer = m_alloc( length ); n = length; - #ifdef HAVE_RAND +#ifdef HAVE_RAND while( n-- ) *p++ = ((unsigned)(1 + (int) (256.0*rand()/(RAND_MAX+1.0)))-1); - #else +#else while( n-- ) *p++ = ((unsigned)(1 + (int) (256.0*random()/(RAND_MAX+1.0)))-1); - #endif +#endif add_randomness( buffer, length, requester ); m_free(buffer); return 0; /* okay */ } - - diff -urpP gnupg-1.2.2/cipher/rijndael.c gnupg-1.2.3/cipher/rijndael.c --- gnupg-1.2.2/cipher/rijndael.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/rijndael.c 2003-06-07 18:55:19.000000000 +0000 @@ -1764,7 +1764,7 @@ do_setkey (RIJNDAEL_context *ctx, const for (i = 0; i < keylen; i++) { k[i >> 2][i & 3] = key[i]; } - #define W (ctx->keySched) +#define W (ctx->keySched) for (j = KC-1; j >= 0; j--) { *((u32*)tk[j]) = *((u32*)k[j]); @@ -1819,7 +1819,7 @@ do_setkey (RIJNDAEL_context *ctx, const } } - #undef W +#undef W return 0; } @@ -1844,7 +1844,7 @@ prepare_decryption( RIJNDAEL_context *ct *((u32*)ctx->keySched2[r][2]) = *((u32*)ctx->keySched[r][2]); *((u32*)ctx->keySched2[r][3]) = *((u32*)ctx->keySched[r][3]); } - #define W (ctx->keySched2) +#define W (ctx->keySched2) for (r = 1; r < ctx->ROUNDS; r++) { w = W[r][0]; *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) @@ -1862,7 +1862,7 @@ prepare_decryption( RIJNDAEL_context *ct *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); } - #undef W +#undef W } @@ -1874,7 +1874,7 @@ do_encrypt (const RIJNDAEL_context *ctx, int r; byte temp[4][4]; int ROUNDS = ctx->ROUNDS; - #define rk (ctx->keySched) +#define rk (ctx->keySched) *((u32*)temp[0]) = *((u32*)(a )) ^ *((u32*)rk[0][0]); *((u32*)temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]); @@ -1944,7 +1944,7 @@ do_encrypt (const RIJNDAEL_context *ctx, *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]); *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]); *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]); - #undef rk +#undef rk } static void @@ -1959,7 +1959,7 @@ rijndael_encrypt (const RIJNDAEL_context static void do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a) { - #define rk (ctx->keySched2) +#define rk (ctx->keySched2) int ROUNDS = ctx->ROUNDS; int r; byte temp[4][4]; @@ -2038,7 +2038,7 @@ do_decrypt (RIJNDAEL_context *ctx, byte *((u32*)(b+ 4)) ^= *((u32*)rk[0][1]); *((u32*)(b+ 8)) ^= *((u32*)rk[0][2]); *((u32*)(b+12)) ^= *((u32*)rk[0][3]); - #undef rk +#undef rk } static void @@ -2162,7 +2162,7 @@ rijndael_get_info (int algo, size_t *key #ifdef IS_MODULE static -const char * const gnupgext_version = "RIJNDAEL ($Revision: 1.4.2.1 $)"; +const char * const gnupgext_version = "RIJNDAEL ($Revision: 1.4.2.2 $)"; static struct { int class; @@ -2223,12 +2223,3 @@ gnupgext_enum_func ( int what, int *sequ return ret; } #endif - - - - - - - - - diff -urpP gnupg-1.2.2/cipher/rmd160.c gnupg-1.2.3/cipher/rmd160.c --- gnupg-1.2.2/cipher/rmd160.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/rmd160.c 2003-06-07 18:55:19.000000000 +0000 @@ -175,7 +175,7 @@ static void transform( RMD160_CONTEXT *hd, byte *data ) { u32 a,b,c,d,e,aa,bb,cc,dd,ee,t; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST u32 x[16]; { int i; byte *p2, *p1; @@ -186,10 +186,10 @@ transform( RMD160_CONTEXT *hd, byte *dat p2[0] = *p1++; } } - #else - #if 0 +#else +#if 0 u32 *x =(u32*)data; - #else +#else /* this version is better because it is always aligned; * The performance penalty on a 586-100 is about 6% which * is acceptable - because the data is more local it might @@ -199,8 +199,8 @@ transform( RMD160_CONTEXT *hd, byte *dat * [measured with a 4MB data and "gpgm --print-md rmd160"] */ u32 x[16]; memcpy( x, data, 64 ); - #endif - #endif +#endif +#endif #define K0 0x00000000 @@ -454,13 +454,13 @@ rmd160_mixblock( RMD160_CONTEXT *hd, cha { char *p = buffer; transform( hd, buffer ); - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) X(0); X(1); X(2); X(3); X(4); - #undef X +#undef X } @@ -514,18 +514,18 @@ rmd160_final( RMD160_CONTEXT *hd ) burn_stack (108+5*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \ *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0) - #else /* little endian */ - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #endif +#else /* little endian */ +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#endif X(0); X(1); X(2); X(3); X(4); - #undef X +#undef X } static byte * @@ -585,4 +585,3 @@ rmd160_get_info( int algo, size_t *conte return "RIPEMD160"; } - diff -urpP gnupg-1.2.2/cipher/rndlinux.c gnupg-1.2.3/cipher/rndlinux.c --- gnupg-1.2.2/cipher/rndlinux.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/rndlinux.c 2003-06-07 18:55:19.000000000 +0000 @@ -31,15 +31,15 @@ #include #include #ifdef HAVE_GETTIMEOFDAY - #include +#include #endif #include #include #include #if 0 - #include - #include - #include +#include +#include +#include #endif #include "types.h" #include "util.h" @@ -114,11 +114,11 @@ rndlinux_gather_random( void (*add)(cons fd = fd_urandom; } - #if 0 - #ifdef HAVE_DEV_RANDOM_IOCTL +#if 0 +#ifdef HAVE_DEV_RANDOM_IOCTL g10_log_info("entropy count of %d is %lu\n", fd, get_entropy_count(fd) ); - #endif - #endif +#endif +#endif while( length ) { fd_set rfds; struct timeval tv; diff -urpP gnupg-1.2.2/cipher/rndunix.c gnupg-1.2.3/cipher/rndunix.c --- gnupg-1.2.2/cipher/rndunix.c 2002-10-12 14:50:10.000000000 +0000 +++ gnupg-1.2.3/cipher/rndunix.c 2003-06-07 18:55:19.000000000 +0000 @@ -328,9 +328,9 @@ typedef struct { pid_t waitpid(pid_t pid, int *statptr, int options) { - #ifdef HAVE_WAIT4 +#ifdef HAVE_WAIT4 return wait4(pid, statptr, options, NULL); - #else +#else /* If wait4 is also not available, try wait3 for SVR3 variants */ /* Less ideal because can't actually request a specific pid */ /* For that reason, first check to see if pid is for an */ @@ -346,7 +346,7 @@ waitpid(pid_t pid, int *statptr, int opt (tmp_pid != -1) && (tmp_pid != 0) && (pid != -1)) ; return tmp_pid; - #endif +#endif } #endif @@ -494,11 +494,11 @@ slow_poll(FILE *dbgfp, int dbgall, size_ int moreSources; struct timeval tv; fd_set fds; - #if defined( __hpux ) +#if defined( __hpux ) size_t maxFD = 0; - #else +#else int maxFD = 0; - #endif /* OS-specific brokenness */ +#endif /* OS-specific brokenness */ int bufPos, i, usefulness = 0; @@ -521,9 +521,9 @@ slow_poll(FILE *dbgfp, int dbgall, size_ dataSources[i].pipeFD = fileno(dataSources[i].pipe); if (dataSources[i].pipeFD > maxFD) maxFD = dataSources[i].pipeFD; - #ifdef O_NONBLOCK /* Ohhh what a hack (used for Atari) */ +#ifdef O_NONBLOCK /* Ohhh what a hack (used for Atari) */ fcntl(dataSources[i].pipeFD, F_SETFL, O_NONBLOCK); - #endif +#endif FD_SET(dataSources[i].pipeFD, &fds); dataSources[i].length = 0; @@ -550,11 +550,11 @@ slow_poll(FILE *dbgfp, int dbgall, size_ tv.tv_sec = 10; tv.tv_usec = 0; - #if defined( __hpux ) && ( OS_VERSION == 9 ) +#if defined( __hpux ) && ( OS_VERSION == 9 ) if (select(maxFD + 1, (int *)&fds, NULL, NULL, &tv) == -1) - #else /* */ +#else /* */ if (select(maxFD + 1, &fds, NULL, NULL, &tv) == -1) - #endif /* __hpux */ +#endif /* __hpux */ break; /* One of the sources has data available, read it into the buffer */ @@ -684,27 +684,27 @@ start_gatherer( int pipefd ) * return an error, so the read data won't be added to the randomness * pool. There are two types of SIGC(H)LD naming, the SysV SIGCLD and * the BSD/Posix SIGCHLD, so we need to handle either possibility */ - #ifdef SIGCLD +#ifdef SIGCLD signal(SIGCLD, SIG_DFL); - #else +#else signal(SIGCHLD, SIG_DFL); - #endif +#endif fflush (stderr); /* Arrghh!! It's Stuart code!! */ /* (close all files but the ones we need) */ { int nmax, n1, i; - #ifdef _SC_OPEN_MAX +#ifdef _SC_OPEN_MAX if( (nmax=sysconf( _SC_OPEN_MAX )) < 0 ) { - #ifdef _POSIX_OPEN_MAX +#ifdef _POSIX_OPEN_MAX nmax = _POSIX_OPEN_MAX; - #else +#else nmax = 20; /* assume a reasonable value */ - #endif +#endif } - #else +#else nmax = 20; /* assume a reasonable value */ - #endif +#endif { int fd; if ((fd = open ("/dev/null", O_RDWR)) != -1) { diff -urpP gnupg-1.2.2/cipher/rndw32.c gnupg-1.2.3/cipher/rndw32.c --- gnupg-1.2.2/cipher/rndw32.c 2002-10-21 15:35:26.000000000 +0000 +++ gnupg-1.2.3/cipher/rndw32.c 2003-06-07 18:55:19.000000000 +0000 @@ -433,7 +433,7 @@ slow_gatherer_windowsNT( void (*add)(con CloseHandle (hDevice); } - #if 0 /* we don't need this in GnuPG */ +#if 0 /* we don't need this in GnuPG */ /* Wait for any async keyset driver binding to complete. You may be * wondering what this call is doing here... the reason it's necessary is * because RegQueryValueEx() will hang indefinitely if the async driver @@ -453,7 +453,7 @@ slow_gatherer_windowsNT( void (*add)(con * this, we have to wait until any async driver bind has completed * before we can call RegQueryValueEx() */ waitSemaphore (SEMAPHORE_DRIVERBIND); - #endif +#endif /* Get information from the system performance counters. This can take * a few seconds to do. In some environments the call to @@ -587,7 +587,7 @@ rndw32_gather_random_fast( void (*add)(c * events in input queue, and milliseconds since Windows was started */ { byte buffer[20*sizeof(ulong)], *bufptr; bufptr = buffer; - #define ADD(f) do { ulong along = (ulong)(f); \ +#define ADD(f) do { ulong along = (ulong)(f); \ memcpy (bufptr, &along, sizeof (along) ); \ bufptr += sizeof (along); } while (0) ADD ( GetActiveWindow ()); @@ -611,7 +611,7 @@ rndw32_gather_random_fast( void (*add)(c assert ( bufptr-buffer < sizeof (buffer) ); (*add) ( buffer, bufptr-buffer, requester ); - #undef ADD +#undef ADD } /* Get multiword system information: Current caret position, current @@ -699,5 +699,4 @@ rndw32_gather_random_fast( void (*add)(c return 0; } - #endif /*USE_RNDW32*/ diff -urpP gnupg-1.2.2/cipher/rsa.c gnupg-1.2.3/cipher/rsa.c --- gnupg-1.2.2/cipher/rsa.c 2002-06-29 13:13:47.000000000 +0000 +++ gnupg-1.2.3/cipher/rsa.c 2003-06-07 18:55:19.000000000 +0000 @@ -301,9 +301,9 @@ stronger_key_check ( RSA_secret_key *ske static void secret(MPI output, MPI input, RSA_secret_key *skey ) { - #if 0 +#if 0 mpi_powm( output, input, skey->d, skey->n ); - #else +#else MPI m1 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); MPI m2 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); MPI h = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); @@ -329,7 +329,7 @@ secret(MPI output, MPI input, RSA_secret mpi_free ( h ); mpi_free ( m1 ); mpi_free ( m2 ); - #endif +#endif } @@ -489,6 +489,3 @@ rsa_get_info( int algo, default:*r_usage = 0; return NULL; } } - - - diff -urpP gnupg-1.2.2/cipher/sha1.c gnupg-1.2.3/cipher/sha1.c --- gnupg-1.2.2/cipher/sha1.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/sha1.c 2003-06-07 18:55:19.000000000 +0000 @@ -90,9 +90,9 @@ transform( SHA1_CONTEXT *hd, byte *data d = hd->h3; e = hd->h4; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST memcpy( x, data, 64 ); - #else +#else { int i; byte *p2; for(i=0, p2=(byte*)x; i < 16; i++, p2 += 4 ) { @@ -102,7 +102,7 @@ transform( SHA1_CONTEXT *hd, byte *data p2[0] = *data++; } } - #endif +#endif #define K1 0x5A827999L @@ -304,19 +304,18 @@ sha1_final(SHA1_CONTEXT *hd) burn_stack (88+4*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); X(3); X(4); - #undef X - +#undef X } static byte * diff -urpP gnupg-1.2.2/cipher/sha256.c gnupg-1.2.3/cipher/sha256.c --- gnupg-1.2.2/cipher/sha256.c 2003-02-04 18:50:44.000000000 +0000 +++ gnupg-1.2.3/cipher/sha256.c 2003-06-07 18:55:19.000000000 +0000 @@ -256,12 +256,12 @@ sha256_final(SHA256_CONTEXT *hd) burn_stack (328); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); @@ -270,8 +270,7 @@ sha256_final(SHA256_CONTEXT *hd) X(5); X(6); X(7); - #undef X - +#undef X } static byte * diff -urpP gnupg-1.2.2/cipher/sha512.c gnupg-1.2.3/cipher/sha512.c --- gnupg-1.2.2/cipher/sha512.c 2003-02-04 18:50:44.000000000 +0000 +++ gnupg-1.2.3/cipher/sha512.c 2003-06-07 18:55:19.000000000 +0000 @@ -65,42 +65,42 @@ typedef struct { static void burn_stack (int bytes) { - char buf[128]; + char buf[128]; - wipememory(buf,sizeof buf); - bytes -= sizeof buf; - if (bytes > 0) - burn_stack (bytes); + wipememory(buf,sizeof buf); + bytes -= sizeof buf; + if (bytes > 0) + burn_stack (bytes); } void sha512_init( SHA512_CONTEXT *hd ) { - hd->h0 = 0x6a09e667f3bcc908; - hd->h1 = 0xbb67ae8584caa73b; - hd->h2 = 0x3c6ef372fe94f82b; - hd->h3 = 0xa54ff53a5f1d36f1; - hd->h4 = 0x510e527fade682d1; - hd->h5 = 0x9b05688c2b3e6c1f; - hd->h6 = 0x1f83d9abfb41bd6b; - hd->h7 = 0x5be0cd19137e2179; + hd->h0 = U64_C(0x6a09e667f3bcc908); + hd->h1 = U64_C(0xbb67ae8584caa73b); + hd->h2 = U64_C(0x3c6ef372fe94f82b); + hd->h3 = U64_C(0xa54ff53a5f1d36f1); + hd->h4 = U64_C(0x510e527fade682d1); + hd->h5 = U64_C(0x9b05688c2b3e6c1f); + hd->h6 = U64_C(0x1f83d9abfb41bd6b); + hd->h7 = U64_C(0x5be0cd19137e2179); - hd->nblocks = 0; - hd->count = 0; + hd->nblocks = 0; + hd->count = 0; } void sha384_init( SHA512_CONTEXT *hd ) { - hd->h0 = 0xcbbb9d5dc1059ed8; - hd->h1 = 0x629a292a367cd507; - hd->h2 = 0x9159015a3070dd17; - hd->h3 = 0x152fecd8f70e5939; - hd->h4 = 0x67332667ffc00b31; - hd->h5 = 0x8eb44a8768581511; - hd->h6 = 0xdb0c2e0d64f98fa7; - hd->h7 = 0x47b5481dbefa4fa4; + hd->h0 = U64_C(0xcbbb9d5dc1059ed8); + hd->h1 = U64_C(0x629a292a367cd507); + hd->h2 = U64_C(0x9159015a3070dd17); + hd->h3 = U64_C(0x152fecd8f70e5939); + hd->h4 = U64_C(0x67332667ffc00b31); + hd->h5 = U64_C(0x8eb44a8768581511); + hd->h6 = U64_C(0xdb0c2e0d64f98fa7); + hd->h7 = U64_C(0x47b5481dbefa4fa4); hd->nblocks = 0; hd->count = 0; @@ -118,33 +118,46 @@ transform( SHA512_CONTEXT *hd, byte *dat int t; static const u64 k[]= { - 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, - 0xe9b5dba58189dbbc, 0x3956c25bf348b538, 0x59f111f1b605d019, - 0x923f82a4af194f9b, 0xab1c5ed5da6d8118, 0xd807aa98a3030242, - 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, - 0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, - 0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3, - 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, 0x2de92c6f592b0275, - 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5, - 0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, - 0xbf597fc7beef0ee4, 0xc6e00bf33da88fc2, 0xd5a79147930aa725, - 0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc, - 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df, - 0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, - 0x92722c851482353b, 0xa2bfe8a14cf10364, 0xa81a664bbc423001, - 0xc24b8b70d0f89791, 0xc76c51a30654be30, 0xd192e819d6ef5218, - 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8, - 0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, - 0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, - 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc, - 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec, - 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, - 0xc67178f2e372532b, 0xca273eceea26619c, 0xd186b8c721c0c207, - 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x06f067aa72176fba, - 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b, - 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, - 0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, - 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 + U64_C(0x428a2f98d728ae22), U64_C(0x7137449123ef65cd), + U64_C(0xb5c0fbcfec4d3b2f), U64_C(0xe9b5dba58189dbbc), + U64_C(0x3956c25bf348b538), U64_C(0x59f111f1b605d019), + U64_C(0x923f82a4af194f9b), U64_C(0xab1c5ed5da6d8118), + U64_C(0xd807aa98a3030242), U64_C(0x12835b0145706fbe), + U64_C(0x243185be4ee4b28c), U64_C(0x550c7dc3d5ffb4e2), + U64_C(0x72be5d74f27b896f), U64_C(0x80deb1fe3b1696b1), + U64_C(0x9bdc06a725c71235), U64_C(0xc19bf174cf692694), + U64_C(0xe49b69c19ef14ad2), U64_C(0xefbe4786384f25e3), + U64_C(0x0fc19dc68b8cd5b5), U64_C(0x240ca1cc77ac9c65), + U64_C(0x2de92c6f592b0275), U64_C(0x4a7484aa6ea6e483), + U64_C(0x5cb0a9dcbd41fbd4), U64_C(0x76f988da831153b5), + U64_C(0x983e5152ee66dfab), U64_C(0xa831c66d2db43210), + U64_C(0xb00327c898fb213f), U64_C(0xbf597fc7beef0ee4), + U64_C(0xc6e00bf33da88fc2), U64_C(0xd5a79147930aa725), + U64_C(0x06ca6351e003826f), U64_C(0x142929670a0e6e70), + U64_C(0x27b70a8546d22ffc), U64_C(0x2e1b21385c26c926), + U64_C(0x4d2c6dfc5ac42aed), U64_C(0x53380d139d95b3df), + U64_C(0x650a73548baf63de), U64_C(0x766a0abb3c77b2a8), + U64_C(0x81c2c92e47edaee6), U64_C(0x92722c851482353b), + U64_C(0xa2bfe8a14cf10364), U64_C(0xa81a664bbc423001), + U64_C(0xc24b8b70d0f89791), U64_C(0xc76c51a30654be30), + U64_C(0xd192e819d6ef5218), U64_C(0xd69906245565a910), + U64_C(0xf40e35855771202a), U64_C(0x106aa07032bbd1b8), + U64_C(0x19a4c116b8d2d0c8), U64_C(0x1e376c085141ab53), + U64_C(0x2748774cdf8eeb99), U64_C(0x34b0bcb5e19b48a8), + U64_C(0x391c0cb3c5c95a63), U64_C(0x4ed8aa4ae3418acb), + U64_C(0x5b9cca4f7763e373), U64_C(0x682e6ff3d6b2b8a3), + U64_C(0x748f82ee5defb2fc), U64_C(0x78a5636f43172f60), + U64_C(0x84c87814a1f0ab72), U64_C(0x8cc702081a6439ec), + U64_C(0x90befffa23631e28), U64_C(0xa4506cebde82bde9), + U64_C(0xbef9a3f7b2c67915), U64_C(0xc67178f2e372532b), + U64_C(0xca273eceea26619c), U64_C(0xd186b8c721c0c207), + U64_C(0xeada7dd6cde0eb1e), U64_C(0xf57d4f7fee6ed178), + U64_C(0x06f067aa72176fba), U64_C(0x0a637dc5a2c898a6), + U64_C(0x113f9804bef90dae), U64_C(0x1b710b35131c471b), + U64_C(0x28db77f523047d84), U64_C(0x32caab7b40c72493), + U64_C(0x3c9ebe0a15c9bebc), U64_C(0x431d67c49c100d4c), + U64_C(0x4cc5d4becb3e42b6), U64_C(0x597f299cfc657e2a), + U64_C(0x5fcb6fab3ad6faec), U64_C(0x6c44198c4a475817) }; /* get values from the chaining vars */ @@ -318,14 +331,14 @@ sha512_final(SHA512_CONTEXT *hd) burn_stack (768); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u64*)p = hd->h##a ; p += 8; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 56; *p++ = hd->h##a >> 48; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u64*)p = hd->h##a ; p += 8; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 56; *p++ = hd->h##a >> 48; \ *p++ = hd->h##a >> 40; *p++ = hd->h##a >> 32; \ *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); @@ -336,13 +349,13 @@ sha512_final(SHA512_CONTEXT *hd) We just ignore them. */ X(6); X(7); - #undef X +#undef X } static byte * sha512_read( SHA512_CONTEXT *hd ) { - return hd->buf; + return hd->buf; } /**************** diff -urpP gnupg-1.2.2/cipher/tiger.c gnupg-1.2.3/cipher/tiger.c --- gnupg-1.2.2/cipher/tiger.c 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/cipher/tiger.c 2003-06-07 18:55:19.000000000 +0000 @@ -27,8 +27,6 @@ #include "memory.h" #include "algorithms.h" -#ifdef HAVE_U64_TYPEDEF - /* we really need it here, but as this is only experiment we * can live without Tiger */ @@ -68,524 +66,524 @@ typedef struct { static u64 sbox1[256] = { - 0x02aab17cf7e90c5eLL /* 0 */, 0xac424b03e243a8ecLL /* 1 */, - 0x72cd5be30dd5fcd3LL /* 2 */, 0x6d019b93f6f97f3aLL /* 3 */, - 0xcd9978ffd21f9193LL /* 4 */, 0x7573a1c9708029e2LL /* 5 */, - 0xb164326b922a83c3LL /* 6 */, 0x46883eee04915870LL /* 7 */, - 0xeaace3057103ece6LL /* 8 */, 0xc54169b808a3535cLL /* 9 */, - 0x4ce754918ddec47cLL /* 10 */, 0x0aa2f4dfdc0df40cLL /* 11 */, - 0x10b76f18a74dbefaLL /* 12 */, 0xc6ccb6235ad1ab6aLL /* 13 */, - 0x13726121572fe2ffLL /* 14 */, 0x1a488c6f199d921eLL /* 15 */, - 0x4bc9f9f4da0007caLL /* 16 */, 0x26f5e6f6e85241c7LL /* 17 */, - 0x859079dbea5947b6LL /* 18 */, 0x4f1885c5c99e8c92LL /* 19 */, - 0xd78e761ea96f864bLL /* 20 */, 0x8e36428c52b5c17dLL /* 21 */, - 0x69cf6827373063c1LL /* 22 */, 0xb607c93d9bb4c56eLL /* 23 */, - 0x7d820e760e76b5eaLL /* 24 */, 0x645c9cc6f07fdc42LL /* 25 */, - 0xbf38a078243342e0LL /* 26 */, 0x5f6b343c9d2e7d04LL /* 27 */, - 0xf2c28aeb600b0ec6LL /* 28 */, 0x6c0ed85f7254bcacLL /* 29 */, - 0x71592281a4db4fe5LL /* 30 */, 0x1967fa69ce0fed9fLL /* 31 */, - 0xfd5293f8b96545dbLL /* 32 */, 0xc879e9d7f2a7600bLL /* 33 */, - 0x860248920193194eLL /* 34 */, 0xa4f9533b2d9cc0b3LL /* 35 */, - 0x9053836c15957613LL /* 36 */, 0xdb6dcf8afc357bf1LL /* 37 */, - 0x18beea7a7a370f57LL /* 38 */, 0x037117ca50b99066LL /* 39 */, - 0x6ab30a9774424a35LL /* 40 */, 0xf4e92f02e325249bLL /* 41 */, - 0x7739db07061ccae1LL /* 42 */, 0xd8f3b49ceca42a05LL /* 43 */, - 0xbd56be3f51382f73LL /* 44 */, 0x45faed5843b0bb28LL /* 45 */, - 0x1c813d5c11bf1f83LL /* 46 */, 0x8af0e4b6d75fa169LL /* 47 */, - 0x33ee18a487ad9999LL /* 48 */, 0x3c26e8eab1c94410LL /* 49 */, - 0xb510102bc0a822f9LL /* 50 */, 0x141eef310ce6123bLL /* 51 */, - 0xfc65b90059ddb154LL /* 52 */, 0xe0158640c5e0e607LL /* 53 */, - 0x884e079826c3a3cfLL /* 54 */, 0x930d0d9523c535fdLL /* 55 */, - 0x35638d754e9a2b00LL /* 56 */, 0x4085fccf40469dd5LL /* 57 */, - 0xc4b17ad28be23a4cLL /* 58 */, 0xcab2f0fc6a3e6a2eLL /* 59 */, - 0x2860971a6b943fcdLL /* 60 */, 0x3dde6ee212e30446LL /* 61 */, - 0x6222f32ae01765aeLL /* 62 */, 0x5d550bb5478308feLL /* 63 */, - 0xa9efa98da0eda22aLL /* 64 */, 0xc351a71686c40da7LL /* 65 */, - 0x1105586d9c867c84LL /* 66 */, 0xdcffee85fda22853LL /* 67 */, - 0xccfbd0262c5eef76LL /* 68 */, 0xbaf294cb8990d201LL /* 69 */, - 0xe69464f52afad975LL /* 70 */, 0x94b013afdf133e14LL /* 71 */, - 0x06a7d1a32823c958LL /* 72 */, 0x6f95fe5130f61119LL /* 73 */, - 0xd92ab34e462c06c0LL /* 74 */, 0xed7bde33887c71d2LL /* 75 */, - 0x79746d6e6518393eLL /* 76 */, 0x5ba419385d713329LL /* 77 */, - 0x7c1ba6b948a97564LL /* 78 */, 0x31987c197bfdac67LL /* 79 */, - 0xde6c23c44b053d02LL /* 80 */, 0x581c49fed002d64dLL /* 81 */, - 0xdd474d6338261571LL /* 82 */, 0xaa4546c3e473d062LL /* 83 */, - 0x928fce349455f860LL /* 84 */, 0x48161bbacaab94d9LL /* 85 */, - 0x63912430770e6f68LL /* 86 */, 0x6ec8a5e602c6641cLL /* 87 */, - 0x87282515337ddd2bLL /* 88 */, 0x2cda6b42034b701bLL /* 89 */, - 0xb03d37c181cb096dLL /* 90 */, 0xe108438266c71c6fLL /* 91 */, - 0x2b3180c7eb51b255LL /* 92 */, 0xdf92b82f96c08bbcLL /* 93 */, - 0x5c68c8c0a632f3baLL /* 94 */, 0x5504cc861c3d0556LL /* 95 */, - 0xabbfa4e55fb26b8fLL /* 96 */, 0x41848b0ab3baceb4LL /* 97 */, - 0xb334a273aa445d32LL /* 98 */, 0xbca696f0a85ad881LL /* 99 */, - 0x24f6ec65b528d56cLL /* 100 */, 0x0ce1512e90f4524aLL /* 101 */, - 0x4e9dd79d5506d35aLL /* 102 */, 0x258905fac6ce9779LL /* 103 */, - 0x2019295b3e109b33LL /* 104 */, 0xf8a9478b73a054ccLL /* 105 */, - 0x2924f2f934417eb0LL /* 106 */, 0x3993357d536d1bc4LL /* 107 */, - 0x38a81ac21db6ff8bLL /* 108 */, 0x47c4fbf17d6016bfLL /* 109 */, - 0x1e0faadd7667e3f5LL /* 110 */, 0x7abcff62938beb96LL /* 111 */, - 0xa78dad948fc179c9LL /* 112 */, 0x8f1f98b72911e50dLL /* 113 */, - 0x61e48eae27121a91LL /* 114 */, 0x4d62f7ad31859808LL /* 115 */, - 0xeceba345ef5ceaebLL /* 116 */, 0xf5ceb25ebc9684ceLL /* 117 */, - 0xf633e20cb7f76221LL /* 118 */, 0xa32cdf06ab8293e4LL /* 119 */, - 0x985a202ca5ee2ca4LL /* 120 */, 0xcf0b8447cc8a8fb1LL /* 121 */, - 0x9f765244979859a3LL /* 122 */, 0xa8d516b1a1240017LL /* 123 */, - 0x0bd7ba3ebb5dc726LL /* 124 */, 0xe54bca55b86adb39LL /* 125 */, - 0x1d7a3afd6c478063LL /* 126 */, 0x519ec608e7669eddLL /* 127 */, - 0x0e5715a2d149aa23LL /* 128 */, 0x177d4571848ff194LL /* 129 */, - 0xeeb55f3241014c22LL /* 130 */, 0x0f5e5ca13a6e2ec2LL /* 131 */, - 0x8029927b75f5c361LL /* 132 */, 0xad139fabc3d6e436LL /* 133 */, - 0x0d5df1a94ccf402fLL /* 134 */, 0x3e8bd948bea5dfc8LL /* 135 */, - 0xa5a0d357bd3ff77eLL /* 136 */, 0xa2d12e251f74f645LL /* 137 */, - 0x66fd9e525e81a082LL /* 138 */, 0x2e0c90ce7f687a49LL /* 139 */, - 0xc2e8bcbeba973bc5LL /* 140 */, 0x000001bce509745fLL /* 141 */, - 0x423777bbe6dab3d6LL /* 142 */, 0xd1661c7eaef06eb5LL /* 143 */, - 0xa1781f354daacfd8LL /* 144 */, 0x2d11284a2b16affcLL /* 145 */, - 0xf1fc4f67fa891d1fLL /* 146 */, 0x73ecc25dcb920adaLL /* 147 */, - 0xae610c22c2a12651LL /* 148 */, 0x96e0a810d356b78aLL /* 149 */, - 0x5a9a381f2fe7870fLL /* 150 */, 0xd5ad62ede94e5530LL /* 151 */, - 0xd225e5e8368d1427LL /* 152 */, 0x65977b70c7af4631LL /* 153 */, - 0x99f889b2de39d74fLL /* 154 */, 0x233f30bf54e1d143LL /* 155 */, - 0x9a9675d3d9a63c97LL /* 156 */, 0x5470554ff334f9a8LL /* 157 */, - 0x166acb744a4f5688LL /* 158 */, 0x70c74caab2e4aeadLL /* 159 */, - 0xf0d091646f294d12LL /* 160 */, 0x57b82a89684031d1LL /* 161 */, - 0xefd95a5a61be0b6bLL /* 162 */, 0x2fbd12e969f2f29aLL /* 163 */, - 0x9bd37013feff9fe8LL /* 164 */, 0x3f9b0404d6085a06LL /* 165 */, - 0x4940c1f3166cfe15LL /* 166 */, 0x09542c4dcdf3defbLL /* 167 */, - 0xb4c5218385cd5ce3LL /* 168 */, 0xc935b7dc4462a641LL /* 169 */, - 0x3417f8a68ed3b63fLL /* 170 */, 0xb80959295b215b40LL /* 171 */, - 0xf99cdaef3b8c8572LL /* 172 */, 0x018c0614f8fcb95dLL /* 173 */, - 0x1b14accd1a3acdf3LL /* 174 */, 0x84d471f200bb732dLL /* 175 */, - 0xc1a3110e95e8da16LL /* 176 */, 0x430a7220bf1a82b8LL /* 177 */, - 0xb77e090d39df210eLL /* 178 */, 0x5ef4bd9f3cd05e9dLL /* 179 */, - 0x9d4ff6da7e57a444LL /* 180 */, 0xda1d60e183d4a5f8LL /* 181 */, - 0xb287c38417998e47LL /* 182 */, 0xfe3edc121bb31886LL /* 183 */, - 0xc7fe3ccc980ccbefLL /* 184 */, 0xe46fb590189bfd03LL /* 185 */, - 0x3732fd469a4c57dcLL /* 186 */, 0x7ef700a07cf1ad65LL /* 187 */, - 0x59c64468a31d8859LL /* 188 */, 0x762fb0b4d45b61f6LL /* 189 */, - 0x155baed099047718LL /* 190 */, 0x68755e4c3d50baa6LL /* 191 */, - 0xe9214e7f22d8b4dfLL /* 192 */, 0x2addbf532eac95f4LL /* 193 */, - 0x32ae3909b4bd0109LL /* 194 */, 0x834df537b08e3450LL /* 195 */, - 0xfa209da84220728dLL /* 196 */, 0x9e691d9b9efe23f7LL /* 197 */, - 0x0446d288c4ae8d7fLL /* 198 */, 0x7b4cc524e169785bLL /* 199 */, - 0x21d87f0135ca1385LL /* 200 */, 0xcebb400f137b8aa5LL /* 201 */, - 0x272e2b66580796beLL /* 202 */, 0x3612264125c2b0deLL /* 203 */, - 0x057702bdad1efbb2LL /* 204 */, 0xd4babb8eacf84be9LL /* 205 */, - 0x91583139641bc67bLL /* 206 */, 0x8bdc2de08036e024LL /* 207 */, - 0x603c8156f49f68edLL /* 208 */, 0xf7d236f7dbef5111LL /* 209 */, - 0x9727c4598ad21e80LL /* 210 */, 0xa08a0896670a5fd7LL /* 211 */, - 0xcb4a8f4309eba9cbLL /* 212 */, 0x81af564b0f7036a1LL /* 213 */, - 0xc0b99aa778199abdLL /* 214 */, 0x959f1ec83fc8e952LL /* 215 */, - 0x8c505077794a81b9LL /* 216 */, 0x3acaaf8f056338f0LL /* 217 */, - 0x07b43f50627a6778LL /* 218 */, 0x4a44ab49f5eccc77LL /* 219 */, - 0x3bc3d6e4b679ee98LL /* 220 */, 0x9cc0d4d1cf14108cLL /* 221 */, - 0x4406c00b206bc8a0LL /* 222 */, 0x82a18854c8d72d89LL /* 223 */, - 0x67e366b35c3c432cLL /* 224 */, 0xb923dd61102b37f2LL /* 225 */, - 0x56ab2779d884271dLL /* 226 */, 0xbe83e1b0ff1525afLL /* 227 */, - 0xfb7c65d4217e49a9LL /* 228 */, 0x6bdbe0e76d48e7d4LL /* 229 */, - 0x08df828745d9179eLL /* 230 */, 0x22ea6a9add53bd34LL /* 231 */, - 0xe36e141c5622200aLL /* 232 */, 0x7f805d1b8cb750eeLL /* 233 */, - 0xafe5c7a59f58e837LL /* 234 */, 0xe27f996a4fb1c23cLL /* 235 */, - 0xd3867dfb0775f0d0LL /* 236 */, 0xd0e673de6e88891aLL /* 237 */, - 0x123aeb9eafb86c25LL /* 238 */, 0x30f1d5d5c145b895LL /* 239 */, - 0xbb434a2dee7269e7LL /* 240 */, 0x78cb67ecf931fa38LL /* 241 */, - 0xf33b0372323bbf9cLL /* 242 */, 0x52d66336fb279c74LL /* 243 */, - 0x505f33ac0afb4eaaLL /* 244 */, 0xe8a5cd99a2cce187LL /* 245 */, - 0x534974801e2d30bbLL /* 246 */, 0x8d2d5711d5876d90LL /* 247 */, - 0x1f1a412891bc038eLL /* 248 */, 0xd6e2e71d82e56648LL /* 249 */, - 0x74036c3a497732b7LL /* 250 */, 0x89b67ed96361f5abLL /* 251 */, - 0xffed95d8f1ea02a2LL /* 252 */, 0xe72b3bd61464d43dLL /* 253 */, - 0xa6300f170bdc4820LL /* 254 */, 0xebc18760ed78a77aLL /* 255 */ + U64_C(0x02aab17cf7e90c5e) /* 0 */, U64_C(0xac424b03e243a8ec) /* 1 */, + U64_C(0x72cd5be30dd5fcd3) /* 2 */, U64_C(0x6d019b93f6f97f3a) /* 3 */, + U64_C(0xcd9978ffd21f9193) /* 4 */, U64_C(0x7573a1c9708029e2) /* 5 */, + U64_C(0xb164326b922a83c3) /* 6 */, U64_C(0x46883eee04915870) /* 7 */, + U64_C(0xeaace3057103ece6) /* 8 */, U64_C(0xc54169b808a3535c) /* 9 */, + U64_C(0x4ce754918ddec47c) /* 10 */, U64_C(0x0aa2f4dfdc0df40c) /* 11 */, + U64_C(0x10b76f18a74dbefa) /* 12 */, U64_C(0xc6ccb6235ad1ab6a) /* 13 */, + U64_C(0x13726121572fe2ff) /* 14 */, U64_C(0x1a488c6f199d921e) /* 15 */, + U64_C(0x4bc9f9f4da0007ca) /* 16 */, U64_C(0x26f5e6f6e85241c7) /* 17 */, + U64_C(0x859079dbea5947b6) /* 18 */, U64_C(0x4f1885c5c99e8c92) /* 19 */, + U64_C(0xd78e761ea96f864b) /* 20 */, U64_C(0x8e36428c52b5c17d) /* 21 */, + U64_C(0x69cf6827373063c1) /* 22 */, U64_C(0xb607c93d9bb4c56e) /* 23 */, + U64_C(0x7d820e760e76b5ea) /* 24 */, U64_C(0x645c9cc6f07fdc42) /* 25 */, + U64_C(0xbf38a078243342e0) /* 26 */, U64_C(0x5f6b343c9d2e7d04) /* 27 */, + U64_C(0xf2c28aeb600b0ec6) /* 28 */, U64_C(0x6c0ed85f7254bcac) /* 29 */, + U64_C(0x71592281a4db4fe5) /* 30 */, U64_C(0x1967fa69ce0fed9f) /* 31 */, + U64_C(0xfd5293f8b96545db) /* 32 */, U64_C(0xc879e9d7f2a7600b) /* 33 */, + U64_C(0x860248920193194e) /* 34 */, U64_C(0xa4f9533b2d9cc0b3) /* 35 */, + U64_C(0x9053836c15957613) /* 36 */, U64_C(0xdb6dcf8afc357bf1) /* 37 */, + U64_C(0x18beea7a7a370f57) /* 38 */, U64_C(0x037117ca50b99066) /* 39 */, + U64_C(0x6ab30a9774424a35) /* 40 */, U64_C(0xf4e92f02e325249b) /* 41 */, + U64_C(0x7739db07061ccae1) /* 42 */, U64_C(0xd8f3b49ceca42a05) /* 43 */, + U64_C(0xbd56be3f51382f73) /* 44 */, U64_C(0x45faed5843b0bb28) /* 45 */, + U64_C(0x1c813d5c11bf1f83) /* 46 */, U64_C(0x8af0e4b6d75fa169) /* 47 */, + U64_C(0x33ee18a487ad9999) /* 48 */, U64_C(0x3c26e8eab1c94410) /* 49 */, + U64_C(0xb510102bc0a822f9) /* 50 */, U64_C(0x141eef310ce6123b) /* 51 */, + U64_C(0xfc65b90059ddb154) /* 52 */, U64_C(0xe0158640c5e0e607) /* 53 */, + U64_C(0x884e079826c3a3cf) /* 54 */, U64_C(0x930d0d9523c535fd) /* 55 */, + U64_C(0x35638d754e9a2b00) /* 56 */, U64_C(0x4085fccf40469dd5) /* 57 */, + U64_C(0xc4b17ad28be23a4c) /* 58 */, U64_C(0xcab2f0fc6a3e6a2e) /* 59 */, + U64_C(0x2860971a6b943fcd) /* 60 */, U64_C(0x3dde6ee212e30446) /* 61 */, + U64_C(0x6222f32ae01765ae) /* 62 */, U64_C(0x5d550bb5478308fe) /* 63 */, + U64_C(0xa9efa98da0eda22a) /* 64 */, U64_C(0xc351a71686c40da7) /* 65 */, + U64_C(0x1105586d9c867c84) /* 66 */, U64_C(0xdcffee85fda22853) /* 67 */, + U64_C(0xccfbd0262c5eef76) /* 68 */, U64_C(0xbaf294cb8990d201) /* 69 */, + U64_C(0xe69464f52afad975) /* 70 */, U64_C(0x94b013afdf133e14) /* 71 */, + U64_C(0x06a7d1a32823c958) /* 72 */, U64_C(0x6f95fe5130f61119) /* 73 */, + U64_C(0xd92ab34e462c06c0) /* 74 */, U64_C(0xed7bde33887c71d2) /* 75 */, + U64_C(0x79746d6e6518393e) /* 76 */, U64_C(0x5ba419385d713329) /* 77 */, + U64_C(0x7c1ba6b948a97564) /* 78 */, U64_C(0x31987c197bfdac67) /* 79 */, + U64_C(0xde6c23c44b053d02) /* 80 */, U64_C(0x581c49fed002d64d) /* 81 */, + U64_C(0xdd474d6338261571) /* 82 */, U64_C(0xaa4546c3e473d062) /* 83 */, + U64_C(0x928fce349455f860) /* 84 */, U64_C(0x48161bbacaab94d9) /* 85 */, + U64_C(0x63912430770e6f68) /* 86 */, U64_C(0x6ec8a5e602c6641c) /* 87 */, + U64_C(0x87282515337ddd2b) /* 88 */, U64_C(0x2cda6b42034b701b) /* 89 */, + U64_C(0xb03d37c181cb096d) /* 90 */, U64_C(0xe108438266c71c6f) /* 91 */, + U64_C(0x2b3180c7eb51b255) /* 92 */, U64_C(0xdf92b82f96c08bbc) /* 93 */, + U64_C(0x5c68c8c0a632f3ba) /* 94 */, U64_C(0x5504cc861c3d0556) /* 95 */, + U64_C(0xabbfa4e55fb26b8f) /* 96 */, U64_C(0x41848b0ab3baceb4) /* 97 */, + U64_C(0xb334a273aa445d32) /* 98 */, U64_C(0xbca696f0a85ad881) /* 99 */, + U64_C(0x24f6ec65b528d56c) /* 100 */, U64_C(0x0ce1512e90f4524a) /* 101 */, + U64_C(0x4e9dd79d5506d35a) /* 102 */, U64_C(0x258905fac6ce9779) /* 103 */, + U64_C(0x2019295b3e109b33) /* 104 */, U64_C(0xf8a9478b73a054cc) /* 105 */, + U64_C(0x2924f2f934417eb0) /* 106 */, U64_C(0x3993357d536d1bc4) /* 107 */, + U64_C(0x38a81ac21db6ff8b) /* 108 */, U64_C(0x47c4fbf17d6016bf) /* 109 */, + U64_C(0x1e0faadd7667e3f5) /* 110 */, U64_C(0x7abcff62938beb96) /* 111 */, + U64_C(0xa78dad948fc179c9) /* 112 */, U64_C(0x8f1f98b72911e50d) /* 113 */, + U64_C(0x61e48eae27121a91) /* 114 */, U64_C(0x4d62f7ad31859808) /* 115 */, + U64_C(0xeceba345ef5ceaeb) /* 116 */, U64_C(0xf5ceb25ebc9684ce) /* 117 */, + U64_C(0xf633e20cb7f76221) /* 118 */, U64_C(0xa32cdf06ab8293e4) /* 119 */, + U64_C(0x985a202ca5ee2ca4) /* 120 */, U64_C(0xcf0b8447cc8a8fb1) /* 121 */, + U64_C(0x9f765244979859a3) /* 122 */, U64_C(0xa8d516b1a1240017) /* 123 */, + U64_C(0x0bd7ba3ebb5dc726) /* 124 */, U64_C(0xe54bca55b86adb39) /* 125 */, + U64_C(0x1d7a3afd6c478063) /* 126 */, U64_C(0x519ec608e7669edd) /* 127 */, + U64_C(0x0e5715a2d149aa23) /* 128 */, U64_C(0x177d4571848ff194) /* 129 */, + U64_C(0xeeb55f3241014c22) /* 130 */, U64_C(0x0f5e5ca13a6e2ec2) /* 131 */, + U64_C(0x8029927b75f5c361) /* 132 */, U64_C(0xad139fabc3d6e436) /* 133 */, + U64_C(0x0d5df1a94ccf402f) /* 134 */, U64_C(0x3e8bd948bea5dfc8) /* 135 */, + U64_C(0xa5a0d357bd3ff77e) /* 136 */, U64_C(0xa2d12e251f74f645) /* 137 */, + U64_C(0x66fd9e525e81a082) /* 138 */, U64_C(0x2e0c90ce7f687a49) /* 139 */, + U64_C(0xc2e8bcbeba973bc5) /* 140 */, U64_C(0x000001bce509745f) /* 141 */, + U64_C(0x423777bbe6dab3d6) /* 142 */, U64_C(0xd1661c7eaef06eb5) /* 143 */, + U64_C(0xa1781f354daacfd8) /* 144 */, U64_C(0x2d11284a2b16affc) /* 145 */, + U64_C(0xf1fc4f67fa891d1f) /* 146 */, U64_C(0x73ecc25dcb920ada) /* 147 */, + U64_C(0xae610c22c2a12651) /* 148 */, U64_C(0x96e0a810d356b78a) /* 149 */, + U64_C(0x5a9a381f2fe7870f) /* 150 */, U64_C(0xd5ad62ede94e5530) /* 151 */, + U64_C(0xd225e5e8368d1427) /* 152 */, U64_C(0x65977b70c7af4631) /* 153 */, + U64_C(0x99f889b2de39d74f) /* 154 */, U64_C(0x233f30bf54e1d143) /* 155 */, + U64_C(0x9a9675d3d9a63c97) /* 156 */, U64_C(0x5470554ff334f9a8) /* 157 */, + U64_C(0x166acb744a4f5688) /* 158 */, U64_C(0x70c74caab2e4aead) /* 159 */, + U64_C(0xf0d091646f294d12) /* 160 */, U64_C(0x57b82a89684031d1) /* 161 */, + U64_C(0xefd95a5a61be0b6b) /* 162 */, U64_C(0x2fbd12e969f2f29a) /* 163 */, + U64_C(0x9bd37013feff9fe8) /* 164 */, U64_C(0x3f9b0404d6085a06) /* 165 */, + U64_C(0x4940c1f3166cfe15) /* 166 */, U64_C(0x09542c4dcdf3defb) /* 167 */, + U64_C(0xb4c5218385cd5ce3) /* 168 */, U64_C(0xc935b7dc4462a641) /* 169 */, + U64_C(0x3417f8a68ed3b63f) /* 170 */, U64_C(0xb80959295b215b40) /* 171 */, + U64_C(0xf99cdaef3b8c8572) /* 172 */, U64_C(0x018c0614f8fcb95d) /* 173 */, + U64_C(0x1b14accd1a3acdf3) /* 174 */, U64_C(0x84d471f200bb732d) /* 175 */, + U64_C(0xc1a3110e95e8da16) /* 176 */, U64_C(0x430a7220bf1a82b8) /* 177 */, + U64_C(0xb77e090d39df210e) /* 178 */, U64_C(0x5ef4bd9f3cd05e9d) /* 179 */, + U64_C(0x9d4ff6da7e57a444) /* 180 */, U64_C(0xda1d60e183d4a5f8) /* 181 */, + U64_C(0xb287c38417998e47) /* 182 */, U64_C(0xfe3edc121bb31886) /* 183 */, + U64_C(0xc7fe3ccc980ccbef) /* 184 */, U64_C(0xe46fb590189bfd03) /* 185 */, + U64_C(0x3732fd469a4c57dc) /* 186 */, U64_C(0x7ef700a07cf1ad65) /* 187 */, + U64_C(0x59c64468a31d8859) /* 188 */, U64_C(0x762fb0b4d45b61f6) /* 189 */, + U64_C(0x155baed099047718) /* 190 */, U64_C(0x68755e4c3d50baa6) /* 191 */, + U64_C(0xe9214e7f22d8b4df) /* 192 */, U64_C(0x2addbf532eac95f4) /* 193 */, + U64_C(0x32ae3909b4bd0109) /* 194 */, U64_C(0x834df537b08e3450) /* 195 */, + U64_C(0xfa209da84220728d) /* 196 */, U64_C(0x9e691d9b9efe23f7) /* 197 */, + U64_C(0x0446d288c4ae8d7f) /* 198 */, U64_C(0x7b4cc524e169785b) /* 199 */, + U64_C(0x21d87f0135ca1385) /* 200 */, U64_C(0xcebb400f137b8aa5) /* 201 */, + U64_C(0x272e2b66580796be) /* 202 */, U64_C(0x3612264125c2b0de) /* 203 */, + U64_C(0x057702bdad1efbb2) /* 204 */, U64_C(0xd4babb8eacf84be9) /* 205 */, + U64_C(0x91583139641bc67b) /* 206 */, U64_C(0x8bdc2de08036e024) /* 207 */, + U64_C(0x603c8156f49f68ed) /* 208 */, U64_C(0xf7d236f7dbef5111) /* 209 */, + U64_C(0x9727c4598ad21e80) /* 210 */, U64_C(0xa08a0896670a5fd7) /* 211 */, + U64_C(0xcb4a8f4309eba9cb) /* 212 */, U64_C(0x81af564b0f7036a1) /* 213 */, + U64_C(0xc0b99aa778199abd) /* 214 */, U64_C(0x959f1ec83fc8e952) /* 215 */, + U64_C(0x8c505077794a81b9) /* 216 */, U64_C(0x3acaaf8f056338f0) /* 217 */, + U64_C(0x07b43f50627a6778) /* 218 */, U64_C(0x4a44ab49f5eccc77) /* 219 */, + U64_C(0x3bc3d6e4b679ee98) /* 220 */, U64_C(0x9cc0d4d1cf14108c) /* 221 */, + U64_C(0x4406c00b206bc8a0) /* 222 */, U64_C(0x82a18854c8d72d89) /* 223 */, + U64_C(0x67e366b35c3c432c) /* 224 */, U64_C(0xb923dd61102b37f2) /* 225 */, + U64_C(0x56ab2779d884271d) /* 226 */, U64_C(0xbe83e1b0ff1525af) /* 227 */, + U64_C(0xfb7c65d4217e49a9) /* 228 */, U64_C(0x6bdbe0e76d48e7d4) /* 229 */, + U64_C(0x08df828745d9179e) /* 230 */, U64_C(0x22ea6a9add53bd34) /* 231 */, + U64_C(0xe36e141c5622200a) /* 232 */, U64_C(0x7f805d1b8cb750ee) /* 233 */, + U64_C(0xafe5c7a59f58e837) /* 234 */, U64_C(0xe27f996a4fb1c23c) /* 235 */, + U64_C(0xd3867dfb0775f0d0) /* 236 */, U64_C(0xd0e673de6e88891a) /* 237 */, + U64_C(0x123aeb9eafb86c25) /* 238 */, U64_C(0x30f1d5d5c145b895) /* 239 */, + U64_C(0xbb434a2dee7269e7) /* 240 */, U64_C(0x78cb67ecf931fa38) /* 241 */, + U64_C(0xf33b0372323bbf9c) /* 242 */, U64_C(0x52d66336fb279c74) /* 243 */, + U64_C(0x505f33ac0afb4eaa) /* 244 */, U64_C(0xe8a5cd99a2cce187) /* 245 */, + U64_C(0x534974801e2d30bb) /* 246 */, U64_C(0x8d2d5711d5876d90) /* 247 */, + U64_C(0x1f1a412891bc038e) /* 248 */, U64_C(0xd6e2e71d82e56648) /* 249 */, + U64_C(0x74036c3a497732b7) /* 250 */, U64_C(0x89b67ed96361f5ab) /* 251 */, + U64_C(0xffed95d8f1ea02a2) /* 252 */, U64_C(0xe72b3bd61464d43d) /* 253 */, + U64_C(0xa6300f170bdc4820) /* 254 */, U64_C(0xebc18760ed78a77a) /* 255 */ }; static u64 sbox2[256] = { - 0xe6a6be5a05a12138LL /* 256 */, 0xb5a122a5b4f87c98LL /* 257 */, - 0x563c6089140b6990LL /* 258 */, 0x4c46cb2e391f5dd5LL /* 259 */, - 0xd932addbc9b79434LL /* 260 */, 0x08ea70e42015aff5LL /* 261 */, - 0xd765a6673e478cf1LL /* 262 */, 0xc4fb757eab278d99LL /* 263 */, - 0xdf11c6862d6e0692LL /* 264 */, 0xddeb84f10d7f3b16LL /* 265 */, - 0x6f2ef604a665ea04LL /* 266 */, 0x4a8e0f0ff0e0dfb3LL /* 267 */, - 0xa5edeef83dbcba51LL /* 268 */, 0xfc4f0a2a0ea4371eLL /* 269 */, - 0xe83e1da85cb38429LL /* 270 */, 0xdc8ff882ba1b1ce2LL /* 271 */, - 0xcd45505e8353e80dLL /* 272 */, 0x18d19a00d4db0717LL /* 273 */, - 0x34a0cfeda5f38101LL /* 274 */, 0x0be77e518887caf2LL /* 275 */, - 0x1e341438b3c45136LL /* 276 */, 0xe05797f49089ccf9LL /* 277 */, - 0xffd23f9df2591d14LL /* 278 */, 0x543dda228595c5cdLL /* 279 */, - 0x661f81fd99052a33LL /* 280 */, 0x8736e641db0f7b76LL /* 281 */, - 0x15227725418e5307LL /* 282 */, 0xe25f7f46162eb2faLL /* 283 */, - 0x48a8b2126c13d9feLL /* 284 */, 0xafdc541792e76eeaLL /* 285 */, - 0x03d912bfc6d1898fLL /* 286 */, 0x31b1aafa1b83f51bLL /* 287 */, - 0xf1ac2796e42ab7d9LL /* 288 */, 0x40a3a7d7fcd2ebacLL /* 289 */, - 0x1056136d0afbbcc5LL /* 290 */, 0x7889e1dd9a6d0c85LL /* 291 */, - 0xd33525782a7974aaLL /* 292 */, 0xa7e25d09078ac09bLL /* 293 */, - 0xbd4138b3eac6edd0LL /* 294 */, 0x920abfbe71eb9e70LL /* 295 */, - 0xa2a5d0f54fc2625cLL /* 296 */, 0xc054e36b0b1290a3LL /* 297 */, - 0xf6dd59ff62fe932bLL /* 298 */, 0x3537354511a8ac7dLL /* 299 */, - 0xca845e9172fadcd4LL /* 300 */, 0x84f82b60329d20dcLL /* 301 */, - 0x79c62ce1cd672f18LL /* 302 */, 0x8b09a2add124642cLL /* 303 */, - 0xd0c1e96a19d9e726LL /* 304 */, 0x5a786a9b4ba9500cLL /* 305 */, - 0x0e020336634c43f3LL /* 306 */, 0xc17b474aeb66d822LL /* 307 */, - 0x6a731ae3ec9baac2LL /* 308 */, 0x8226667ae0840258LL /* 309 */, - 0x67d4567691caeca5LL /* 310 */, 0x1d94155c4875adb5LL /* 311 */, - 0x6d00fd985b813fdfLL /* 312 */, 0x51286efcb774cd06LL /* 313 */, - 0x5e8834471fa744afLL /* 314 */, 0xf72ca0aee761ae2eLL /* 315 */, - 0xbe40e4cdaee8e09aLL /* 316 */, 0xe9970bbb5118f665LL /* 317 */, - 0x726e4beb33df1964LL /* 318 */, 0x703b000729199762LL /* 319 */, - 0x4631d816f5ef30a7LL /* 320 */, 0xb880b5b51504a6beLL /* 321 */, - 0x641793c37ed84b6cLL /* 322 */, 0x7b21ed77f6e97d96LL /* 323 */, - 0x776306312ef96b73LL /* 324 */, 0xae528948e86ff3f4LL /* 325 */, - 0x53dbd7f286a3f8f8LL /* 326 */, 0x16cadce74cfc1063LL /* 327 */, - 0x005c19bdfa52c6ddLL /* 328 */, 0x68868f5d64d46ad3LL /* 329 */, - 0x3a9d512ccf1e186aLL /* 330 */, 0x367e62c2385660aeLL /* 331 */, - 0xe359e7ea77dcb1d7LL /* 332 */, 0x526c0773749abe6eLL /* 333 */, - 0x735ae5f9d09f734bLL /* 334 */, 0x493fc7cc8a558ba8LL /* 335 */, - 0xb0b9c1533041ab45LL /* 336 */, 0x321958ba470a59bdLL /* 337 */, - 0x852db00b5f46c393LL /* 338 */, 0x91209b2bd336b0e5LL /* 339 */, - 0x6e604f7d659ef19fLL /* 340 */, 0xb99a8ae2782ccb24LL /* 341 */, - 0xccf52ab6c814c4c7LL /* 342 */, 0x4727d9afbe11727bLL /* 343 */, - 0x7e950d0c0121b34dLL /* 344 */, 0x756f435670ad471fLL /* 345 */, - 0xf5add442615a6849LL /* 346 */, 0x4e87e09980b9957aLL /* 347 */, - 0x2acfa1df50aee355LL /* 348 */, 0xd898263afd2fd556LL /* 349 */, - 0xc8f4924dd80c8fd6LL /* 350 */, 0xcf99ca3d754a173aLL /* 351 */, - 0xfe477bacaf91bf3cLL /* 352 */, 0xed5371f6d690c12dLL /* 353 */, - 0x831a5c285e687094LL /* 354 */, 0xc5d3c90a3708a0a4LL /* 355 */, - 0x0f7f903717d06580LL /* 356 */, 0x19f9bb13b8fdf27fLL /* 357 */, - 0xb1bd6f1b4d502843LL /* 358 */, 0x1c761ba38fff4012LL /* 359 */, - 0x0d1530c4e2e21f3bLL /* 360 */, 0x8943ce69a7372c8aLL /* 361 */, - 0xe5184e11feb5ce66LL /* 362 */, 0x618bdb80bd736621LL /* 363 */, - 0x7d29bad68b574d0bLL /* 364 */, 0x81bb613e25e6fe5bLL /* 365 */, - 0x071c9c10bc07913fLL /* 366 */, 0xc7beeb7909ac2d97LL /* 367 */, - 0xc3e58d353bc5d757LL /* 368 */, 0xeb017892f38f61e8LL /* 369 */, - 0xd4effb9c9b1cc21aLL /* 370 */, 0x99727d26f494f7abLL /* 371 */, - 0xa3e063a2956b3e03LL /* 372 */, 0x9d4a8b9a4aa09c30LL /* 373 */, - 0x3f6ab7d500090fb4LL /* 374 */, 0x9cc0f2a057268ac0LL /* 375 */, - 0x3dee9d2dedbf42d1LL /* 376 */, 0x330f49c87960a972LL /* 377 */, - 0xc6b2720287421b41LL /* 378 */, 0x0ac59ec07c00369cLL /* 379 */, - 0xef4eac49cb353425LL /* 380 */, 0xf450244eef0129d8LL /* 381 */, - 0x8acc46e5caf4deb6LL /* 382 */, 0x2ffeab63989263f7LL /* 383 */, - 0x8f7cb9fe5d7a4578LL /* 384 */, 0x5bd8f7644e634635LL /* 385 */, - 0x427a7315bf2dc900LL /* 386 */, 0x17d0c4aa2125261cLL /* 387 */, - 0x3992486c93518e50LL /* 388 */, 0xb4cbfee0a2d7d4c3LL /* 389 */, - 0x7c75d6202c5ddd8dLL /* 390 */, 0xdbc295d8e35b6c61LL /* 391 */, - 0x60b369d302032b19LL /* 392 */, 0xce42685fdce44132LL /* 393 */, - 0x06f3ddb9ddf65610LL /* 394 */, 0x8ea4d21db5e148f0LL /* 395 */, - 0x20b0fce62fcd496fLL /* 396 */, 0x2c1b912358b0ee31LL /* 397 */, - 0xb28317b818f5a308LL /* 398 */, 0xa89c1e189ca6d2cfLL /* 399 */, - 0x0c6b18576aaadbc8LL /* 400 */, 0xb65deaa91299fae3LL /* 401 */, - 0xfb2b794b7f1027e7LL /* 402 */, 0x04e4317f443b5bebLL /* 403 */, - 0x4b852d325939d0a6LL /* 404 */, 0xd5ae6beefb207ffcLL /* 405 */, - 0x309682b281c7d374LL /* 406 */, 0xbae309a194c3b475LL /* 407 */, - 0x8cc3f97b13b49f05LL /* 408 */, 0x98a9422ff8293967LL /* 409 */, - 0x244b16b01076ff7cLL /* 410 */, 0xf8bf571c663d67eeLL /* 411 */, - 0x1f0d6758eee30da1LL /* 412 */, 0xc9b611d97adeb9b7LL /* 413 */, - 0xb7afd5887b6c57a2LL /* 414 */, 0x6290ae846b984fe1LL /* 415 */, - 0x94df4cdeacc1a5fdLL /* 416 */, 0x058a5bd1c5483affLL /* 417 */, - 0x63166cc142ba3c37LL /* 418 */, 0x8db8526eb2f76f40LL /* 419 */, - 0xe10880036f0d6d4eLL /* 420 */, 0x9e0523c9971d311dLL /* 421 */, - 0x45ec2824cc7cd691LL /* 422 */, 0x575b8359e62382c9LL /* 423 */, - 0xfa9e400dc4889995LL /* 424 */, 0xd1823ecb45721568LL /* 425 */, - 0xdafd983b8206082fLL /* 426 */, 0xaa7d29082386a8cbLL /* 427 */, - 0x269fcd4403b87588LL /* 428 */, 0x1b91f5f728bdd1e0LL /* 429 */, - 0xe4669f39040201f6LL /* 430 */, 0x7a1d7c218cf04adeLL /* 431 */, - 0x65623c29d79ce5ceLL /* 432 */, 0x2368449096c00bb1LL /* 433 */, - 0xab9bf1879da503baLL /* 434 */, 0xbc23ecb1a458058eLL /* 435 */, - 0x9a58df01bb401eccLL /* 436 */, 0xa070e868a85f143dLL /* 437 */, - 0x4ff188307df2239eLL /* 438 */, 0x14d565b41a641183LL /* 439 */, - 0xee13337452701602LL /* 440 */, 0x950e3dcf3f285e09LL /* 441 */, - 0x59930254b9c80953LL /* 442 */, 0x3bf299408930da6dLL /* 443 */, - 0xa955943f53691387LL /* 444 */, 0xa15edecaa9cb8784LL /* 445 */, - 0x29142127352be9a0LL /* 446 */, 0x76f0371fff4e7afbLL /* 447 */, - 0x0239f450274f2228LL /* 448 */, 0xbb073af01d5e868bLL /* 449 */, - 0xbfc80571c10e96c1LL /* 450 */, 0xd267088568222e23LL /* 451 */, - 0x9671a3d48e80b5b0LL /* 452 */, 0x55b5d38ae193bb81LL /* 453 */, - 0x693ae2d0a18b04b8LL /* 454 */, 0x5c48b4ecadd5335fLL /* 455 */, - 0xfd743b194916a1caLL /* 456 */, 0x2577018134be98c4LL /* 457 */, - 0xe77987e83c54a4adLL /* 458 */, 0x28e11014da33e1b9LL /* 459 */, - 0x270cc59e226aa213LL /* 460 */, 0x71495f756d1a5f60LL /* 461 */, - 0x9be853fb60afef77LL /* 462 */, 0xadc786a7f7443dbfLL /* 463 */, - 0x0904456173b29a82LL /* 464 */, 0x58bc7a66c232bd5eLL /* 465 */, - 0xf306558c673ac8b2LL /* 466 */, 0x41f639c6b6c9772aLL /* 467 */, - 0x216defe99fda35daLL /* 468 */, 0x11640cc71c7be615LL /* 469 */, - 0x93c43694565c5527LL /* 470 */, 0xea038e6246777839LL /* 471 */, - 0xf9abf3ce5a3e2469LL /* 472 */, 0x741e768d0fd312d2LL /* 473 */, - 0x0144b883ced652c6LL /* 474 */, 0xc20b5a5ba33f8552LL /* 475 */, - 0x1ae69633c3435a9dLL /* 476 */, 0x97a28ca4088cfdecLL /* 477 */, - 0x8824a43c1e96f420LL /* 478 */, 0x37612fa66eeea746LL /* 479 */, - 0x6b4cb165f9cf0e5aLL /* 480 */, 0x43aa1c06a0abfb4aLL /* 481 */, - 0x7f4dc26ff162796bLL /* 482 */, 0x6cbacc8e54ed9b0fLL /* 483 */, - 0xa6b7ffefd2bb253eLL /* 484 */, 0x2e25bc95b0a29d4fLL /* 485 */, - 0x86d6a58bdef1388cLL /* 486 */, 0xded74ac576b6f054LL /* 487 */, - 0x8030bdbc2b45805dLL /* 488 */, 0x3c81af70e94d9289LL /* 489 */, - 0x3eff6dda9e3100dbLL /* 490 */, 0xb38dc39fdfcc8847LL /* 491 */, - 0x123885528d17b87eLL /* 492 */, 0xf2da0ed240b1b642LL /* 493 */, - 0x44cefadcd54bf9a9LL /* 494 */, 0x1312200e433c7ee6LL /* 495 */, - 0x9ffcc84f3a78c748LL /* 496 */, 0xf0cd1f72248576bbLL /* 497 */, - 0xec6974053638cfe4LL /* 498 */, 0x2ba7b67c0cec4e4cLL /* 499 */, - 0xac2f4df3e5ce32edLL /* 500 */, 0xcb33d14326ea4c11LL /* 501 */, - 0xa4e9044cc77e58bcLL /* 502 */, 0x5f513293d934fcefLL /* 503 */, - 0x5dc9645506e55444LL /* 504 */, 0x50de418f317de40aLL /* 505 */, - 0x388cb31a69dde259LL /* 506 */, 0x2db4a83455820a86LL /* 507 */, - 0x9010a91e84711ae9LL /* 508 */, 0x4df7f0b7b1498371LL /* 509 */, - 0xd62a2eabc0977179LL /* 510 */, 0x22fac097aa8d5c0eLL /* 511 */ + U64_C(0xe6a6be5a05a12138) /* 256 */, U64_C(0xb5a122a5b4f87c98) /* 257 */, + U64_C(0x563c6089140b6990) /* 258 */, U64_C(0x4c46cb2e391f5dd5) /* 259 */, + U64_C(0xd932addbc9b79434) /* 260 */, U64_C(0x08ea70e42015aff5) /* 261 */, + U64_C(0xd765a6673e478cf1) /* 262 */, U64_C(0xc4fb757eab278d99) /* 263 */, + U64_C(0xdf11c6862d6e0692) /* 264 */, U64_C(0xddeb84f10d7f3b16) /* 265 */, + U64_C(0x6f2ef604a665ea04) /* 266 */, U64_C(0x4a8e0f0ff0e0dfb3) /* 267 */, + U64_C(0xa5edeef83dbcba51) /* 268 */, U64_C(0xfc4f0a2a0ea4371e) /* 269 */, + U64_C(0xe83e1da85cb38429) /* 270 */, U64_C(0xdc8ff882ba1b1ce2) /* 271 */, + U64_C(0xcd45505e8353e80d) /* 272 */, U64_C(0x18d19a00d4db0717) /* 273 */, + U64_C(0x34a0cfeda5f38101) /* 274 */, U64_C(0x0be77e518887caf2) /* 275 */, + U64_C(0x1e341438b3c45136) /* 276 */, U64_C(0xe05797f49089ccf9) /* 277 */, + U64_C(0xffd23f9df2591d14) /* 278 */, U64_C(0x543dda228595c5cd) /* 279 */, + U64_C(0x661f81fd99052a33) /* 280 */, U64_C(0x8736e641db0f7b76) /* 281 */, + U64_C(0x15227725418e5307) /* 282 */, U64_C(0xe25f7f46162eb2fa) /* 283 */, + U64_C(0x48a8b2126c13d9fe) /* 284 */, U64_C(0xafdc541792e76eea) /* 285 */, + U64_C(0x03d912bfc6d1898f) /* 286 */, U64_C(0x31b1aafa1b83f51b) /* 287 */, + U64_C(0xf1ac2796e42ab7d9) /* 288 */, U64_C(0x40a3a7d7fcd2ebac) /* 289 */, + U64_C(0x1056136d0afbbcc5) /* 290 */, U64_C(0x7889e1dd9a6d0c85) /* 291 */, + U64_C(0xd33525782a7974aa) /* 292 */, U64_C(0xa7e25d09078ac09b) /* 293 */, + U64_C(0xbd4138b3eac6edd0) /* 294 */, U64_C(0x920abfbe71eb9e70) /* 295 */, + U64_C(0xa2a5d0f54fc2625c) /* 296 */, U64_C(0xc054e36b0b1290a3) /* 297 */, + U64_C(0xf6dd59ff62fe932b) /* 298 */, U64_C(0x3537354511a8ac7d) /* 299 */, + U64_C(0xca845e9172fadcd4) /* 300 */, U64_C(0x84f82b60329d20dc) /* 301 */, + U64_C(0x79c62ce1cd672f18) /* 302 */, U64_C(0x8b09a2add124642c) /* 303 */, + U64_C(0xd0c1e96a19d9e726) /* 304 */, U64_C(0x5a786a9b4ba9500c) /* 305 */, + U64_C(0x0e020336634c43f3) /* 306 */, U64_C(0xc17b474aeb66d822) /* 307 */, + U64_C(0x6a731ae3ec9baac2) /* 308 */, U64_C(0x8226667ae0840258) /* 309 */, + U64_C(0x67d4567691caeca5) /* 310 */, U64_C(0x1d94155c4875adb5) /* 311 */, + U64_C(0x6d00fd985b813fdf) /* 312 */, U64_C(0x51286efcb774cd06) /* 313 */, + U64_C(0x5e8834471fa744af) /* 314 */, U64_C(0xf72ca0aee761ae2e) /* 315 */, + U64_C(0xbe40e4cdaee8e09a) /* 316 */, U64_C(0xe9970bbb5118f665) /* 317 */, + U64_C(0x726e4beb33df1964) /* 318 */, U64_C(0x703b000729199762) /* 319 */, + U64_C(0x4631d816f5ef30a7) /* 320 */, U64_C(0xb880b5b51504a6be) /* 321 */, + U64_C(0x641793c37ed84b6c) /* 322 */, U64_C(0x7b21ed77f6e97d96) /* 323 */, + U64_C(0x776306312ef96b73) /* 324 */, U64_C(0xae528948e86ff3f4) /* 325 */, + U64_C(0x53dbd7f286a3f8f8) /* 326 */, U64_C(0x16cadce74cfc1063) /* 327 */, + U64_C(0x005c19bdfa52c6dd) /* 328 */, U64_C(0x68868f5d64d46ad3) /* 329 */, + U64_C(0x3a9d512ccf1e186a) /* 330 */, U64_C(0x367e62c2385660ae) /* 331 */, + U64_C(0xe359e7ea77dcb1d7) /* 332 */, U64_C(0x526c0773749abe6e) /* 333 */, + U64_C(0x735ae5f9d09f734b) /* 334 */, U64_C(0x493fc7cc8a558ba8) /* 335 */, + U64_C(0xb0b9c1533041ab45) /* 336 */, U64_C(0x321958ba470a59bd) /* 337 */, + U64_C(0x852db00b5f46c393) /* 338 */, U64_C(0x91209b2bd336b0e5) /* 339 */, + U64_C(0x6e604f7d659ef19f) /* 340 */, U64_C(0xb99a8ae2782ccb24) /* 341 */, + U64_C(0xccf52ab6c814c4c7) /* 342 */, U64_C(0x4727d9afbe11727b) /* 343 */, + U64_C(0x7e950d0c0121b34d) /* 344 */, U64_C(0x756f435670ad471f) /* 345 */, + U64_C(0xf5add442615a6849) /* 346 */, U64_C(0x4e87e09980b9957a) /* 347 */, + U64_C(0x2acfa1df50aee355) /* 348 */, U64_C(0xd898263afd2fd556) /* 349 */, + U64_C(0xc8f4924dd80c8fd6) /* 350 */, U64_C(0xcf99ca3d754a173a) /* 351 */, + U64_C(0xfe477bacaf91bf3c) /* 352 */, U64_C(0xed5371f6d690c12d) /* 353 */, + U64_C(0x831a5c285e687094) /* 354 */, U64_C(0xc5d3c90a3708a0a4) /* 355 */, + U64_C(0x0f7f903717d06580) /* 356 */, U64_C(0x19f9bb13b8fdf27f) /* 357 */, + U64_C(0xb1bd6f1b4d502843) /* 358 */, U64_C(0x1c761ba38fff4012) /* 359 */, + U64_C(0x0d1530c4e2e21f3b) /* 360 */, U64_C(0x8943ce69a7372c8a) /* 361 */, + U64_C(0xe5184e11feb5ce66) /* 362 */, U64_C(0x618bdb80bd736621) /* 363 */, + U64_C(0x7d29bad68b574d0b) /* 364 */, U64_C(0x81bb613e25e6fe5b) /* 365 */, + U64_C(0x071c9c10bc07913f) /* 366 */, U64_C(0xc7beeb7909ac2d97) /* 367 */, + U64_C(0xc3e58d353bc5d757) /* 368 */, U64_C(0xeb017892f38f61e8) /* 369 */, + U64_C(0xd4effb9c9b1cc21a) /* 370 */, U64_C(0x99727d26f494f7ab) /* 371 */, + U64_C(0xa3e063a2956b3e03) /* 372 */, U64_C(0x9d4a8b9a4aa09c30) /* 373 */, + U64_C(0x3f6ab7d500090fb4) /* 374 */, U64_C(0x9cc0f2a057268ac0) /* 375 */, + U64_C(0x3dee9d2dedbf42d1) /* 376 */, U64_C(0x330f49c87960a972) /* 377 */, + U64_C(0xc6b2720287421b41) /* 378 */, U64_C(0x0ac59ec07c00369c) /* 379 */, + U64_C(0xef4eac49cb353425) /* 380 */, U64_C(0xf450244eef0129d8) /* 381 */, + U64_C(0x8acc46e5caf4deb6) /* 382 */, U64_C(0x2ffeab63989263f7) /* 383 */, + U64_C(0x8f7cb9fe5d7a4578) /* 384 */, U64_C(0x5bd8f7644e634635) /* 385 */, + U64_C(0x427a7315bf2dc900) /* 386 */, U64_C(0x17d0c4aa2125261c) /* 387 */, + U64_C(0x3992486c93518e50) /* 388 */, U64_C(0xb4cbfee0a2d7d4c3) /* 389 */, + U64_C(0x7c75d6202c5ddd8d) /* 390 */, U64_C(0xdbc295d8e35b6c61) /* 391 */, + U64_C(0x60b369d302032b19) /* 392 */, U64_C(0xce42685fdce44132) /* 393 */, + U64_C(0x06f3ddb9ddf65610) /* 394 */, U64_C(0x8ea4d21db5e148f0) /* 395 */, + U64_C(0x20b0fce62fcd496f) /* 396 */, U64_C(0x2c1b912358b0ee31) /* 397 */, + U64_C(0xb28317b818f5a308) /* 398 */, U64_C(0xa89c1e189ca6d2cf) /* 399 */, + U64_C(0x0c6b18576aaadbc8) /* 400 */, U64_C(0xb65deaa91299fae3) /* 401 */, + U64_C(0xfb2b794b7f1027e7) /* 402 */, U64_C(0x04e4317f443b5beb) /* 403 */, + U64_C(0x4b852d325939d0a6) /* 404 */, U64_C(0xd5ae6beefb207ffc) /* 405 */, + U64_C(0x309682b281c7d374) /* 406 */, U64_C(0xbae309a194c3b475) /* 407 */, + U64_C(0x8cc3f97b13b49f05) /* 408 */, U64_C(0x98a9422ff8293967) /* 409 */, + U64_C(0x244b16b01076ff7c) /* 410 */, U64_C(0xf8bf571c663d67ee) /* 411 */, + U64_C(0x1f0d6758eee30da1) /* 412 */, U64_C(0xc9b611d97adeb9b7) /* 413 */, + U64_C(0xb7afd5887b6c57a2) /* 414 */, U64_C(0x6290ae846b984fe1) /* 415 */, + U64_C(0x94df4cdeacc1a5fd) /* 416 */, U64_C(0x058a5bd1c5483aff) /* 417 */, + U64_C(0x63166cc142ba3c37) /* 418 */, U64_C(0x8db8526eb2f76f40) /* 419 */, + U64_C(0xe10880036f0d6d4e) /* 420 */, U64_C(0x9e0523c9971d311d) /* 421 */, + U64_C(0x45ec2824cc7cd691) /* 422 */, U64_C(0x575b8359e62382c9) /* 423 */, + U64_C(0xfa9e400dc4889995) /* 424 */, U64_C(0xd1823ecb45721568) /* 425 */, + U64_C(0xdafd983b8206082f) /* 426 */, U64_C(0xaa7d29082386a8cb) /* 427 */, + U64_C(0x269fcd4403b87588) /* 428 */, U64_C(0x1b91f5f728bdd1e0) /* 429 */, + U64_C(0xe4669f39040201f6) /* 430 */, U64_C(0x7a1d7c218cf04ade) /* 431 */, + U64_C(0x65623c29d79ce5ce) /* 432 */, U64_C(0x2368449096c00bb1) /* 433 */, + U64_C(0xab9bf1879da503ba) /* 434 */, U64_C(0xbc23ecb1a458058e) /* 435 */, + U64_C(0x9a58df01bb401ecc) /* 436 */, U64_C(0xa070e868a85f143d) /* 437 */, + U64_C(0x4ff188307df2239e) /* 438 */, U64_C(0x14d565b41a641183) /* 439 */, + U64_C(0xee13337452701602) /* 440 */, U64_C(0x950e3dcf3f285e09) /* 441 */, + U64_C(0x59930254b9c80953) /* 442 */, U64_C(0x3bf299408930da6d) /* 443 */, + U64_C(0xa955943f53691387) /* 444 */, U64_C(0xa15edecaa9cb8784) /* 445 */, + U64_C(0x29142127352be9a0) /* 446 */, U64_C(0x76f0371fff4e7afb) /* 447 */, + U64_C(0x0239f450274f2228) /* 448 */, U64_C(0xbb073af01d5e868b) /* 449 */, + U64_C(0xbfc80571c10e96c1) /* 450 */, U64_C(0xd267088568222e23) /* 451 */, + U64_C(0x9671a3d48e80b5b0) /* 452 */, U64_C(0x55b5d38ae193bb81) /* 453 */, + U64_C(0x693ae2d0a18b04b8) /* 454 */, U64_C(0x5c48b4ecadd5335f) /* 455 */, + U64_C(0xfd743b194916a1ca) /* 456 */, U64_C(0x2577018134be98c4) /* 457 */, + U64_C(0xe77987e83c54a4ad) /* 458 */, U64_C(0x28e11014da33e1b9) /* 459 */, + U64_C(0x270cc59e226aa213) /* 460 */, U64_C(0x71495f756d1a5f60) /* 461 */, + U64_C(0x9be853fb60afef77) /* 462 */, U64_C(0xadc786a7f7443dbf) /* 463 */, + U64_C(0x0904456173b29a82) /* 464 */, U64_C(0x58bc7a66c232bd5e) /* 465 */, + U64_C(0xf306558c673ac8b2) /* 466 */, U64_C(0x41f639c6b6c9772a) /* 467 */, + U64_C(0x216defe99fda35da) /* 468 */, U64_C(0x11640cc71c7be615) /* 469 */, + U64_C(0x93c43694565c5527) /* 470 */, U64_C(0xea038e6246777839) /* 471 */, + U64_C(0xf9abf3ce5a3e2469) /* 472 */, U64_C(0x741e768d0fd312d2) /* 473 */, + U64_C(0x0144b883ced652c6) /* 474 */, U64_C(0xc20b5a5ba33f8552) /* 475 */, + U64_C(0x1ae69633c3435a9d) /* 476 */, U64_C(0x97a28ca4088cfdec) /* 477 */, + U64_C(0x8824a43c1e96f420) /* 478 */, U64_C(0x37612fa66eeea746) /* 479 */, + U64_C(0x6b4cb165f9cf0e5a) /* 480 */, U64_C(0x43aa1c06a0abfb4a) /* 481 */, + U64_C(0x7f4dc26ff162796b) /* 482 */, U64_C(0x6cbacc8e54ed9b0f) /* 483 */, + U64_C(0xa6b7ffefd2bb253e) /* 484 */, U64_C(0x2e25bc95b0a29d4f) /* 485 */, + U64_C(0x86d6a58bdef1388c) /* 486 */, U64_C(0xded74ac576b6f054) /* 487 */, + U64_C(0x8030bdbc2b45805d) /* 488 */, U64_C(0x3c81af70e94d9289) /* 489 */, + U64_C(0x3eff6dda9e3100db) /* 490 */, U64_C(0xb38dc39fdfcc8847) /* 491 */, + U64_C(0x123885528d17b87e) /* 492 */, U64_C(0xf2da0ed240b1b642) /* 493 */, + U64_C(0x44cefadcd54bf9a9) /* 494 */, U64_C(0x1312200e433c7ee6) /* 495 */, + U64_C(0x9ffcc84f3a78c748) /* 496 */, U64_C(0xf0cd1f72248576bb) /* 497 */, + U64_C(0xec6974053638cfe4) /* 498 */, U64_C(0x2ba7b67c0cec4e4c) /* 499 */, + U64_C(0xac2f4df3e5ce32ed) /* 500 */, U64_C(0xcb33d14326ea4c11) /* 501 */, + U64_C(0xa4e9044cc77e58bc) /* 502 */, U64_C(0x5f513293d934fcef) /* 503 */, + U64_C(0x5dc9645506e55444) /* 504 */, U64_C(0x50de418f317de40a) /* 505 */, + U64_C(0x388cb31a69dde259) /* 506 */, U64_C(0x2db4a83455820a86) /* 507 */, + U64_C(0x9010a91e84711ae9) /* 508 */, U64_C(0x4df7f0b7b1498371) /* 509 */, + U64_C(0xd62a2eabc0977179) /* 510 */, U64_C(0x22fac097aa8d5c0e) /* 511 */ }; static u64 sbox3[256] = { - 0xf49fcc2ff1daf39bLL /* 512 */, 0x487fd5c66ff29281LL /* 513 */, - 0xe8a30667fcdca83fLL /* 514 */, 0x2c9b4be3d2fcce63LL /* 515 */, - 0xda3ff74b93fbbbc2LL /* 516 */, 0x2fa165d2fe70ba66LL /* 517 */, - 0xa103e279970e93d4LL /* 518 */, 0xbecdec77b0e45e71LL /* 519 */, - 0xcfb41e723985e497LL /* 520 */, 0xb70aaa025ef75017LL /* 521 */, - 0xd42309f03840b8e0LL /* 522 */, 0x8efc1ad035898579LL /* 523 */, - 0x96c6920be2b2abc5LL /* 524 */, 0x66af4163375a9172LL /* 525 */, - 0x2174abdcca7127fbLL /* 526 */, 0xb33ccea64a72ff41LL /* 527 */, - 0xf04a4933083066a5LL /* 528 */, 0x8d970acdd7289af5LL /* 529 */, - 0x8f96e8e031c8c25eLL /* 530 */, 0xf3fec02276875d47LL /* 531 */, - 0xec7bf310056190ddLL /* 532 */, 0xf5adb0aebb0f1491LL /* 533 */, - 0x9b50f8850fd58892LL /* 534 */, 0x4975488358b74de8LL /* 535 */, - 0xa3354ff691531c61LL /* 536 */, 0x0702bbe481d2c6eeLL /* 537 */, - 0x89fb24057deded98LL /* 538 */, 0xac3075138596e902LL /* 539 */, - 0x1d2d3580172772edLL /* 540 */, 0xeb738fc28e6bc30dLL /* 541 */, - 0x5854ef8f63044326LL /* 542 */, 0x9e5c52325add3bbeLL /* 543 */, - 0x90aa53cf325c4623LL /* 544 */, 0xc1d24d51349dd067LL /* 545 */, - 0x2051cfeea69ea624LL /* 546 */, 0x13220f0a862e7e4fLL /* 547 */, - 0xce39399404e04864LL /* 548 */, 0xd9c42ca47086fcb7LL /* 549 */, - 0x685ad2238a03e7ccLL /* 550 */, 0x066484b2ab2ff1dbLL /* 551 */, - 0xfe9d5d70efbf79ecLL /* 552 */, 0x5b13b9dd9c481854LL /* 553 */, - 0x15f0d475ed1509adLL /* 554 */, 0x0bebcd060ec79851LL /* 555 */, - 0xd58c6791183ab7f8LL /* 556 */, 0xd1187c5052f3eee4LL /* 557 */, - 0xc95d1192e54e82ffLL /* 558 */, 0x86eea14cb9ac6ca2LL /* 559 */, - 0x3485beb153677d5dLL /* 560 */, 0xdd191d781f8c492aLL /* 561 */, - 0xf60866baa784ebf9LL /* 562 */, 0x518f643ba2d08c74LL /* 563 */, - 0x8852e956e1087c22LL /* 564 */, 0xa768cb8dc410ae8dLL /* 565 */, - 0x38047726bfec8e1aLL /* 566 */, 0xa67738b4cd3b45aaLL /* 567 */, - 0xad16691cec0dde19LL /* 568 */, 0xc6d4319380462e07LL /* 569 */, - 0xc5a5876d0ba61938LL /* 570 */, 0x16b9fa1fa58fd840LL /* 571 */, - 0x188ab1173ca74f18LL /* 572 */, 0xabda2f98c99c021fLL /* 573 */, - 0x3e0580ab134ae816LL /* 574 */, 0x5f3b05b773645abbLL /* 575 */, - 0x2501a2be5575f2f6LL /* 576 */, 0x1b2f74004e7e8ba9LL /* 577 */, - 0x1cd7580371e8d953LL /* 578 */, 0x7f6ed89562764e30LL /* 579 */, - 0xb15926ff596f003dLL /* 580 */, 0x9f65293da8c5d6b9LL /* 581 */, - 0x6ecef04dd690f84cLL /* 582 */, 0x4782275fff33af88LL /* 583 */, - 0xe41433083f820801LL /* 584 */, 0xfd0dfe409a1af9b5LL /* 585 */, - 0x4325a3342cdb396bLL /* 586 */, 0x8ae77e62b301b252LL /* 587 */, - 0xc36f9e9f6655615aLL /* 588 */, 0x85455a2d92d32c09LL /* 589 */, - 0xf2c7dea949477485LL /* 590 */, 0x63cfb4c133a39ebaLL /* 591 */, - 0x83b040cc6ebc5462LL /* 592 */, 0x3b9454c8fdb326b0LL /* 593 */, - 0x56f56a9e87ffd78cLL /* 594 */, 0x2dc2940d99f42bc6LL /* 595 */, - 0x98f7df096b096e2dLL /* 596 */, 0x19a6e01e3ad852bfLL /* 597 */, - 0x42a99ccbdbd4b40bLL /* 598 */, 0xa59998af45e9c559LL /* 599 */, - 0x366295e807d93186LL /* 600 */, 0x6b48181bfaa1f773LL /* 601 */, - 0x1fec57e2157a0a1dLL /* 602 */, 0x4667446af6201ad5LL /* 603 */, - 0xe615ebcacfb0f075LL /* 604 */, 0xb8f31f4f68290778LL /* 605 */, - 0x22713ed6ce22d11eLL /* 606 */, 0x3057c1a72ec3c93bLL /* 607 */, - 0xcb46acc37c3f1f2fLL /* 608 */, 0xdbb893fd02aaf50eLL /* 609 */, - 0x331fd92e600b9fcfLL /* 610 */, 0xa498f96148ea3ad6LL /* 611 */, - 0xa8d8426e8b6a83eaLL /* 612 */, 0xa089b274b7735cdcLL /* 613 */, - 0x87f6b3731e524a11LL /* 614 */, 0x118808e5cbc96749LL /* 615 */, - 0x9906e4c7b19bd394LL /* 616 */, 0xafed7f7e9b24a20cLL /* 617 */, - 0x6509eadeeb3644a7LL /* 618 */, 0x6c1ef1d3e8ef0edeLL /* 619 */, - 0xb9c97d43e9798fb4LL /* 620 */, 0xa2f2d784740c28a3LL /* 621 */, - 0x7b8496476197566fLL /* 622 */, 0x7a5be3e6b65f069dLL /* 623 */, - 0xf96330ed78be6f10LL /* 624 */, 0xeee60de77a076a15LL /* 625 */, - 0x2b4bee4aa08b9bd0LL /* 626 */, 0x6a56a63ec7b8894eLL /* 627 */, - 0x02121359ba34fef4LL /* 628 */, 0x4cbf99f8283703fcLL /* 629 */, - 0x398071350caf30c8LL /* 630 */, 0xd0a77a89f017687aLL /* 631 */, - 0xf1c1a9eb9e423569LL /* 632 */, 0x8c7976282dee8199LL /* 633 */, - 0x5d1737a5dd1f7abdLL /* 634 */, 0x4f53433c09a9fa80LL /* 635 */, - 0xfa8b0c53df7ca1d9LL /* 636 */, 0x3fd9dcbc886ccb77LL /* 637 */, - 0xc040917ca91b4720LL /* 638 */, 0x7dd00142f9d1dcdfLL /* 639 */, - 0x8476fc1d4f387b58LL /* 640 */, 0x23f8e7c5f3316503LL /* 641 */, - 0x032a2244e7e37339LL /* 642 */, 0x5c87a5d750f5a74bLL /* 643 */, - 0x082b4cc43698992eLL /* 644 */, 0xdf917becb858f63cLL /* 645 */, - 0x3270b8fc5bf86ddaLL /* 646 */, 0x10ae72bb29b5dd76LL /* 647 */, - 0x576ac94e7700362bLL /* 648 */, 0x1ad112dac61efb8fLL /* 649 */, - 0x691bc30ec5faa427LL /* 650 */, 0xff246311cc327143LL /* 651 */, - 0x3142368e30e53206LL /* 652 */, 0x71380e31e02ca396LL /* 653 */, - 0x958d5c960aad76f1LL /* 654 */, 0xf8d6f430c16da536LL /* 655 */, - 0xc8ffd13f1be7e1d2LL /* 656 */, 0x7578ae66004ddbe1LL /* 657 */, - 0x05833f01067be646LL /* 658 */, 0xbb34b5ad3bfe586dLL /* 659 */, - 0x095f34c9a12b97f0LL /* 660 */, 0x247ab64525d60ca8LL /* 661 */, - 0xdcdbc6f3017477d1LL /* 662 */, 0x4a2e14d4decad24dLL /* 663 */, - 0xbdb5e6d9be0a1eebLL /* 664 */, 0x2a7e70f7794301abLL /* 665 */, - 0xdef42d8a270540fdLL /* 666 */, 0x01078ec0a34c22c1LL /* 667 */, - 0xe5de511af4c16387LL /* 668 */, 0x7ebb3a52bd9a330aLL /* 669 */, - 0x77697857aa7d6435LL /* 670 */, 0x004e831603ae4c32LL /* 671 */, - 0xe7a21020ad78e312LL /* 672 */, 0x9d41a70c6ab420f2LL /* 673 */, - 0x28e06c18ea1141e6LL /* 674 */, 0xd2b28cbd984f6b28LL /* 675 */, - 0x26b75f6c446e9d83LL /* 676 */, 0xba47568c4d418d7fLL /* 677 */, - 0xd80badbfe6183d8eLL /* 678 */, 0x0e206d7f5f166044LL /* 679 */, - 0xe258a43911cbca3eLL /* 680 */, 0x723a1746b21dc0bcLL /* 681 */, - 0xc7caa854f5d7cdd3LL /* 682 */, 0x7cac32883d261d9cLL /* 683 */, - 0x7690c26423ba942cLL /* 684 */, 0x17e55524478042b8LL /* 685 */, - 0xe0be477656a2389fLL /* 686 */, 0x4d289b5e67ab2da0LL /* 687 */, - 0x44862b9c8fbbfd31LL /* 688 */, 0xb47cc8049d141365LL /* 689 */, - 0x822c1b362b91c793LL /* 690 */, 0x4eb14655fb13dfd8LL /* 691 */, - 0x1ecbba0714e2a97bLL /* 692 */, 0x6143459d5cde5f14LL /* 693 */, - 0x53a8fbf1d5f0ac89LL /* 694 */, 0x97ea04d81c5e5b00LL /* 695 */, - 0x622181a8d4fdb3f3LL /* 696 */, 0xe9bcd341572a1208LL /* 697 */, - 0x1411258643cce58aLL /* 698 */, 0x9144c5fea4c6e0a4LL /* 699 */, - 0x0d33d06565cf620fLL /* 700 */, 0x54a48d489f219ca1LL /* 701 */, - 0xc43e5eac6d63c821LL /* 702 */, 0xa9728b3a72770dafLL /* 703 */, - 0xd7934e7b20df87efLL /* 704 */, 0xe35503b61a3e86e5LL /* 705 */, - 0xcae321fbc819d504LL /* 706 */, 0x129a50b3ac60bfa6LL /* 707 */, - 0xcd5e68ea7e9fb6c3LL /* 708 */, 0xb01c90199483b1c7LL /* 709 */, - 0x3de93cd5c295376cLL /* 710 */, 0xaed52edf2ab9ad13LL /* 711 */, - 0x2e60f512c0a07884LL /* 712 */, 0xbc3d86a3e36210c9LL /* 713 */, - 0x35269d9b163951ceLL /* 714 */, 0x0c7d6e2ad0cdb5faLL /* 715 */, - 0x59e86297d87f5733LL /* 716 */, 0x298ef221898db0e7LL /* 717 */, - 0x55000029d1a5aa7eLL /* 718 */, 0x8bc08ae1b5061b45LL /* 719 */, - 0xc2c31c2b6c92703aLL /* 720 */, 0x94cc596baf25ef42LL /* 721 */, - 0x0a1d73db22540456LL /* 722 */, 0x04b6a0f9d9c4179aLL /* 723 */, - 0xeffdafa2ae3d3c60LL /* 724 */, 0xf7c8075bb49496c4LL /* 725 */, - 0x9cc5c7141d1cd4e3LL /* 726 */, 0x78bd1638218e5534LL /* 727 */, - 0xb2f11568f850246aLL /* 728 */, 0xedfabcfa9502bc29LL /* 729 */, - 0x796ce5f2da23051bLL /* 730 */, 0xaae128b0dc93537cLL /* 731 */, - 0x3a493da0ee4b29aeLL /* 732 */, 0xb5df6b2c416895d7LL /* 733 */, - 0xfcabbd25122d7f37LL /* 734 */, 0x70810b58105dc4b1LL /* 735 */, - 0xe10fdd37f7882a90LL /* 736 */, 0x524dcab5518a3f5cLL /* 737 */, - 0x3c9e85878451255bLL /* 738 */, 0x4029828119bd34e2LL /* 739 */, - 0x74a05b6f5d3ceccbLL /* 740 */, 0xb610021542e13ecaLL /* 741 */, - 0x0ff979d12f59e2acLL /* 742 */, 0x6037da27e4f9cc50LL /* 743 */, - 0x5e92975a0df1847dLL /* 744 */, 0xd66de190d3e623feLL /* 745 */, - 0x5032d6b87b568048LL /* 746 */, 0x9a36b7ce8235216eLL /* 747 */, - 0x80272a7a24f64b4aLL /* 748 */, 0x93efed8b8c6916f7LL /* 749 */, - 0x37ddbff44cce1555LL /* 750 */, 0x4b95db5d4b99bd25LL /* 751 */, - 0x92d3fda169812fc0LL /* 752 */, 0xfb1a4a9a90660bb6LL /* 753 */, - 0x730c196946a4b9b2LL /* 754 */, 0x81e289aa7f49da68LL /* 755 */, - 0x64669a0f83b1a05fLL /* 756 */, 0x27b3ff7d9644f48bLL /* 757 */, - 0xcc6b615c8db675b3LL /* 758 */, 0x674f20b9bcebbe95LL /* 759 */, - 0x6f31238275655982LL /* 760 */, 0x5ae488713e45cf05LL /* 761 */, - 0xbf619f9954c21157LL /* 762 */, 0xeabac46040a8eae9LL /* 763 */, - 0x454c6fe9f2c0c1cdLL /* 764 */, 0x419cf6496412691cLL /* 765 */, - 0xd3dc3bef265b0f70LL /* 766 */, 0x6d0e60f5c3578a9eLL /* 767 */ + U64_C(0xf49fcc2ff1daf39b) /* 512 */, U64_C(0x487fd5c66ff29281) /* 513 */, + U64_C(0xe8a30667fcdca83f) /* 514 */, U64_C(0x2c9b4be3d2fcce63) /* 515 */, + U64_C(0xda3ff74b93fbbbc2) /* 516 */, U64_C(0x2fa165d2fe70ba66) /* 517 */, + U64_C(0xa103e279970e93d4) /* 518 */, U64_C(0xbecdec77b0e45e71) /* 519 */, + U64_C(0xcfb41e723985e497) /* 520 */, U64_C(0xb70aaa025ef75017) /* 521 */, + U64_C(0xd42309f03840b8e0) /* 522 */, U64_C(0x8efc1ad035898579) /* 523 */, + U64_C(0x96c6920be2b2abc5) /* 524 */, U64_C(0x66af4163375a9172) /* 525 */, + U64_C(0x2174abdcca7127fb) /* 526 */, U64_C(0xb33ccea64a72ff41) /* 527 */, + U64_C(0xf04a4933083066a5) /* 528 */, U64_C(0x8d970acdd7289af5) /* 529 */, + U64_C(0x8f96e8e031c8c25e) /* 530 */, U64_C(0xf3fec02276875d47) /* 531 */, + U64_C(0xec7bf310056190dd) /* 532 */, U64_C(0xf5adb0aebb0f1491) /* 533 */, + U64_C(0x9b50f8850fd58892) /* 534 */, U64_C(0x4975488358b74de8) /* 535 */, + U64_C(0xa3354ff691531c61) /* 536 */, U64_C(0x0702bbe481d2c6ee) /* 537 */, + U64_C(0x89fb24057deded98) /* 538 */, U64_C(0xac3075138596e902) /* 539 */, + U64_C(0x1d2d3580172772ed) /* 540 */, U64_C(0xeb738fc28e6bc30d) /* 541 */, + U64_C(0x5854ef8f63044326) /* 542 */, U64_C(0x9e5c52325add3bbe) /* 543 */, + U64_C(0x90aa53cf325c4623) /* 544 */, U64_C(0xc1d24d51349dd067) /* 545 */, + U64_C(0x2051cfeea69ea624) /* 546 */, U64_C(0x13220f0a862e7e4f) /* 547 */, + U64_C(0xce39399404e04864) /* 548 */, U64_C(0xd9c42ca47086fcb7) /* 549 */, + U64_C(0x685ad2238a03e7cc) /* 550 */, U64_C(0x066484b2ab2ff1db) /* 551 */, + U64_C(0xfe9d5d70efbf79ec) /* 552 */, U64_C(0x5b13b9dd9c481854) /* 553 */, + U64_C(0x15f0d475ed1509ad) /* 554 */, U64_C(0x0bebcd060ec79851) /* 555 */, + U64_C(0xd58c6791183ab7f8) /* 556 */, U64_C(0xd1187c5052f3eee4) /* 557 */, + U64_C(0xc95d1192e54e82ff) /* 558 */, U64_C(0x86eea14cb9ac6ca2) /* 559 */, + U64_C(0x3485beb153677d5d) /* 560 */, U64_C(0xdd191d781f8c492a) /* 561 */, + U64_C(0xf60866baa784ebf9) /* 562 */, U64_C(0x518f643ba2d08c74) /* 563 */, + U64_C(0x8852e956e1087c22) /* 564 */, U64_C(0xa768cb8dc410ae8d) /* 565 */, + U64_C(0x38047726bfec8e1a) /* 566 */, U64_C(0xa67738b4cd3b45aa) /* 567 */, + U64_C(0xad16691cec0dde19) /* 568 */, U64_C(0xc6d4319380462e07) /* 569 */, + U64_C(0xc5a5876d0ba61938) /* 570 */, U64_C(0x16b9fa1fa58fd840) /* 571 */, + U64_C(0x188ab1173ca74f18) /* 572 */, U64_C(0xabda2f98c99c021f) /* 573 */, + U64_C(0x3e0580ab134ae816) /* 574 */, U64_C(0x5f3b05b773645abb) /* 575 */, + U64_C(0x2501a2be5575f2f6) /* 576 */, U64_C(0x1b2f74004e7e8ba9) /* 577 */, + U64_C(0x1cd7580371e8d953) /* 578 */, U64_C(0x7f6ed89562764e30) /* 579 */, + U64_C(0xb15926ff596f003d) /* 580 */, U64_C(0x9f65293da8c5d6b9) /* 581 */, + U64_C(0x6ecef04dd690f84c) /* 582 */, U64_C(0x4782275fff33af88) /* 583 */, + U64_C(0xe41433083f820801) /* 584 */, U64_C(0xfd0dfe409a1af9b5) /* 585 */, + U64_C(0x4325a3342cdb396b) /* 586 */, U64_C(0x8ae77e62b301b252) /* 587 */, + U64_C(0xc36f9e9f6655615a) /* 588 */, U64_C(0x85455a2d92d32c09) /* 589 */, + U64_C(0xf2c7dea949477485) /* 590 */, U64_C(0x63cfb4c133a39eba) /* 591 */, + U64_C(0x83b040cc6ebc5462) /* 592 */, U64_C(0x3b9454c8fdb326b0) /* 593 */, + U64_C(0x56f56a9e87ffd78c) /* 594 */, U64_C(0x2dc2940d99f42bc6) /* 595 */, + U64_C(0x98f7df096b096e2d) /* 596 */, U64_C(0x19a6e01e3ad852bf) /* 597 */, + U64_C(0x42a99ccbdbd4b40b) /* 598 */, U64_C(0xa59998af45e9c559) /* 599 */, + U64_C(0x366295e807d93186) /* 600 */, U64_C(0x6b48181bfaa1f773) /* 601 */, + U64_C(0x1fec57e2157a0a1d) /* 602 */, U64_C(0x4667446af6201ad5) /* 603 */, + U64_C(0xe615ebcacfb0f075) /* 604 */, U64_C(0xb8f31f4f68290778) /* 605 */, + U64_C(0x22713ed6ce22d11e) /* 606 */, U64_C(0x3057c1a72ec3c93b) /* 607 */, + U64_C(0xcb46acc37c3f1f2f) /* 608 */, U64_C(0xdbb893fd02aaf50e) /* 609 */, + U64_C(0x331fd92e600b9fcf) /* 610 */, U64_C(0xa498f96148ea3ad6) /* 611 */, + U64_C(0xa8d8426e8b6a83ea) /* 612 */, U64_C(0xa089b274b7735cdc) /* 613 */, + U64_C(0x87f6b3731e524a11) /* 614 */, U64_C(0x118808e5cbc96749) /* 615 */, + U64_C(0x9906e4c7b19bd394) /* 616 */, U64_C(0xafed7f7e9b24a20c) /* 617 */, + U64_C(0x6509eadeeb3644a7) /* 618 */, U64_C(0x6c1ef1d3e8ef0ede) /* 619 */, + U64_C(0xb9c97d43e9798fb4) /* 620 */, U64_C(0xa2f2d784740c28a3) /* 621 */, + U64_C(0x7b8496476197566f) /* 622 */, U64_C(0x7a5be3e6b65f069d) /* 623 */, + U64_C(0xf96330ed78be6f10) /* 624 */, U64_C(0xeee60de77a076a15) /* 625 */, + U64_C(0x2b4bee4aa08b9bd0) /* 626 */, U64_C(0x6a56a63ec7b8894e) /* 627 */, + U64_C(0x02121359ba34fef4) /* 628 */, U64_C(0x4cbf99f8283703fc) /* 629 */, + U64_C(0x398071350caf30c8) /* 630 */, U64_C(0xd0a77a89f017687a) /* 631 */, + U64_C(0xf1c1a9eb9e423569) /* 632 */, U64_C(0x8c7976282dee8199) /* 633 */, + U64_C(0x5d1737a5dd1f7abd) /* 634 */, U64_C(0x4f53433c09a9fa80) /* 635 */, + U64_C(0xfa8b0c53df7ca1d9) /* 636 */, U64_C(0x3fd9dcbc886ccb77) /* 637 */, + U64_C(0xc040917ca91b4720) /* 638 */, U64_C(0x7dd00142f9d1dcdf) /* 639 */, + U64_C(0x8476fc1d4f387b58) /* 640 */, U64_C(0x23f8e7c5f3316503) /* 641 */, + U64_C(0x032a2244e7e37339) /* 642 */, U64_C(0x5c87a5d750f5a74b) /* 643 */, + U64_C(0x082b4cc43698992e) /* 644 */, U64_C(0xdf917becb858f63c) /* 645 */, + U64_C(0x3270b8fc5bf86dda) /* 646 */, U64_C(0x10ae72bb29b5dd76) /* 647 */, + U64_C(0x576ac94e7700362b) /* 648 */, U64_C(0x1ad112dac61efb8f) /* 649 */, + U64_C(0x691bc30ec5faa427) /* 650 */, U64_C(0xff246311cc327143) /* 651 */, + U64_C(0x3142368e30e53206) /* 652 */, U64_C(0x71380e31e02ca396) /* 653 */, + U64_C(0x958d5c960aad76f1) /* 654 */, U64_C(0xf8d6f430c16da536) /* 655 */, + U64_C(0xc8ffd13f1be7e1d2) /* 656 */, U64_C(0x7578ae66004ddbe1) /* 657 */, + U64_C(0x05833f01067be646) /* 658 */, U64_C(0xbb34b5ad3bfe586d) /* 659 */, + U64_C(0x095f34c9a12b97f0) /* 660 */, U64_C(0x247ab64525d60ca8) /* 661 */, + U64_C(0xdcdbc6f3017477d1) /* 662 */, U64_C(0x4a2e14d4decad24d) /* 663 */, + U64_C(0xbdb5e6d9be0a1eeb) /* 664 */, U64_C(0x2a7e70f7794301ab) /* 665 */, + U64_C(0xdef42d8a270540fd) /* 666 */, U64_C(0x01078ec0a34c22c1) /* 667 */, + U64_C(0xe5de511af4c16387) /* 668 */, U64_C(0x7ebb3a52bd9a330a) /* 669 */, + U64_C(0x77697857aa7d6435) /* 670 */, U64_C(0x004e831603ae4c32) /* 671 */, + U64_C(0xe7a21020ad78e312) /* 672 */, U64_C(0x9d41a70c6ab420f2) /* 673 */, + U64_C(0x28e06c18ea1141e6) /* 674 */, U64_C(0xd2b28cbd984f6b28) /* 675 */, + U64_C(0x26b75f6c446e9d83) /* 676 */, U64_C(0xba47568c4d418d7f) /* 677 */, + U64_C(0xd80badbfe6183d8e) /* 678 */, U64_C(0x0e206d7f5f166044) /* 679 */, + U64_C(0xe258a43911cbca3e) /* 680 */, U64_C(0x723a1746b21dc0bc) /* 681 */, + U64_C(0xc7caa854f5d7cdd3) /* 682 */, U64_C(0x7cac32883d261d9c) /* 683 */, + U64_C(0x7690c26423ba942c) /* 684 */, U64_C(0x17e55524478042b8) /* 685 */, + U64_C(0xe0be477656a2389f) /* 686 */, U64_C(0x4d289b5e67ab2da0) /* 687 */, + U64_C(0x44862b9c8fbbfd31) /* 688 */, U64_C(0xb47cc8049d141365) /* 689 */, + U64_C(0x822c1b362b91c793) /* 690 */, U64_C(0x4eb14655fb13dfd8) /* 691 */, + U64_C(0x1ecbba0714e2a97b) /* 692 */, U64_C(0x6143459d5cde5f14) /* 693 */, + U64_C(0x53a8fbf1d5f0ac89) /* 694 */, U64_C(0x97ea04d81c5e5b00) /* 695 */, + U64_C(0x622181a8d4fdb3f3) /* 696 */, U64_C(0xe9bcd341572a1208) /* 697 */, + U64_C(0x1411258643cce58a) /* 698 */, U64_C(0x9144c5fea4c6e0a4) /* 699 */, + U64_C(0x0d33d06565cf620f) /* 700 */, U64_C(0x54a48d489f219ca1) /* 701 */, + U64_C(0xc43e5eac6d63c821) /* 702 */, U64_C(0xa9728b3a72770daf) /* 703 */, + U64_C(0xd7934e7b20df87ef) /* 704 */, U64_C(0xe35503b61a3e86e5) /* 705 */, + U64_C(0xcae321fbc819d504) /* 706 */, U64_C(0x129a50b3ac60bfa6) /* 707 */, + U64_C(0xcd5e68ea7e9fb6c3) /* 708 */, U64_C(0xb01c90199483b1c7) /* 709 */, + U64_C(0x3de93cd5c295376c) /* 710 */, U64_C(0xaed52edf2ab9ad13) /* 711 */, + U64_C(0x2e60f512c0a07884) /* 712 */, U64_C(0xbc3d86a3e36210c9) /* 713 */, + U64_C(0x35269d9b163951ce) /* 714 */, U64_C(0x0c7d6e2ad0cdb5fa) /* 715 */, + U64_C(0x59e86297d87f5733) /* 716 */, U64_C(0x298ef221898db0e7) /* 717 */, + U64_C(0x55000029d1a5aa7e) /* 718 */, U64_C(0x8bc08ae1b5061b45) /* 719 */, + U64_C(0xc2c31c2b6c92703a) /* 720 */, U64_C(0x94cc596baf25ef42) /* 721 */, + U64_C(0x0a1d73db22540456) /* 722 */, U64_C(0x04b6a0f9d9c4179a) /* 723 */, + U64_C(0xeffdafa2ae3d3c60) /* 724 */, U64_C(0xf7c8075bb49496c4) /* 725 */, + U64_C(0x9cc5c7141d1cd4e3) /* 726 */, U64_C(0x78bd1638218e5534) /* 727 */, + U64_C(0xb2f11568f850246a) /* 728 */, U64_C(0xedfabcfa9502bc29) /* 729 */, + U64_C(0x796ce5f2da23051b) /* 730 */, U64_C(0xaae128b0dc93537c) /* 731 */, + U64_C(0x3a493da0ee4b29ae) /* 732 */, U64_C(0xb5df6b2c416895d7) /* 733 */, + U64_C(0xfcabbd25122d7f37) /* 734 */, U64_C(0x70810b58105dc4b1) /* 735 */, + U64_C(0xe10fdd37f7882a90) /* 736 */, U64_C(0x524dcab5518a3f5c) /* 737 */, + U64_C(0x3c9e85878451255b) /* 738 */, U64_C(0x4029828119bd34e2) /* 739 */, + U64_C(0x74a05b6f5d3ceccb) /* 740 */, U64_C(0xb610021542e13eca) /* 741 */, + U64_C(0x0ff979d12f59e2ac) /* 742 */, U64_C(0x6037da27e4f9cc50) /* 743 */, + U64_C(0x5e92975a0df1847d) /* 744 */, U64_C(0xd66de190d3e623fe) /* 745 */, + U64_C(0x5032d6b87b568048) /* 746 */, U64_C(0x9a36b7ce8235216e) /* 747 */, + U64_C(0x80272a7a24f64b4a) /* 748 */, U64_C(0x93efed8b8c6916f7) /* 749 */, + U64_C(0x37ddbff44cce1555) /* 750 */, U64_C(0x4b95db5d4b99bd25) /* 751 */, + U64_C(0x92d3fda169812fc0) /* 752 */, U64_C(0xfb1a4a9a90660bb6) /* 753 */, + U64_C(0x730c196946a4b9b2) /* 754 */, U64_C(0x81e289aa7f49da68) /* 755 */, + U64_C(0x64669a0f83b1a05f) /* 756 */, U64_C(0x27b3ff7d9644f48b) /* 757 */, + U64_C(0xcc6b615c8db675b3) /* 758 */, U64_C(0x674f20b9bcebbe95) /* 759 */, + U64_C(0x6f31238275655982) /* 760 */, U64_C(0x5ae488713e45cf05) /* 761 */, + U64_C(0xbf619f9954c21157) /* 762 */, U64_C(0xeabac46040a8eae9) /* 763 */, + U64_C(0x454c6fe9f2c0c1cd) /* 764 */, U64_C(0x419cf6496412691c) /* 765 */, + U64_C(0xd3dc3bef265b0f70) /* 766 */, U64_C(0x6d0e60f5c3578a9e) /* 767 */ }; static u64 sbox4[256] = { - 0x5b0e608526323c55LL /* 768 */, 0x1a46c1a9fa1b59f5LL /* 769 */, - 0xa9e245a17c4c8ffaLL /* 770 */, 0x65ca5159db2955d7LL /* 771 */, - 0x05db0a76ce35afc2LL /* 772 */, 0x81eac77ea9113d45LL /* 773 */, - 0x528ef88ab6ac0a0dLL /* 774 */, 0xa09ea253597be3ffLL /* 775 */, - 0x430ddfb3ac48cd56LL /* 776 */, 0xc4b3a67af45ce46fLL /* 777 */, - 0x4ececfd8fbe2d05eLL /* 778 */, 0x3ef56f10b39935f0LL /* 779 */, - 0x0b22d6829cd619c6LL /* 780 */, 0x17fd460a74df2069LL /* 781 */, - 0x6cf8cc8e8510ed40LL /* 782 */, 0xd6c824bf3a6ecaa7LL /* 783 */, - 0x61243d581a817049LL /* 784 */, 0x048bacb6bbc163a2LL /* 785 */, - 0xd9a38ac27d44cc32LL /* 786 */, 0x7fddff5baaf410abLL /* 787 */, - 0xad6d495aa804824bLL /* 788 */, 0xe1a6a74f2d8c9f94LL /* 789 */, - 0xd4f7851235dee8e3LL /* 790 */, 0xfd4b7f886540d893LL /* 791 */, - 0x247c20042aa4bfdaLL /* 792 */, 0x096ea1c517d1327cLL /* 793 */, - 0xd56966b4361a6685LL /* 794 */, 0x277da5c31221057dLL /* 795 */, - 0x94d59893a43acff7LL /* 796 */, 0x64f0c51ccdc02281LL /* 797 */, - 0x3d33bcc4ff6189dbLL /* 798 */, 0xe005cb184ce66af1LL /* 799 */, - 0xff5ccd1d1db99beaLL /* 800 */, 0xb0b854a7fe42980fLL /* 801 */, - 0x7bd46a6a718d4b9fLL /* 802 */, 0xd10fa8cc22a5fd8cLL /* 803 */, - 0xd31484952be4bd31LL /* 804 */, 0xc7fa975fcb243847LL /* 805 */, - 0x4886ed1e5846c407LL /* 806 */, 0x28cddb791eb70b04LL /* 807 */, - 0xc2b00be2f573417fLL /* 808 */, 0x5c9590452180f877LL /* 809 */, - 0x7a6bddfff370eb00LL /* 810 */, 0xce509e38d6d9d6a4LL /* 811 */, - 0xebeb0f00647fa702LL /* 812 */, 0x1dcc06cf76606f06LL /* 813 */, - 0xe4d9f28ba286ff0aLL /* 814 */, 0xd85a305dc918c262LL /* 815 */, - 0x475b1d8732225f54LL /* 816 */, 0x2d4fb51668ccb5feLL /* 817 */, - 0xa679b9d9d72bba20LL /* 818 */, 0x53841c0d912d43a5LL /* 819 */, - 0x3b7eaa48bf12a4e8LL /* 820 */, 0x781e0e47f22f1ddfLL /* 821 */, - 0xeff20ce60ab50973LL /* 822 */, 0x20d261d19dffb742LL /* 823 */, - 0x16a12b03062a2e39LL /* 824 */, 0x1960eb2239650495LL /* 825 */, - 0x251c16fed50eb8b8LL /* 826 */, 0x9ac0c330f826016eLL /* 827 */, - 0xed152665953e7671LL /* 828 */, 0x02d63194a6369570LL /* 829 */, - 0x5074f08394b1c987LL /* 830 */, 0x70ba598c90b25ce1LL /* 831 */, - 0x794a15810b9742f6LL /* 832 */, 0x0d5925e9fcaf8c6cLL /* 833 */, - 0x3067716cd868744eLL /* 834 */, 0x910ab077e8d7731bLL /* 835 */, - 0x6a61bbdb5ac42f61LL /* 836 */, 0x93513efbf0851567LL /* 837 */, - 0xf494724b9e83e9d5LL /* 838 */, 0xe887e1985c09648dLL /* 839 */, - 0x34b1d3c675370cfdLL /* 840 */, 0xdc35e433bc0d255dLL /* 841 */, - 0xd0aab84234131be0LL /* 842 */, 0x08042a50b48b7eafLL /* 843 */, - 0x9997c4ee44a3ab35LL /* 844 */, 0x829a7b49201799d0LL /* 845 */, - 0x263b8307b7c54441LL /* 846 */, 0x752f95f4fd6a6ca6LL /* 847 */, - 0x927217402c08c6e5LL /* 848 */, 0x2a8ab754a795d9eeLL /* 849 */, - 0xa442f7552f72943dLL /* 850 */, 0x2c31334e19781208LL /* 851 */, - 0x4fa98d7ceaee6291LL /* 852 */, 0x55c3862f665db309LL /* 853 */, - 0xbd0610175d53b1f3LL /* 854 */, 0x46fe6cb840413f27LL /* 855 */, - 0x3fe03792df0cfa59LL /* 856 */, 0xcfe700372eb85e8fLL /* 857 */, - 0xa7be29e7adbce118LL /* 858 */, 0xe544ee5cde8431ddLL /* 859 */, - 0x8a781b1b41f1873eLL /* 860 */, 0xa5c94c78a0d2f0e7LL /* 861 */, - 0x39412e2877b60728LL /* 862 */, 0xa1265ef3afc9a62cLL /* 863 */, - 0xbcc2770c6a2506c5LL /* 864 */, 0x3ab66dd5dce1ce12LL /* 865 */, - 0xe65499d04a675b37LL /* 866 */, 0x7d8f523481bfd216LL /* 867 */, - 0x0f6f64fcec15f389LL /* 868 */, 0x74efbe618b5b13c8LL /* 869 */, - 0xacdc82b714273e1dLL /* 870 */, 0xdd40bfe003199d17LL /* 871 */, - 0x37e99257e7e061f8LL /* 872 */, 0xfa52626904775aaaLL /* 873 */, - 0x8bbbf63a463d56f9LL /* 874 */, 0xf0013f1543a26e64LL /* 875 */, - 0xa8307e9f879ec898LL /* 876 */, 0xcc4c27a4150177ccLL /* 877 */, - 0x1b432f2cca1d3348LL /* 878 */, 0xde1d1f8f9f6fa013LL /* 879 */, - 0x606602a047a7ddd6LL /* 880 */, 0xd237ab64cc1cb2c7LL /* 881 */, - 0x9b938e7225fcd1d3LL /* 882 */, 0xec4e03708e0ff476LL /* 883 */, - 0xfeb2fbda3d03c12dLL /* 884 */, 0xae0bced2ee43889aLL /* 885 */, - 0x22cb8923ebfb4f43LL /* 886 */, 0x69360d013cf7396dLL /* 887 */, - 0x855e3602d2d4e022LL /* 888 */, 0x073805bad01f784cLL /* 889 */, - 0x33e17a133852f546LL /* 890 */, 0xdf4874058ac7b638LL /* 891 */, - 0xba92b29c678aa14aLL /* 892 */, 0x0ce89fc76cfaadcdLL /* 893 */, - 0x5f9d4e0908339e34LL /* 894 */, 0xf1afe9291f5923b9LL /* 895 */, - 0x6e3480f60f4a265fLL /* 896 */, 0xeebf3a2ab29b841cLL /* 897 */, - 0xe21938a88f91b4adLL /* 898 */, 0x57dfeff845c6d3c3LL /* 899 */, - 0x2f006b0bf62caaf2LL /* 900 */, 0x62f479ef6f75ee78LL /* 901 */, - 0x11a55ad41c8916a9LL /* 902 */, 0xf229d29084fed453LL /* 903 */, - 0x42f1c27b16b000e6LL /* 904 */, 0x2b1f76749823c074LL /* 905 */, - 0x4b76eca3c2745360LL /* 906 */, 0x8c98f463b91691bdLL /* 907 */, - 0x14bcc93cf1ade66aLL /* 908 */, 0x8885213e6d458397LL /* 909 */, - 0x8e177df0274d4711LL /* 910 */, 0xb49b73b5503f2951LL /* 911 */, - 0x10168168c3f96b6bLL /* 912 */, 0x0e3d963b63cab0aeLL /* 913 */, - 0x8dfc4b5655a1db14LL /* 914 */, 0xf789f1356e14de5cLL /* 915 */, - 0x683e68af4e51dac1LL /* 916 */, 0xc9a84f9d8d4b0fd9LL /* 917 */, - 0x3691e03f52a0f9d1LL /* 918 */, 0x5ed86e46e1878e80LL /* 919 */, - 0x3c711a0e99d07150LL /* 920 */, 0x5a0865b20c4e9310LL /* 921 */, - 0x56fbfc1fe4f0682eLL /* 922 */, 0xea8d5de3105edf9bLL /* 923 */, - 0x71abfdb12379187aLL /* 924 */, 0x2eb99de1bee77b9cLL /* 925 */, - 0x21ecc0ea33cf4523LL /* 926 */, 0x59a4d7521805c7a1LL /* 927 */, - 0x3896f5eb56ae7c72LL /* 928 */, 0xaa638f3db18f75dcLL /* 929 */, - 0x9f39358dabe9808eLL /* 930 */, 0xb7defa91c00b72acLL /* 931 */, - 0x6b5541fd62492d92LL /* 932 */, 0x6dc6dee8f92e4d5bLL /* 933 */, - 0x353f57abc4beea7eLL /* 934 */, 0x735769d6da5690ceLL /* 935 */, - 0x0a234aa642391484LL /* 936 */, 0xf6f9508028f80d9dLL /* 937 */, - 0xb8e319a27ab3f215LL /* 938 */, 0x31ad9c1151341a4dLL /* 939 */, - 0x773c22a57bef5805LL /* 940 */, 0x45c7561a07968633LL /* 941 */, - 0xf913da9e249dbe36LL /* 942 */, 0xda652d9b78a64c68LL /* 943 */, - 0x4c27a97f3bc334efLL /* 944 */, 0x76621220e66b17f4LL /* 945 */, - 0x967743899acd7d0bLL /* 946 */, 0xf3ee5bcae0ed6782LL /* 947 */, - 0x409f753600c879fcLL /* 948 */, 0x06d09a39b5926db6LL /* 949 */, - 0x6f83aeb0317ac588LL /* 950 */, 0x01e6ca4a86381f21LL /* 951 */, - 0x66ff3462d19f3025LL /* 952 */, 0x72207c24ddfd3bfbLL /* 953 */, - 0x4af6b6d3e2ece2ebLL /* 954 */, 0x9c994dbec7ea08deLL /* 955 */, - 0x49ace597b09a8bc4LL /* 956 */, 0xb38c4766cf0797baLL /* 957 */, - 0x131b9373c57c2a75LL /* 958 */, 0xb1822cce61931e58LL /* 959 */, - 0x9d7555b909ba1c0cLL /* 960 */, 0x127fafdd937d11d2LL /* 961 */, - 0x29da3badc66d92e4LL /* 962 */, 0xa2c1d57154c2ecbcLL /* 963 */, - 0x58c5134d82f6fe24LL /* 964 */, 0x1c3ae3515b62274fLL /* 965 */, - 0xe907c82e01cb8126LL /* 966 */, 0xf8ed091913e37fcbLL /* 967 */, - 0x3249d8f9c80046c9LL /* 968 */, 0x80cf9bede388fb63LL /* 969 */, - 0x1881539a116cf19eLL /* 970 */, 0x5103f3f76bd52457LL /* 971 */, - 0x15b7e6f5ae47f7a8LL /* 972 */, 0xdbd7c6ded47e9ccfLL /* 973 */, - 0x44e55c410228bb1aLL /* 974 */, 0xb647d4255edb4e99LL /* 975 */, - 0x5d11882bb8aafc30LL /* 976 */, 0xf5098bbb29d3212aLL /* 977 */, - 0x8fb5ea14e90296b3LL /* 978 */, 0x677b942157dd025aLL /* 979 */, - 0xfb58e7c0a390acb5LL /* 980 */, 0x89d3674c83bd4a01LL /* 981 */, - 0x9e2da4df4bf3b93bLL /* 982 */, 0xfcc41e328cab4829LL /* 983 */, - 0x03f38c96ba582c52LL /* 984 */, 0xcad1bdbd7fd85db2LL /* 985 */, - 0xbbb442c16082ae83LL /* 986 */, 0xb95fe86ba5da9ab0LL /* 987 */, - 0xb22e04673771a93fLL /* 988 */, 0x845358c9493152d8LL /* 989 */, - 0xbe2a488697b4541eLL /* 990 */, 0x95a2dc2dd38e6966LL /* 991 */, - 0xc02c11ac923c852bLL /* 992 */, 0x2388b1990df2a87bLL /* 993 */, - 0x7c8008fa1b4f37beLL /* 994 */, 0x1f70d0c84d54e503LL /* 995 */, - 0x5490adec7ece57d4LL /* 996 */, 0x002b3c27d9063a3aLL /* 997 */, - 0x7eaea3848030a2bfLL /* 998 */, 0xc602326ded2003c0LL /* 999 */, - 0x83a7287d69a94086LL /* 1000 */, 0xc57a5fcb30f57a8aLL /* 1001 */, - 0xb56844e479ebe779LL /* 1002 */, 0xa373b40f05dcbce9LL /* 1003 */, - 0xd71a786e88570ee2LL /* 1004 */, 0x879cbacdbde8f6a0LL /* 1005 */, - 0x976ad1bcc164a32fLL /* 1006 */, 0xab21e25e9666d78bLL /* 1007 */, - 0x901063aae5e5c33cLL /* 1008 */, 0x9818b34448698d90LL /* 1009 */, - 0xe36487ae3e1e8abbLL /* 1010 */, 0xafbdf931893bdcb4LL /* 1011 */, - 0x6345a0dc5fbbd519LL /* 1012 */, 0x8628fe269b9465caLL /* 1013 */, - 0x1e5d01603f9c51ecLL /* 1014 */, 0x4de44006a15049b7LL /* 1015 */, - 0xbf6c70e5f776cbb1LL /* 1016 */, 0x411218f2ef552bedLL /* 1017 */, - 0xcb0c0708705a36a3LL /* 1018 */, 0xe74d14754f986044LL /* 1019 */, - 0xcd56d9430ea8280eLL /* 1020 */, 0xc12591d7535f5065LL /* 1021 */, - 0xc83223f1720aef96LL /* 1022 */, 0xc3a0396f7363a51fLL /* 1023 */ + U64_C(0x5b0e608526323c55) /* 768 */, U64_C(0x1a46c1a9fa1b59f5) /* 769 */, + U64_C(0xa9e245a17c4c8ffa) /* 770 */, U64_C(0x65ca5159db2955d7) /* 771 */, + U64_C(0x05db0a76ce35afc2) /* 772 */, U64_C(0x81eac77ea9113d45) /* 773 */, + U64_C(0x528ef88ab6ac0a0d) /* 774 */, U64_C(0xa09ea253597be3ff) /* 775 */, + U64_C(0x430ddfb3ac48cd56) /* 776 */, U64_C(0xc4b3a67af45ce46f) /* 777 */, + U64_C(0x4ececfd8fbe2d05e) /* 778 */, U64_C(0x3ef56f10b39935f0) /* 779 */, + U64_C(0x0b22d6829cd619c6) /* 780 */, U64_C(0x17fd460a74df2069) /* 781 */, + U64_C(0x6cf8cc8e8510ed40) /* 782 */, U64_C(0xd6c824bf3a6ecaa7) /* 783 */, + U64_C(0x61243d581a817049) /* 784 */, U64_C(0x048bacb6bbc163a2) /* 785 */, + U64_C(0xd9a38ac27d44cc32) /* 786 */, U64_C(0x7fddff5baaf410ab) /* 787 */, + U64_C(0xad6d495aa804824b) /* 788 */, U64_C(0xe1a6a74f2d8c9f94) /* 789 */, + U64_C(0xd4f7851235dee8e3) /* 790 */, U64_C(0xfd4b7f886540d893) /* 791 */, + U64_C(0x247c20042aa4bfda) /* 792 */, U64_C(0x096ea1c517d1327c) /* 793 */, + U64_C(0xd56966b4361a6685) /* 794 */, U64_C(0x277da5c31221057d) /* 795 */, + U64_C(0x94d59893a43acff7) /* 796 */, U64_C(0x64f0c51ccdc02281) /* 797 */, + U64_C(0x3d33bcc4ff6189db) /* 798 */, U64_C(0xe005cb184ce66af1) /* 799 */, + U64_C(0xff5ccd1d1db99bea) /* 800 */, U64_C(0xb0b854a7fe42980f) /* 801 */, + U64_C(0x7bd46a6a718d4b9f) /* 802 */, U64_C(0xd10fa8cc22a5fd8c) /* 803 */, + U64_C(0xd31484952be4bd31) /* 804 */, U64_C(0xc7fa975fcb243847) /* 805 */, + U64_C(0x4886ed1e5846c407) /* 806 */, U64_C(0x28cddb791eb70b04) /* 807 */, + U64_C(0xc2b00be2f573417f) /* 808 */, U64_C(0x5c9590452180f877) /* 809 */, + U64_C(0x7a6bddfff370eb00) /* 810 */, U64_C(0xce509e38d6d9d6a4) /* 811 */, + U64_C(0xebeb0f00647fa702) /* 812 */, U64_C(0x1dcc06cf76606f06) /* 813 */, + U64_C(0xe4d9f28ba286ff0a) /* 814 */, U64_C(0xd85a305dc918c262) /* 815 */, + U64_C(0x475b1d8732225f54) /* 816 */, U64_C(0x2d4fb51668ccb5fe) /* 817 */, + U64_C(0xa679b9d9d72bba20) /* 818 */, U64_C(0x53841c0d912d43a5) /* 819 */, + U64_C(0x3b7eaa48bf12a4e8) /* 820 */, U64_C(0x781e0e47f22f1ddf) /* 821 */, + U64_C(0xeff20ce60ab50973) /* 822 */, U64_C(0x20d261d19dffb742) /* 823 */, + U64_C(0x16a12b03062a2e39) /* 824 */, U64_C(0x1960eb2239650495) /* 825 */, + U64_C(0x251c16fed50eb8b8) /* 826 */, U64_C(0x9ac0c330f826016e) /* 827 */, + U64_C(0xed152665953e7671) /* 828 */, U64_C(0x02d63194a6369570) /* 829 */, + U64_C(0x5074f08394b1c987) /* 830 */, U64_C(0x70ba598c90b25ce1) /* 831 */, + U64_C(0x794a15810b9742f6) /* 832 */, U64_C(0x0d5925e9fcaf8c6c) /* 833 */, + U64_C(0x3067716cd868744e) /* 834 */, U64_C(0x910ab077e8d7731b) /* 835 */, + U64_C(0x6a61bbdb5ac42f61) /* 836 */, U64_C(0x93513efbf0851567) /* 837 */, + U64_C(0xf494724b9e83e9d5) /* 838 */, U64_C(0xe887e1985c09648d) /* 839 */, + U64_C(0x34b1d3c675370cfd) /* 840 */, U64_C(0xdc35e433bc0d255d) /* 841 */, + U64_C(0xd0aab84234131be0) /* 842 */, U64_C(0x08042a50b48b7eaf) /* 843 */, + U64_C(0x9997c4ee44a3ab35) /* 844 */, U64_C(0x829a7b49201799d0) /* 845 */, + U64_C(0x263b8307b7c54441) /* 846 */, U64_C(0x752f95f4fd6a6ca6) /* 847 */, + U64_C(0x927217402c08c6e5) /* 848 */, U64_C(0x2a8ab754a795d9ee) /* 849 */, + U64_C(0xa442f7552f72943d) /* 850 */, U64_C(0x2c31334e19781208) /* 851 */, + U64_C(0x4fa98d7ceaee6291) /* 852 */, U64_C(0x55c3862f665db309) /* 853 */, + U64_C(0xbd0610175d53b1f3) /* 854 */, U64_C(0x46fe6cb840413f27) /* 855 */, + U64_C(0x3fe03792df0cfa59) /* 856 */, U64_C(0xcfe700372eb85e8f) /* 857 */, + U64_C(0xa7be29e7adbce118) /* 858 */, U64_C(0xe544ee5cde8431dd) /* 859 */, + U64_C(0x8a781b1b41f1873e) /* 860 */, U64_C(0xa5c94c78a0d2f0e7) /* 861 */, + U64_C(0x39412e2877b60728) /* 862 */, U64_C(0xa1265ef3afc9a62c) /* 863 */, + U64_C(0xbcc2770c6a2506c5) /* 864 */, U64_C(0x3ab66dd5dce1ce12) /* 865 */, + U64_C(0xe65499d04a675b37) /* 866 */, U64_C(0x7d8f523481bfd216) /* 867 */, + U64_C(0x0f6f64fcec15f389) /* 868 */, U64_C(0x74efbe618b5b13c8) /* 869 */, + U64_C(0xacdc82b714273e1d) /* 870 */, U64_C(0xdd40bfe003199d17) /* 871 */, + U64_C(0x37e99257e7e061f8) /* 872 */, U64_C(0xfa52626904775aaa) /* 873 */, + U64_C(0x8bbbf63a463d56f9) /* 874 */, U64_C(0xf0013f1543a26e64) /* 875 */, + U64_C(0xa8307e9f879ec898) /* 876 */, U64_C(0xcc4c27a4150177cc) /* 877 */, + U64_C(0x1b432f2cca1d3348) /* 878 */, U64_C(0xde1d1f8f9f6fa013) /* 879 */, + U64_C(0x606602a047a7ddd6) /* 880 */, U64_C(0xd237ab64cc1cb2c7) /* 881 */, + U64_C(0x9b938e7225fcd1d3) /* 882 */, U64_C(0xec4e03708e0ff476) /* 883 */, + U64_C(0xfeb2fbda3d03c12d) /* 884 */, U64_C(0xae0bced2ee43889a) /* 885 */, + U64_C(0x22cb8923ebfb4f43) /* 886 */, U64_C(0x69360d013cf7396d) /* 887 */, + U64_C(0x855e3602d2d4e022) /* 888 */, U64_C(0x073805bad01f784c) /* 889 */, + U64_C(0x33e17a133852f546) /* 890 */, U64_C(0xdf4874058ac7b638) /* 891 */, + U64_C(0xba92b29c678aa14a) /* 892 */, U64_C(0x0ce89fc76cfaadcd) /* 893 */, + U64_C(0x5f9d4e0908339e34) /* 894 */, U64_C(0xf1afe9291f5923b9) /* 895 */, + U64_C(0x6e3480f60f4a265f) /* 896 */, U64_C(0xeebf3a2ab29b841c) /* 897 */, + U64_C(0xe21938a88f91b4ad) /* 898 */, U64_C(0x57dfeff845c6d3c3) /* 899 */, + U64_C(0x2f006b0bf62caaf2) /* 900 */, U64_C(0x62f479ef6f75ee78) /* 901 */, + U64_C(0x11a55ad41c8916a9) /* 902 */, U64_C(0xf229d29084fed453) /* 903 */, + U64_C(0x42f1c27b16b000e6) /* 904 */, U64_C(0x2b1f76749823c074) /* 905 */, + U64_C(0x4b76eca3c2745360) /* 906 */, U64_C(0x8c98f463b91691bd) /* 907 */, + U64_C(0x14bcc93cf1ade66a) /* 908 */, U64_C(0x8885213e6d458397) /* 909 */, + U64_C(0x8e177df0274d4711) /* 910 */, U64_C(0xb49b73b5503f2951) /* 911 */, + U64_C(0x10168168c3f96b6b) /* 912 */, U64_C(0x0e3d963b63cab0ae) /* 913 */, + U64_C(0x8dfc4b5655a1db14) /* 914 */, U64_C(0xf789f1356e14de5c) /* 915 */, + U64_C(0x683e68af4e51dac1) /* 916 */, U64_C(0xc9a84f9d8d4b0fd9) /* 917 */, + U64_C(0x3691e03f52a0f9d1) /* 918 */, U64_C(0x5ed86e46e1878e80) /* 919 */, + U64_C(0x3c711a0e99d07150) /* 920 */, U64_C(0x5a0865b20c4e9310) /* 921 */, + U64_C(0x56fbfc1fe4f0682e) /* 922 */, U64_C(0xea8d5de3105edf9b) /* 923 */, + U64_C(0x71abfdb12379187a) /* 924 */, U64_C(0x2eb99de1bee77b9c) /* 925 */, + U64_C(0x21ecc0ea33cf4523) /* 926 */, U64_C(0x59a4d7521805c7a1) /* 927 */, + U64_C(0x3896f5eb56ae7c72) /* 928 */, U64_C(0xaa638f3db18f75dc) /* 929 */, + U64_C(0x9f39358dabe9808e) /* 930 */, U64_C(0xb7defa91c00b72ac) /* 931 */, + U64_C(0x6b5541fd62492d92) /* 932 */, U64_C(0x6dc6dee8f92e4d5b) /* 933 */, + U64_C(0x353f57abc4beea7e) /* 934 */, U64_C(0x735769d6da5690ce) /* 935 */, + U64_C(0x0a234aa642391484) /* 936 */, U64_C(0xf6f9508028f80d9d) /* 937 */, + U64_C(0xb8e319a27ab3f215) /* 938 */, U64_C(0x31ad9c1151341a4d) /* 939 */, + U64_C(0x773c22a57bef5805) /* 940 */, U64_C(0x45c7561a07968633) /* 941 */, + U64_C(0xf913da9e249dbe36) /* 942 */, U64_C(0xda652d9b78a64c68) /* 943 */, + U64_C(0x4c27a97f3bc334ef) /* 944 */, U64_C(0x76621220e66b17f4) /* 945 */, + U64_C(0x967743899acd7d0b) /* 946 */, U64_C(0xf3ee5bcae0ed6782) /* 947 */, + U64_C(0x409f753600c879fc) /* 948 */, U64_C(0x06d09a39b5926db6) /* 949 */, + U64_C(0x6f83aeb0317ac588) /* 950 */, U64_C(0x01e6ca4a86381f21) /* 951 */, + U64_C(0x66ff3462d19f3025) /* 952 */, U64_C(0x72207c24ddfd3bfb) /* 953 */, + U64_C(0x4af6b6d3e2ece2eb) /* 954 */, U64_C(0x9c994dbec7ea08de) /* 955 */, + U64_C(0x49ace597b09a8bc4) /* 956 */, U64_C(0xb38c4766cf0797ba) /* 957 */, + U64_C(0x131b9373c57c2a75) /* 958 */, U64_C(0xb1822cce61931e58) /* 959 */, + U64_C(0x9d7555b909ba1c0c) /* 960 */, U64_C(0x127fafdd937d11d2) /* 961 */, + U64_C(0x29da3badc66d92e4) /* 962 */, U64_C(0xa2c1d57154c2ecbc) /* 963 */, + U64_C(0x58c5134d82f6fe24) /* 964 */, U64_C(0x1c3ae3515b62274f) /* 965 */, + U64_C(0xe907c82e01cb8126) /* 966 */, U64_C(0xf8ed091913e37fcb) /* 967 */, + U64_C(0x3249d8f9c80046c9) /* 968 */, U64_C(0x80cf9bede388fb63) /* 969 */, + U64_C(0x1881539a116cf19e) /* 970 */, U64_C(0x5103f3f76bd52457) /* 971 */, + U64_C(0x15b7e6f5ae47f7a8) /* 972 */, U64_C(0xdbd7c6ded47e9ccf) /* 973 */, + U64_C(0x44e55c410228bb1a) /* 974 */, U64_C(0xb647d4255edb4e99) /* 975 */, + U64_C(0x5d11882bb8aafc30) /* 976 */, U64_C(0xf5098bbb29d3212a) /* 977 */, + U64_C(0x8fb5ea14e90296b3) /* 978 */, U64_C(0x677b942157dd025a) /* 979 */, + U64_C(0xfb58e7c0a390acb5) /* 980 */, U64_C(0x89d3674c83bd4a01) /* 981 */, + U64_C(0x9e2da4df4bf3b93b) /* 982 */, U64_C(0xfcc41e328cab4829) /* 983 */, + U64_C(0x03f38c96ba582c52) /* 984 */, U64_C(0xcad1bdbd7fd85db2) /* 985 */, + U64_C(0xbbb442c16082ae83) /* 986 */, U64_C(0xb95fe86ba5da9ab0) /* 987 */, + U64_C(0xb22e04673771a93f) /* 988 */, U64_C(0x845358c9493152d8) /* 989 */, + U64_C(0xbe2a488697b4541e) /* 990 */, U64_C(0x95a2dc2dd38e6966) /* 991 */, + U64_C(0xc02c11ac923c852b) /* 992 */, U64_C(0x2388b1990df2a87b) /* 993 */, + U64_C(0x7c8008fa1b4f37be) /* 994 */, U64_C(0x1f70d0c84d54e503) /* 995 */, + U64_C(0x5490adec7ece57d4) /* 996 */, U64_C(0x002b3c27d9063a3a) /* 997 */, + U64_C(0x7eaea3848030a2bf) /* 998 */, U64_C(0xc602326ded2003c0) /* 999 */, + U64_C(0x83a7287d69a94086) /* 1000 */, U64_C(0xc57a5fcb30f57a8a) /* 1001 */, + U64_C(0xb56844e479ebe779) /* 1002 */, U64_C(0xa373b40f05dcbce9) /* 1003 */, + U64_C(0xd71a786e88570ee2) /* 1004 */, U64_C(0x879cbacdbde8f6a0) /* 1005 */, + U64_C(0x976ad1bcc164a32f) /* 1006 */, U64_C(0xab21e25e9666d78b) /* 1007 */, + U64_C(0x901063aae5e5c33c) /* 1008 */, U64_C(0x9818b34448698d90) /* 1009 */, + U64_C(0xe36487ae3e1e8abb) /* 1010 */, U64_C(0xafbdf931893bdcb4) /* 1011 */, + U64_C(0x6345a0dc5fbbd519) /* 1012 */, U64_C(0x8628fe269b9465ca) /* 1013 */, + U64_C(0x1e5d01603f9c51ec) /* 1014 */, U64_C(0x4de44006a15049b7) /* 1015 */, + U64_C(0xbf6c70e5f776cbb1) /* 1016 */, U64_C(0x411218f2ef552bed) /* 1017 */, + U64_C(0xcb0c0708705a36a3) /* 1018 */, U64_C(0xe74d14754f986044) /* 1019 */, + U64_C(0xcd56d9430ea8280e) /* 1020 */, U64_C(0xc12591d7535f5065) /* 1021 */, + U64_C(0xc83223f1720aef96) /* 1022 */, U64_C(0xc3a0396f7363a51f) /* 1023 */ }; @@ -646,9 +644,9 @@ burn_stack (int bytes) static void tiger_init( TIGER_CONTEXT *hd ) { - hd->a = 0x0123456789abcdefLL; - hd->b = 0xfedcba9876543210LL; - hd->c = 0xf096a5b4c3b2e187LL; + hd->a = U64_C(0x0123456789abcdef); + hd->b = U64_C(0xfedcba9876543210); + hd->c = U64_C(0xf096a5b4c3b2e187); hd->nblocks = 0; hd->count = 0; } @@ -698,7 +696,7 @@ pass( u64 *ra, u64 *rb, u64 *rc, u64 *x, static void key_schedule( u64 *x ) { - x[0] -= x[7] ^ 0xa5a5a5a5a5a5a5a5LL; + x[0] -= x[7] ^ U64_C(0xa5a5a5a5a5a5a5a5); x[1] ^= x[0]; x[2] += x[1]; x[3] -= x[2] ^ ((~x[1]) << 19 ); @@ -713,7 +711,7 @@ key_schedule( u64 *x ) x[4] -= x[3] ^ ((~x[2]) >> 23 ); x[5] ^= x[4]; x[6] += x[5]; - x[7] -= x[6] ^ 0x0123456789abcdefLL; + x[7] -= x[6] ^ U64_C(0x0123456789abcdef); } @@ -725,8 +723,8 @@ transform( TIGER_CONTEXT *hd, byte *data { u64 a,b,c,aa,bb,cc; u64 x[8]; - #ifdef BIG_ENDIAN_HOST - #define MKWORD(d,n) \ +#ifdef BIG_ENDIAN_HOST +#define MKWORD(d,n) \ ( ((u64)(d)[8*(n)+7]) << 56 | ((u64)(d)[8*(n)+6]) << 48 \ | ((u64)(d)[8*(n)+5]) << 40 | ((u64)(d)[8*(n)+4]) << 32 \ | ((u64)(d)[8*(n)+3]) << 24 | ((u64)(d)[8*(n)+2]) << 16 \ @@ -739,10 +737,10 @@ transform( TIGER_CONTEXT *hd, byte *data x[5] = MKWORD(data, 5); x[6] = MKWORD(data, 6); x[7] = MKWORD(data, 7); - #undef MKWORD - #else +#undef MKWORD +#else memcpy( &x[0], data, 64 ); - #endif +#endif /* save */ a = aa = hd->a; @@ -859,18 +857,18 @@ tiger_final( TIGER_CONTEXT *hd ) burn_stack (21*8+11*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u64*)p = hd-> a ; p += 8; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd-> a >> 56; *p++ = hd-> a >> 48; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u64*)p = hd-> a ; p += 8; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd-> a >> 56; *p++ = hd-> a >> 48; \ *p++ = hd-> a >> 40; *p++ = hd-> a >> 32; \ *p++ = hd-> a >> 24; *p++ = hd-> a >> 16; \ *p++ = hd-> a >> 8; *p++ = hd-> a; } while(0) - #endif +#endif X(a); X(b); X(c); - #undef X +#undef X } static byte * @@ -879,8 +877,6 @@ tiger_read( TIGER_CONTEXT *hd ) return hd->buf; } -#endif /*HAVE_U64_TYPEDEF*/ - /**************** * Return some information about the algorithm. We need algo here to * distinguish different flavors of the algorithm. @@ -896,8 +892,6 @@ tiger_get_info( int algo, size_t *contex byte *(**r_read)( void *c ) ) { -#ifdef HAVE_U64_TYPEDEF - #ifdef USE_OLD_TIGER /* This is the old fake OID */ static byte asn[18] = @@ -907,8 +901,8 @@ tiger_get_info( int algo, size_t *contex /* This is the new correct OID */ static byte asn[19] = /* Object ID is 1.3.6.1.4.1.11591.12.2 */ { 0x30, 0x29, 0x30, 0x0d, 0x06, 0x09, 0x2b, 0x06, - 0x01, 0x04, 0x01, 0xda, 0x47, 0x0c, 0x02, - 0x05, 0x00, 0x04, 0x18 }; + 0x01, 0x04, 0x01, 0xda, 0x47, 0x0c, 0x02, + 0x05, 0x00, 0x04, 0x18 }; #endif if( algo != 6 ) @@ -924,7 +918,4 @@ tiger_get_info( int algo, size_t *contex *(byte *(**)(TIGER_CONTEXT *))r_read = tiger_read; return "TIGER192"; -#else /*!HAVE_U64_TYPEDEF*/ - return NULL; /* Alorithm not available. */ -#endif } diff -urpP gnupg-1.2.2/config.h.in gnupg-1.2.3/config.h.in --- gnupg-1.2.2/config.h.in 2003-05-01 14:36:34.000000000 +0000 +++ gnupg-1.2.3/config.h.in 2003-08-21 19:50:28.000000000 +0000 @@ -73,9 +73,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DIRECT_H -/* Define to 1 if you have the `dlopen' function. */ -#undef HAVE_DLOPEN - /* Defined when the dlopen function family is available */ #undef HAVE_DL_DLOPEN @@ -119,6 +116,9 @@ /* Define if you have the `gethrtime(2)' function. */ #undef HAVE_GETHRTIME +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE @@ -153,9 +153,6 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES -/* Define to 1 if you have the `dl' library (-ldl). */ -#undef HAVE_LIBDL - /* Define to 1 if you have the `rt' library (-lrt). */ #undef HAVE_LIBRT @@ -225,6 +222,9 @@ /* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK +/* Define to 1 if the system has the type `sigset_t'. */ +#undef HAVE_SIGSET_T + /* Define to 1 if you have the `stat' function. */ #undef HAVE_STAT @@ -247,6 +247,9 @@ /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP @@ -274,6 +277,9 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL +/* Define to 1 if the system has the type `struct sigaction'. */ +#undef HAVE_STRUCT_SIGACTION + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_CAPABILITY_H @@ -301,6 +307,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TERMIO_H +/* Define to 1 if you have the `times' function. */ +#undef HAVE_TIMES + /* Define to 1 if you have the `tsearch' function. */ #undef HAVE_TSEARCH @@ -388,7 +397,7 @@ /* Define to disable all external program execution */ #undef NO_EXEC -/* Name of this package */ +/* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ @@ -415,6 +424,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE +/* The size of a `uint64_t', as computed by sizeof. */ +#undef SIZEOF_UINT64_T + /* The size of a `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT @@ -478,10 +490,10 @@ systems lack Posix functions, we use a simplified version of gettext */ #undef USE_SIMPLE_GETTEXT -/* Define to include experimental TIGER/192 digest support */ +/* Define to include nonstandard TIGER/192 digest support */ #undef USE_TIGER -/* Version of this package */ +/* Version number of package */ #undef VERSION /* Defined if compiled symbols have a leading underscore */ @@ -490,9 +502,10 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Some tests rely on this (stpcpy) and it should be used for new programs - anyway */ -#undef _GNU_SOURCE +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ #undef _LARGEFILE_SOURCE diff -urpP gnupg-1.2.2/configure gnupg-1.2.3/configure --- gnupg-1.2.2/configure 2003-05-01 14:34:54.000000000 +0000 +++ gnupg-1.2.3/configure 2003-08-21 19:50:00.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for gnupg 1.2.2. +# Generated by GNU Autoconf 2.57 for gnupg 1.2.3. # # Report bugs to . # @@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gnupg' PACKAGE_TARNAME='gnupg' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='gnupg 1.2.2' +PACKAGE_VERSION='1.2.3' +PACKAGE_STRING='gnupg 1.2.3' PACKAGE_BUGREPORT='bug-gnupg@gnu.org' ac_unique_file="g10/g10.c" @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot IDEA_O TIGER_O SHA512_O MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB AR ac_ct_AR PERL DOCBOOK_TO_MAN HAVE_DOCBOOK_TO_MAN_TRUE HAVE_DOCBOOK_TO_MAN_FALSE FAQPROG WORKING_FAQPROG_TRUE WORKING_FAQPROG_FALSE DOCBOOK_TO_TEXI HAVE_DOCBOOK_TO_TEXI_TRUE HAVE_DOCBOOK_TO_TEXI_FALSE HAVE_DOSISH_SYSTEM_TRUE HAVE_DOSISH_SYSTEM_FALSE MPI_OPT_FLAGS NM GPGKEYS_LDAP LDAPLIBS SENDMAIL GPGKEYS_MAILTO GPGKEYS_HKP MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS CAPLIBS EGDLIBS MPI_EXTRA_ASM_OBJS MPI_SFLAGS ENABLE_LOCAL_ZLIB_TRUE ENABLE_LOCAL_ZLIB_FALSE ZLIBS CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE NETLIBS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot IDEA_O MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB AR ac_ct_AR PERL DOCBOOK_TO_MAN HAVE_DOCBOOK_TO_MAN_TRUE HAVE_DOCBOOK_TO_MAN_FALSE FAQPROG WORKING_FAQPROG_TRUE WORKING_FAQPROG_FALSE DOCBOOK_TO_TEXI HAVE_DOCBOOK_TO_TEXI_TRUE HAVE_DOCBOOK_TO_TEXI_FALSE HAVE_DOSISH_SYSTEM_TRUE HAVE_DOSISH_SYSTEM_FALSE MPI_OPT_FLAGS NM GPGKEYS_LDAP LDAPLIBS SENDMAIL GPGKEYS_MAILTO GPGKEYS_HKP MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB DLLIBS TIGER_O SHA512_O LIBOBJS GETOPT CAPLIBS EGDLIBS MPI_EXTRA_ASM_OBJS MPI_SFLAGS ENABLE_LOCAL_ZLIB_TRUE ENABLE_LOCAL_ZLIB_FALSE ZLIBS CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE NETLIBS W32LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then # 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.2.2 to adapt to many kinds of systems. +\`configure' configures gnupg 1.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -846,7 +846,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnupg 1.2.2:";; + short | recursive ) echo "Configuration of gnupg 1.2.3:";; esac cat <<\_ACEOF @@ -858,8 +858,9 @@ Optional Features: --disable-dynload disable use of extensions --disable-asm do not use assembler modules --enable-m-guard enable memory guard facility - --enable-tiger enable experimental TIGER/192 digest support - --enable-new-tiger enable new-style experimental TIGER/192 digest support + + --enable-tiger enable nonstandard TIGER/192 digest support + --enable-new-tiger enable new-style nonstandard TIGER/192 digest support --enable-sha512 enable read-only SHA-384 and SHA-512 digest support --disable-exec disable all external program execution --disable-photo-viewers disable photo ID viewers @@ -967,7 +968,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -gnupg configure 1.2.2 +gnupg configure 1.2.3 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -982,7 +983,7 @@ cat >&5 <<_ACEOF 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.2.2, which was +It was created by gnupg $as_me 1.2.3, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1323,10 +1324,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # sufficient. development_version=no -ALL_LINGUAS="ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt sk sv tr zh_TW" - -PACKAGE=$PACKAGE_NAME -VERSION=$PACKAGE_VERSION +ALL_LINGUAS="ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro sk sv tr zh_TW" ac_aux_dir= for ac_dir in scripts $srcdir/scripts; do @@ -1683,8 +1681,8 @@ fi # Define the identity of the package. - PACKAGE=$PACKAGE - VERSION=$VERSION + PACKAGE='gnupg' + VERSION='1.2.3' cat >>confdefs.h <<_ACEOF @@ -1814,23 +1812,12 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - - cat >>confdefs.h <<\_ACEOF #define _GNU_SOURCE 1 _ACEOF + echo "$as_me:$LINENO: checking which random module to use" >&5 echo $ECHO_N "checking which random module to use... $ECHO_C" >&6 # Check whether --enable-static-rnd or --disable-static-rnd was given. @@ -1959,8 +1946,17 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether to enable experimental TIGER/192 digest support" >&5 -echo $ECHO_N "checking whether to enable experimental TIGER/192 digest support... $ECHO_C" >&6 +# Note that TIGER, SHA-384, and SHA-512 may not actually be included +# if there is no 64-bit integer support. + +# Check whether --enable-old-tiger or --disable-old-tiger was given. +if test "${enable_old_tiger+set}" = set; then + enableval="$enable_old_tiger" + use_tiger=$enableval +fi; + +echo "$as_me:$LINENO: checking whether to enable nonstandard TIGER/192 digest support" >&5 +echo $ECHO_N "checking whether to enable nonstandard TIGER/192 digest support... $ECHO_C" >&6 # Check whether --enable-tiger or --disable-tiger was given. if test "${enable_tiger+set}" = set; then enableval="$enable_tiger" @@ -1970,41 +1966,18 @@ else fi; echo "$as_me:$LINENO: result: $use_tiger" >&5 echo "${ECHO_T}$use_tiger" >&6 -if test "$use_tiger" = yes ; then - TIGER_O=tiger.o - - -cat >>confdefs.h <<\_ACEOF -#define USE_TIGER 1 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define USE_OLD_TIGER 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking whether to enable new-style experimental TIGER/192 digest support" >&5 -echo $ECHO_N "checking whether to enable new-style experimental TIGER/192 digest support... $ECHO_C" >&6 - # Check whether --enable-new-tiger or --disable-new-tiger was given. +echo "$as_me:$LINENO: checking whether to enable new-style nonstandard TIGER/192 digest support" >&5 +echo $ECHO_N "checking whether to enable new-style nonstandard TIGER/192 digest support... $ECHO_C" >&6 +# Check whether --enable-new-tiger or --disable-new-tiger was given. if test "${enable_new_tiger+set}" = set; then enableval="$enable_new_tiger" use_new_tiger=$enableval else use_new_tiger=no fi; - echo "$as_me:$LINENO: result: $use_new_tiger" >&5 +echo "$as_me:$LINENO: result: $use_new_tiger" >&5 echo "${ECHO_T}$use_new_tiger" >&6 - if test "$use_new_tiger" = yes ; then - TIGER_O=tiger.o - - -cat >>confdefs.h <<\_ACEOF -#define USE_TIGER 1 -_ACEOF - - fi -fi if test x"$use_tiger" = xyes || test x"$use_new_tiger" = xyes ; then { echo "$as_me:$LINENO: WARNING: @@ -2034,15 +2007,6 @@ else fi; echo "$as_me:$LINENO: result: $use_sha512" >&5 echo "${ECHO_T}$use_sha512" >&6 -if test "$use_sha512" = yes ; then - SHA512_O=sha512.o - - -cat >>confdefs.h <<\_ACEOF -#define USE_SHA512 1 -_ACEOF - -fi echo "$as_me:$LINENO: checking whether to enable external program execution" >&5 echo $ECHO_N "checking whether to enable external program execution... $ECHO_C" >&6 @@ -2150,15 +2114,6 @@ fi; echo "$as_me:$LINENO: result: $try_hkp" >&5 echo "${ECHO_T}$try_hkp" >&6 - if test "$try_hkp" = yes ; then - GPGKEYS_HKP="gpgkeys_hkp$EXEEXT" - -cat >>confdefs.h <<\_ACEOF -#define USE_EXTERNAL_HKP 1 -_ACEOF - - fi - echo "$as_me:$LINENO: checking whether email keyserver support is requested" >&5 echo $ECHO_N "checking whether email keyserver support is requested... $ECHO_C" >&6 # Check whether --enable-mailto or --disable-mailto was given. @@ -3108,12 +3063,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (exit $ac_status); }; }; then for ac_declaration in \ ''\ - '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int);' \ - 'void exit (int);' + 'void exit (int);' \ + '#include ' do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" @@ -4793,6 +4748,15 @@ _ACEOF fi +if test "$try_hkp" = yes ; then + GPGKEYS_HKP="gpgkeys_hkp$EXEEXT" + +cat >>confdefs.h <<\_ACEOF +#define USE_EXTERNAL_HKP 1 +_ACEOF + +fi + echo "$as_me:$LINENO: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 @@ -5312,6 +5276,10 @@ _ACEOF if test "$try_gettext" = yes; then +# we specify that we need ngettext since that check implies a check +# for bind_textdomain_codeset, which we really need. + + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" @@ -8411,7 +8379,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then +if test "${gt_cv_func_gnugettext2_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8428,7 +8396,7 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } @@ -8445,19 +8413,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libc=yes + gt_cv_func_gnugettext2_libc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_gnugettext1_libc=no +gt_cv_func_gnugettext2_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6 - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if test "$gt_cv_func_gnugettext2_libc" != "yes"; then @@ -8839,7 +8807,7 @@ fi; echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then +if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -8864,7 +8832,7 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } @@ -8881,15 +8849,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libintl=yes + gt_cv_func_gnugettext2_libintl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_gnugettext1_libintl=no +gt_cv_func_gnugettext2_libintl=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" @@ -8909,7 +8877,7 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } @@ -8928,7 +8896,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l (exit $ac_status); }; }; then LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + gt_cv_func_gnugettext2_libintl=yes else echo "$as_me: failed program was:" >&5 @@ -8940,12 +8908,12 @@ rm -f conftest.$ac_objext conftest$ac_ex CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6 fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + if test "$gt_cv_func_gnugettext2_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext2_libintl" = "yes" \ && test "$PACKAGE" != gettext; }; then gt_use_preinstalled_gnugettext=yes else @@ -8990,7 +8958,7 @@ _ACEOF if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then echo "$as_me:$LINENO: checking how to link with libintl" >&5 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $LIBINTL" >&5 @@ -9068,44 +9036,60 @@ _ACEOF -else - USE_NLS=no - USE_INCLUDED_LIBINTL=no - BUILD_INCLUDED_LIBINTL=no - - - -fi +# gettext requires some extra checks. These really should be part of +# the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific +# function checks to here. -if test "$try_dynload" = yes ; then -echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +for ac_func in strchr +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 eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dlopen (); +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 +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + int main () { -dlopen (); +return f != $ac_func; ; return 0; } @@ -9122,46 +9106,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - LIBS="-ldl $LIBS" - fi +done - if test "$ac_cv_lib_dl_dlopen" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define USE_DYNAMIC_LINKING 1 -_ACEOF +else + USE_NLS=no + USE_INCLUDED_LIBINTL=no + BUILD_INCLUDED_LIBINTL=no -cat >>confdefs.h <<\_ACEOF -#define HAVE_DL_DLOPEN 1 -_ACEOF - else +fi -for ac_func in dlopen -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 eval "test \"\${$as_ac_var+set}\" = set"; then +if test "$try_dynload" = yes ; then + echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9172,7 +9148,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. + which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ #ifdef __STDC__ @@ -9187,14 +9163,14 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); +char dlopen (); /* 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_dlopen) || defined (__stub___dlopen) choke me #else -char (*f) () = $ac_func; +char (*f) () = dlopen; #endif #ifdef __cplusplus } @@ -9203,7 +9179,7 @@ char (*f) () = $ac_func; int main () { -return f != $ac_func; +return f != dlopen; ; return 0; } @@ -9220,45 +9196,102 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&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_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +if test $ac_cv_func_dlopen = yes; then + : +else + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_dl_dlopen=no fi -done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then + found_dlopen=yes +fi + +fi + + if test x"$found_dlopen" = "xyes" ; then - if test "$ac_cv_func_dlopen" = "yes"; then - cat >>confdefs.h <<\_ACEOF +cat >>confdefs.h <<\_ACEOF #define USE_DYNAMIC_LINKING 1 _ACEOF - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_DL_DLOPEN 1 _ACEOF - fi + DLLIBS="-ldl" + fi else echo "$as_me:$LINENO: checking for dynamic loading" >&5 echo $ECHO_N "checking for dynamic loading... $ECHO_C" >&6 - DYNLINK_LDFLAGS= - DYNLINK_MOD_CFLAGS= echo "$as_me:$LINENO: result: has been disabled" >&5 echo "${ECHO_T}has been disabled" >&6 fi + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -9423,7 +9456,8 @@ fi -for ac_header in unistd.h langinfo.h termio.h locale.h + +for ac_header in unistd.h langinfo.h termio.h locale.h getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -9961,7 +9995,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +#include +/* NetBSD declares sys_siglist in unistd.h. */ +#if HAVE_UNISTD_H +# include +#endif + int main () { @@ -11922,13 +11962,12 @@ if test "$ac_cv_sizeof_unsigned_short" = echo "$as_me: WARNING: Hmmm, something is wrong with the sizes - using defaults" >&2;}; fi -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 +if test "$use_tiger" = yes || test "$use_new_tiger" = yes || test "$use_sha512" = 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 - while :; do - ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -11936,11 +11975,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default int main () { -return !fseeko; +if ((uint64_t *) 0) + return 0; +if (sizeof (uint64_t)) + return 0; ; return 0; } @@ -11957,26 +11999,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break + ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_type_uint64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF +fi +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 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 "$ac_cv_type_uint64_t" = yes; then + # The cast to unsigned long 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. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include +$ac_includes_default int main () { -return !fseeko; +static int test_array [1 - 2 * !(((long) (sizeof (uint64_t))) >= 0)]; +test_array [0] = 0 + ; return 0; } @@ -11993,7 +12053,394 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sys_largefile_source=1; break + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (uint64_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; 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 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (uint64_t))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (uint64_t))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +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.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +rm -f 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (uint64_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_uint64_t=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (uint64_t), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +long longval () { return (long) (sizeof (uint64_t)); } +unsigned long ulongval () { return (long) (sizeof (uint64_t)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (uint64_t))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (uint64_t)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (uint64_t)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + 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 ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (uint64_t), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_uint64_t=0 +fi +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 + + + # Do we have any 64-bit data types at all? + if test "$ac_cv_sizeof_unsigned_int" != "8" \ + && test "$ac_cv_sizeof_unsigned_long" != "8" \ + && test "$ac_cv_sizeof_unsigned_long_long" != "8" \ + && test "$ac_cv_sizeof_uint64_t" != "8"; then + { echo "$as_me:$LINENO: WARNING: No 64-bit types. Disabling TIGER/192, SHA-384, and SHA-512" >&5 +echo "$as_me: WARNING: No 64-bit types. Disabling TIGER/192, SHA-384, and SHA-512" >&2;} + else + if test "$use_tiger" = yes ; then + TIGER_O=tiger.o + + +cat >>confdefs.h <<\_ACEOF +#define USE_TIGER 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define USE_OLD_TIGER 1 +_ACEOF + + fi + + if test "$use_new_tiger" = yes ; then + TIGER_O=tiger.o + + +cat >>confdefs.h <<\_ACEOF +#define USE_TIGER 1 +_ACEOF + + fi + + if test "$use_sha512" = yes ; then + SHA512_O=sha512.o + + +cat >>confdefs.h <<\_ACEOF +#define USE_SHA512 1 +_ACEOF + + fi + fi +fi + +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 + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +return !fseeko; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _LARGEFILE_SOURCE 1 +#include +int +main () +{ +return !fseeko; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12844,7 +13291,8 @@ done -for ac_func in strcasecmp strncasecmp ctermid + +for ac_func in strcasecmp strncasecmp ctermid times do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -13281,6 +13729,260 @@ 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if ((struct sigaction *) 0) + return 0; +if (sizeof (struct sigaction)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; 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 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +if ((sigset_t *) 0) + return 0; +if (sizeof (sigset_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; 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 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* 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 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +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 +#else +char (*f) () = getopt; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != getopt; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; 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 conftest.$ac_objext 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 +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getopt (); +int +main () +{ +getopt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; 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 conftest.$ac_objext 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 @@ -15025,7 +15727,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib echo "${ECHO_T}$ac_cv_lib_z_deflateInit2_" >&6 if test $ac_cv_lib_z_deflateInit2_ = yes; then use_local_zlib=no - LIBS="$LIBS -lz" + ZLIBS="-lz" else CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags} fi @@ -15062,7 +15764,6 @@ else ENABLE_LOCAL_ZLIB_FALSE= fi - ZLIBS= fi @@ -15120,13 +15821,15 @@ echo "$as_me: WARNING: # mysterious reasons - the final link step should bail out. case "${target}" in *-*-mingw32*) - LIBS="$LIBS -lwsock32" + W32LIBS="-lwsock32" ;; *) ;; esac + + if test "$GCC" = yes; then if test "$USE_MAINTAINER_MODE" = "yes"; then CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes" @@ -15136,8 +15839,6 @@ if test "$GCC" = yes; then fi - - if test "$print_egd_warning" = yes; then { echo "$as_me:$LINENO: WARNING: *** @@ -15151,9 +15852,10 @@ if test "$print_egd_warning" = yes; then *** in Perl and available at the GnuPG FTP servers. For more information *** consult the GnuPG webpages: *** -*** http://www.gnupg.org/download.html#egd +*** http://www.gnupg.org/download/#EGD *** -*** You may want to run ./configure with --enable-static-rnd=egd to use it. +*** You may want to run ./configure with --enable-static-rnd=egd or +*** --enable-static-rnd=auto to use it. ***" >&5 echo "$as_me: WARNING: *** @@ -15167,9 +15869,10 @@ echo "$as_me: WARNING: *** in Perl and available at the GnuPG FTP servers. For more information *** consult the GnuPG webpages: *** -*** http://www.gnupg.org/download.html#egd +*** http://www.gnupg.org/download/#EGD *** -*** You may want to run ./configure with --enable-static-rnd=egd to use it. +*** You may want to run ./configure with --enable-static-rnd=egd or +*** --enable-static-rnd=auto to use it. ***" >&2;} fi @@ -15611,7 +16314,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by gnupg $as_me 1.2.2, which was +This file was extended by gnupg $as_me 1.2.3, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15677,7 +16380,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnupg config.status 1.2.2 +gnupg config.status 1.2.3 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -15942,8 +16645,6 @@ s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t s,@IDEA_O@,$IDEA_O,;t t -s,@TIGER_O@,$TIGER_O,;t t -s,@SHA512_O@,$SHA512_O,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t @@ -16011,7 +16712,11 @@ s,@INTLLIBS@,$INTLLIBS,;t t s,@LIBINTL@,$LIBINTL,;t t s,@LTLIBINTL@,$LTLIBINTL,;t t s,@POSUB@,$POSUB,;t t +s,@DLLIBS@,$DLLIBS,;t t +s,@TIGER_O@,$TIGER_O,;t t +s,@SHA512_O@,$SHA512_O,;t t s,@LIBOBJS@,$LIBOBJS,;t t +s,@GETOPT@,$GETOPT,;t t s,@CAPLIBS@,$CAPLIBS,;t t s,@EGDLIBS@,$EGDLIBS,;t t s,@MPI_EXTRA_ASM_OBJS@,$MPI_EXTRA_ASM_OBJS,;t t @@ -16022,6 +16727,7 @@ s,@ZLIBS@,$ZLIBS,;t t s,@CROSS_COMPILING_TRUE@,$CROSS_COMPILING_TRUE,;t t s,@CROSS_COMPILING_FALSE@,$CROSS_COMPILING_FALSE,;t t s,@NETLIBS@,$NETLIBS,;t t +s,@W32LIBS@,$W32LIBS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -16824,20 +17530,20 @@ done cat >g10defs.tmp <]) + +# 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. + +AC_CHECK_FUNC(getopt,,AC_CHECK_LIB(iberty,getopt,AC_SUBST(GETOPT,"-liberty"))) # # check for gethrtime and run a testprogram to see whether @@ -793,18 +816,17 @@ else AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflateInit2_, use_local_zlib=no - LIBS="$LIBS -lz", + ZLIBS="-lz", CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}), CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}) fi - + if test "$use_local_zlib" = yes ; then AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) AC_CONFIG_LINKS(zlib.h:zlib/zlib.h zconf.h:zlib/zconf.h ) ZLIBS="../zlib/libzlib.a" else AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) - ZLIBS= fi AC_SUBST(ZLIBS) @@ -833,12 +855,15 @@ GNUPG_CHECK_GNUMAKE # mysterious reasons - the final link step should bail out. case "${target}" in *-*-mingw32*) - LIBS="$LIBS -lwsock32" +dnl NETLIBS="$NETLIBS -lwsock32" + W32LIBS="-lwsock32" ;; *) ;; esac +AC_SUBST(NETLIBS) +AC_SUBST(W32LIBS) if test "$GCC" = yes; then if test "$USE_MAINTAINER_MODE" = "yes"; then @@ -848,8 +873,6 @@ if test "$GCC" = yes; then fi fi -AC_SUBST(NETLIBS) - if test "$print_egd_warning" = yes; then AC_MSG_WARN([[ @@ -864,9 +887,10 @@ if test "$print_egd_warning" = yes; then *** in Perl and available at the GnuPG FTP servers. For more information *** consult the GnuPG webpages: *** -*** http://www.gnupg.org/download.html#egd +*** http://www.gnupg.org/download/#EGD *** -*** You may want to run ./configure with --enable-static-rnd=egd to use it. +*** You may want to run ./configure with --enable-static-rnd=egd or +*** --enable-static-rnd=auto to use it. ***]]) fi @@ -876,20 +900,20 @@ AC_CONFIG_COMMANDS(g10defs.h,[[ cat >g10defs.tmp < + + * samplekeys.asc: Refreshed the keys. + +2003-07-31 David D. Scribner + + * faq.raw: Corrected 3.2 URL per Cri. + Updated 4.20 per Cri - reworded text to lessen confusion between keys + and signatures. + Corrected 4.4 per Noel ("-r argument" should be "-r option") + Corrected spelling in 4.6 per Noel ("shoud" should be "should") + Updated 4.13 per Noel - reworded text to bring up-to-date. + Corrected 4.15 URL per Cri and removed a link. + Created FAQ entry (6.21) re: Key Validity bug in gnupg versions + prior to 1.2.1 + Created FAQ entry (6.22) re: compiling source on RPM-based systems + that already have GnuPG binaries installed in /usr/bin. + Applied by Werner Koch. + +2003-07-27 David Shaw + + * DETAILS: Document "tru" trust record. Document REVKEYSIG status + tag. + +2003-07-02 David Shaw + + * gpg.sgml: Warning not to try and parse --list-keys in scripts. + Document the signature flags (1-3/L/R/P/N/X), Document expandos %g + and %p. Note the default --personal-digest-preferences are "H2". + + * DETAILS: Document the --attribute-fd data. + +2003-06-18 David Shaw + + * gpg.sgml: Add pointer in --ignore-time-conflict to see + --ignore-valid from, and vice versa. + + * gpg.sgml: Document --set-notation. Explain why it is not + possible to disable permission warnings in the gpg.conf file about + the homedir. + +2003-05-21 David Shaw + + * gpg.sgml: Document --trustdb-name. Document --gnupg in a new + compliance section, and remove the various --no-PGPX options. + Deprecate --no-comment in favor of --no-sk-comments. + 2003-05-01 Werner Koch * faq.raw: List years of copyright notice separately. diff -urpP gnupg-1.2.2/doc/DETAILS gnupg-1.2.3/doc/DETAILS --- gnupg-1.2.2/doc/DETAILS 2003-04-27 10:04:21.000000000 +0000 +++ gnupg-1.2.3/doc/DETAILS 2003-07-30 07:44:42.000000000 +0000 @@ -36,6 +36,7 @@ record. pkd = public key data (special field format, see below) grp = reserved for gpgsm rvk = revocation key + tru = trust database information 2. Field: A letter describing the calculated trust. This is a single letter, but be prepared that additional information may follow @@ -116,6 +117,21 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: ! !------ for information number of bits in the value !--------- index (eg. DSA goes from 0 to 3: p,q,g,y) + +The "tru" trust database records have the fields: + + 1: Reason for staleness of trust. If this field is empty, then the + trustdb is not stale. This field may have multiple flags in it: + + o: Trustdb is old + t: Trustdb was built with a different trust model than the one we + are using now. + + 2: Trust model. This is always zero (i.e. "Classic") in this version + of GnuPG. + 3: Date trustdb was created in seconds since 1/1/1970. + 4: Date trustdb will expire in seconds since 1/1/1970. + Format of the "--status-fd" output @@ -143,6 +159,11 @@ more arguments in future versions. made by an expired key. The username is the primary one encoded in UTF-8 and %XX escaped. + REVKEYSIG + The signature with the keyid is good, but the signature was + made by a revoked key. The username is the primary one + encoded in UTF-8 and %XX escaped. + BADSIG The signature with the keyid has not been verified okay. The username is the primary one encoded in UTF-8 and %XX @@ -425,6 +446,32 @@ more arguments in future versions. 0x04 = this attribute packet is expired +Format of the "--attribute-fd" output +===================================== + +When --attribute-fd is set, during key listings (--list-keys, +--list-secret-keys) GnuPG dumps each attribute packet to the file +descriptor specified. --attribute-fd is intended for use with +--status-fd as part of the required information is carried on the +ATTRIBUTE status tag (see above). + +The contents of the attribute data is specified by 2440bis, but for +convenience, here is the Photo ID format, as it is currently the only +attribute defined: + + Byte 0-1: The length of the image header. Due to a historical + accident (i.e. oops!) back in the NAI PGP days, this is + a little-endian number. Currently 16 (0x10 0x00). + + Byte 2: The image header version. Currently 0x01. + + Byte 3: Encoding format. 0x01 == JPEG. + + Byte 4-15: Reserved, and currently unused. + + All other data after this header is raw image (JPEG) data. + + Key generation ============== Key generation shows progress by printing different characters to diff -urpP gnupg-1.2.2/doc/FAQ gnupg-1.2.3/doc/FAQ --- gnupg-1.2.2/doc/FAQ 2003-05-01 11:37:33.000000000 +0000 +++ gnupg-1.2.3/doc/FAQ 2003-07-31 07:49:18.000000000 +0000 @@ -2,8 +2,8 @@ GnuPG Frequently Asked Questions -Version: 1.6.2 -Last-Modified: Feb 25, 2003 +Version: 1.6.3 +Last-Modified: Jul 30, 2003 Maintained-by: David D. Scribner, @@ -54,8 +54,8 @@ you could search in the mailing list arc messages? 4.11) What does the "You are using the xxxx character set." mean? 4.12) How can I get list of key IDs used to encrypt a message? - 4.13) I can't decrypt my symmetrical-only (-c) encrypted messages with - a new version of GnuPG. + 4.13) Why can't I decrypt files encrypted as symmetrical-only (-c) with + a version of GnuPG prior to 1.0.1. 4.14) How can I use GnuPG in an automated environment? 4.15) Which email-client can I use with GnuPG? 4.16) Can't we have a gpg library? @@ -63,7 +63,7 @@ you could search in the mailing list arc understand how to send it to the key servers. 4.18) How do I put my keyring in a different directory? 4.19) How do I verify signed packages? - 4.20) How do I export a keyring with only selected signatures? + 4.20) How do I export a keyring with only selected signatures (keys)? 4.21) I still have my secret key, but lost my public key. What can I do? 4.22) Clearsigned messages sent from my web-mail account have an invalid signature. Why? @@ -104,6 +104,10 @@ you could search in the mailing list arc 6.19) Why does GnuPG 1.0.6 bail out on keyrings used with 1.0.7? 6.20) I upgraded to GnuPG version 1.0.7 and now it takes longer to load my keyrings. What can I do? + 6.21) Doesn't a fully trusted user ID on a key prevent warning messages + when encrypting to other IDs on the key? + 6.22) I just compiled GnuPG from source on my GNU/Linux RPM-based system + and it's not working. Why? 7. ADVANCED TOPICS 7.1) How does this whole thing work? @@ -214,7 +218,7 @@ you could search in the mailing list arc - The current stable version is 1.2.1. Please upgrade to this version as + The current stable version is 1.2.2. Please upgrade to this version as it includes additional features, functions and security fixes that may not have existed in prior versions. @@ -241,7 +245,7 @@ you could search in the mailing list arc --enable-static-rnd=linux In addition, there's also the kernel random device by Andi Maier - , but it's still beta. Use at your + , but it's still beta. Use at your own risk! On other systems, the Entropy Gathering Daemon (EGD) is a good choice. @@ -353,7 +357,7 @@ you could search in the mailing list arc otherwise gpg doesn't know which option the argument is supposed to paired with. As an option, --output and its filename must come before the command. The --recipient (-r) option takes a name or keyID to - encrypt the message to, which must come right after the -r argument. + encrypt the message to, which must come right after the -r option. The --encrypt (or -e) command comes after all the options and is followed by the file you wish to encrypt. Therefore in this example the command-line issued would be: @@ -405,7 +409,7 @@ you could search in the mailing list arc To select a key a search is always done on the public keyring, therefore it is not possible to select a secret key without - having the public key. Normally it shoud never happen that the + having the public key. Normally it should never happen that the public key got lost but the secret key is still available. The reality is different, so GnuPG implements a special way to deal with it: Simply use the long keyID to specify the key to delete, @@ -468,17 +472,18 @@ you could search in the mailing list arc $ gpg --batch --decrypt --list-only --status-fd 1 2>/dev/null | awk '/^\[GNUPG:\] ENC_TO / { print $3 }' -4.13) I can't decrypt my symmetrical-only (-c) encrypted messages with - a new version of GnuPG. +4.13) Why can't I decrypt files encrypted as symmetrical-only (-c) with + a version of GnuPG prior to 1.0.1. - There was a bug in GnuPG versions prior to 1.0.1 which affected - messages only if 3DES or Twofish was used for symmetric-only - encryption (this has never been the default). The bug has been - fixed, but to enable decryption of old messages you should run gpg - with the option "--emulate-3des-s2k-bug", decrypt the message and - encrypt it again without this option. The option will be removed - in version 1.1 when released, so please re-encrypt any affected - messages now. + There was a bug in GnuPG versions prior to 1.0.1 which affected files + only if 3DES or Twofish was used for symmetric-only encryption (this has + never been the default). The bug has been fixed, but to enable decryption + of old files you should run gpg with the option "--emulate-3des-s2k-bug", + decrypt the file and encrypt it again without this option. + + NOTE: This option was removed in GnuPG development version 1.1.0 and later + updates, so you will need to use a version between 1.0.1 and 1.0.7 to + re-encrypt any affected files. 4.14) How can I use GnuPG in an automated environment? @@ -573,8 +578,7 @@ you could search in the mailing list arc The Bat! N Y P (Ritlabs) Good overviews of OpenPGP-support can be found at: - , - , and + and . Users of Win32 MUAs that lack OpenPGP support may look into @@ -646,9 +650,9 @@ you could search in the mailing list arc $ gpg --verify foobar.tar.gz.sig -4.20) How do I export a keyring with only selected signatures? +4.20) How do I export a keyring with only selected signatures (keys)? - If you're wanting to create a keyring with only a subset of signatures + If you're wanting to create a keyring with only a subset of keys selected from a master keyring (for a club, user group, or company department for example), simply specify the keys you want to export: @@ -1045,6 +1049,46 @@ you could search in the mailing list arc command, which was built into this release and increases the speed of many operations for existing keyrings. +6.21) Doesn't a fully trusted user ID on a key prevent warning messages + when encrypting to other IDs on the key? + + No. That was actually a key validity bug in GnuPG 1.2.1 and earlier + versions. As part of the development of GnuPG 1.2.2, a bug was + discovered in the key validation code. This bug causes keys with + more than one user ID to give all user IDs on the key the amount of + validity given to the most-valid key. The bug has been fixed in GnuPG + release 1.2.2, and upgrading is the recommended fix for this problem. + More information and a patch for a some pre-1.2.2 versions of GnuPG + can be found at: + + + +6.22) I just compiled GnuPG from source on my GNU/Linux RPM-based system + and it's not working. Why? + + Many GNU/Linux distributions that are RPM-based will install a + version of GnuPG as part of its standard installation, placing the + binaries in the /usr/bin directory. Later, compiling and installing + GnuPG from source other than from a source RPM won't normally + overwrite these files, as the default location for placement of + GnuPG binaries is in /usr/local/bin unless the '--prefix' switch + is used during compile to specify an alternate location. Since the + /usr/bin directory more than likely appears in your path before + /usr/local/bin, the older RPM-version binaries will continue to + be used when called since they were not replaced. + + To resolve this, uninstall the RPM-based version with 'rpm -e gnupg' + before installing the binaries compiled from source. If dependency + errors are displayed when attempting to uninstall the RPM (such as + when Red Hat's up2date is also installed, which uses GnuPG), uninstall + the RPM with 'rpm -e gnupg --nodeps' to force the uninstall. Any + dependent files should be automatically replaced during the install + of the compiled version. If the default /usr/local/bin directory is + used, some packages such as SuSE's Yast Online Update may need to be + configured to look for GnuPG binaries in the /usr/local/bin directory, + or symlinks can be created in /usr/bin that point to the binaries + located in /usr/local/bin. + 7. ADVANCED TOPICS @@ -1253,4 +1297,4 @@ Copyright (C) 2000, 2001, 2002, 2003 Fre 59 Temple Place - Suite 330, Boston, MA 02111, USA Verbatim copying and distribution of this entire article is permitted in -any medium, provided this notice is preserved. +any medium, provided this notice is preserved. \ No newline at end of file diff -urpP gnupg-1.2.2/doc/Makefile.in gnupg-1.2.3/doc/Makefile.in --- gnupg-1.2.2/doc/Makefile.in 2003-05-01 14:38:59.000000000 +0000 +++ gnupg-1.2.3/doc/Makefile.in 2003-08-21 20:03:29.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -218,6 +221,7 @@ BUILT_SOURCES = FAQ faq.html # be built files. CLEANFILES = faq.raw.xref gpg.xml gpgv.xml subdir = doc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -479,7 +483,8 @@ all-am: Makefile $(INFO_DEPS) $(MANS) $( installdirs: $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) $(DESTDIR)$(pkgdatadir) -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am diff -urpP gnupg-1.2.2/doc/faq.html gnupg-1.2.3/doc/faq.html --- gnupg-1.2.2/doc/faq.html 2003-05-01 11:37:33.000000000 +0000 +++ gnupg-1.2.3/doc/faq.html 2003-07-31 07:49:26.000000000 +0000 @@ -7,8 +7,8 @@

-Version: 1.6.2
-Last-Modified: Feb 25, 2003
+Version: 1.6.3
+Last-Modified: Jul 30, 2003
Maintained-by: David D. Scribner, <faq 'at' gnupg.org>

@@ -83,8 +83,8 @@ you could search in the mailing list arc

  • 4.12) How can I get list of key IDs used to encrypt a message? -
  • 4.13) I can't decrypt my symmetrical-only (-c) encrypted messages with - a new version of GnuPG. +
  • 4.13) Why can't I decrypt files encrypted as symmetrical-only (-c) with + a version of GnuPG prior to 1.0.1.
  • 4.14) How can I use GnuPG in an automated environment? @@ -99,7 +99,7 @@ you could search in the mailing list arc
  • 4.19) How do I verify signed packages? -
  • 4.20) How do I export a keyring with only selected signatures? +
  • 4.20) How do I export a keyring with only selected signatures (keys)?
  • 4.21) I still have my secret key, but lost my public key. What can I do? @@ -172,6 +172,12 @@ you could search in the mailing list arc
  • 6.20) I upgraded to GnuPG version 1.0.7 and now it takes longer to load my keyrings. What can I do? +
  • 6.21) Doesn't a fully trusted user ID on a key prevent warning messages + when encrypting to other IDs on the key? + +
  • 6.22) I just compiled GnuPG from source on my GNU/Linux RPM-based system + and it's not working. Why? +

    7. ADVANCED TOPICS

  • 7.1) How does this whole thing work? @@ -313,7 +319,7 @@ You can download the GNU Privacy Guard f <http://www.gnupg.org/download/mirrors.html>

    -The current stable version is 1.2.1. Please upgrade to this version as +The current stable version is 1.2.2. Please upgrade to this version as it includes additional features, functions and security fixes that may not have existed in prior versions.

    @@ -350,7 +356,7 @@ a /dev/random. In these cases, use the c

    In addition, there's also the kernel random device by Andi Maier -<http://www.cosy.sbg.ac.at/~andi/>, but it's still beta. Use at your +<http://www.cosy.sbg.ac.at/~andi/SUNrand/>, but it's still beta. Use at your own risk!

    On other systems, the Entropy Gathering Daemon (EGD) is a good choice. @@ -486,7 +492,7 @@ option's argument must follow immediatel otherwise gpg doesn't know which option the argument is supposed to paired with. As an option, --output and its filename must come before the command. The --recipient (-r) option takes a name or keyID to -encrypt the message to, which must come right after the -r argument. +encrypt the message to, which must come right after the -r option. The --encrypt (or -e) command comes after all the options and is followed by the file you wish to encrypt. Therefore in this example the command-line issued would be: @@ -554,7 +560,7 @@ removed from the secret ring.

    To select a key a search is always done on the public keyring, therefore it is not possible to select a secret key without -having the public key. Normally it shoud never happen that the +having the public key. Normally it should never happen that the public key got lost but the secret key is still available. The reality is different, so GnuPG implements a special way to deal with it: Simply use the long keyID to specify the key to delete, @@ -632,18 +638,19 @@ and no mapping has to be done.

    -4.13) I can't decrypt my symmetrical-only (-c) encrypted messages with - a new version of GnuPG. +4.13) Why can't I decrypt files encrypted as symmetrical-only (-c) with + a version of GnuPG prior to 1.0.1.

    -There was a bug in GnuPG versions prior to 1.0.1 which affected -messages only if 3DES or Twofish was used for symmetric-only -encryption (this has never been the default). The bug has been -fixed, but to enable decryption of old messages you should run gpg -with the option "--emulate-3des-s2k-bug", decrypt the message and -encrypt it again without this option. The option will be removed -in version 1.1 when released, so please re-encrypt any affected -messages now. +There was a bug in GnuPG versions prior to 1.0.1 which affected files +only if 3DES or Twofish was used for symmetric-only encryption (this has +never been the default). The bug has been fixed, but to enable decryption +of old files you should run gpg with the option "--emulate-3des-s2k-bug", +decrypt the file and encrypt it again without this option. +

    +NOTE: This option was removed in GnuPG development version 1.1.0 and later +updates, so you will need to use a version between 1.0.1 and 1.0.7 to +re-encrypt any affected files.

    4.14) How can I use GnuPG in an automated environment? @@ -750,8 +757,7 @@ for interoperability reasons for your co

    Good overviews of OpenPGP-support can be found at:
    -<http://cryptorights.org/pgp-users/resources/pgp-mail-clients.html>,
    -<http://www.geocities.com/openpgp/courrier_en.html>, and
    +<http://www.openpgp.fr.st/courrier_en.html> and
    <http://www.bretschneidernet.de/tips/secmua.html>.

    Users of Win32 MUAs that lack OpenPGP support may look into @@ -842,10 +848,10 @@ file, use:

    -4.20) How do I export a keyring with only selected signatures? +4.20) How do I export a keyring with only selected signatures (keys)?

    -If you're wanting to create a keyring with only a subset of signatures +If you're wanting to create a keyring with only a subset of keys selected from a master keyring (for a club, user group, or company department for example), simply specify the keys you want to export:

    @@ -1354,6 +1360,50 @@ can be supported. You can use the new -- command, which was built into this release and increases the speed of many operations for existing keyrings.

    +

    +6.21) Doesn't a fully trusted user ID on a key prevent warning messages + when encrypting to other IDs on the key? +

    +

    +No. That was actually a key validity bug in GnuPG 1.2.1 and earlier +versions. As part of the development of GnuPG 1.2.2, a bug was +discovered in the key validation code. This bug causes keys with +more than one user ID to give all user IDs on the key the amount of +validity given to the most-valid key. The bug has been fixed in GnuPG +release 1.2.2, and upgrading is the recommended fix for this problem. +More information and a patch for a some pre-1.2.2 versions of GnuPG +can be found at: +

    +<http://lists.gnupg.org/pipermail/gnupg-announce/2003q2/000268.html> +

    +

    +6.22) I just compiled GnuPG from source on my GNU/Linux RPM-based system + and it's not working. Why? +

    +

    +Many GNU/Linux distributions that are RPM-based will install a +version of GnuPG as part of its standard installation, placing the +binaries in the /usr/bin directory. Later, compiling and installing +GnuPG from source other than from a source RPM won't normally +overwrite these files, as the default location for placement of +GnuPG binaries is in /usr/local/bin unless the '--prefix' switch +is used during compile to specify an alternate location. Since the +/usr/bin directory more than likely appears in your path before +/usr/local/bin, the older RPM-version binaries will continue to +be used when called since they were not replaced. +

    +To resolve this, uninstall the RPM-based version with 'rpm -e gnupg' +before installing the binaries compiled from source. If dependency +errors are displayed when attempting to uninstall the RPM (such as +when Red Hat's up2date is also installed, which uses GnuPG), uninstall +the RPM with 'rpm -e gnupg --nodeps' to force the uninstall. Any +dependent files should be automatically replaced during the install +of the compiled version. If the default /usr/local/bin directory is +used, some packages such as SuSE's Yast Online Update may need to be +configured to look for GnuPG binaries in the /usr/local/bin directory, +or symlinks can be created in /usr/bin that point to the binaries +located in /usr/local/bin. +

    7. ADVANCED TOPICS @@ -1601,5 +1651,4 @@ Copyright (C) 2000, 2001, 2002, 2003 Fre 59 Temple Place - Suite 330, Boston, MA 02111, USA

    Verbatim copying and distribution of this entire article is permitted in -any medium, provided this notice is preserved. - +any medium, provided this notice is preserved. diff -urpP gnupg-1.2.2/doc/faq.raw gnupg-1.2.3/doc/faq.raw --- gnupg-1.2.2/doc/faq.raw 2003-05-01 11:37:31.000000000 +0000 +++ gnupg-1.2.3/doc/faq.raw 2003-07-31 07:36:06.000000000 +0000 @@ -9,15 +9,15 @@ The most recent version of the FAQ is av [$maintainer=David D. Scribner, ] [$hGPGHTTP=http://www.gnupg.org] [$hGPGFTP=ftp://ftp.gnupg.org] -[$hVERSION=1.2.1] +[$hVERSION=1.2.2] [H body bgcolor=#ffffff text=#000000 link=#1f00ff alink=#ff0000 vlink=#9900dd] [H h1]GnuPG Frequently Asked Questions[H /h1] [H p] -Version: 1.6.2[H br] -Last-Modified: Feb 25, 2003[H br] +Version: 1.6.3[H br] +Last-Modified: Jul 30, 2003[H br] Maintained-by: [$maintainer] [H /p] @@ -173,7 +173,7 @@ you could search in the mailing list arc [H /samp] In addition, there's also the kernel random device by Andi Maier - [H a href= http://www.cosy.sbg.ac.at/~andi/][H /a], but it's still beta. Use at your + [H a href= http://www.cosy.sbg.ac.at/~andi/SUNrand/][H /a], but it's still beta. Use at your own risk! On other systems, the Entropy Gathering Daemon (EGD) is a good choice. @@ -298,7 +298,7 @@ you could search in the mailing list arc otherwise gpg doesn't know which option the argument is supposed to paired with. As an option, --output and its filename must come before the command. The --recipient (-r) option takes a name or keyID to - encrypt the message to, which must come right after the -r argument. + encrypt the message to, which must come right after the -r option. The --encrypt (or -e) command comes after all the options and is followed by the file you wish to encrypt. Therefore in this example the command-line issued would be: @@ -362,7 +362,7 @@ you could search in the mailing list arc To select a key a search is always done on the public keyring, therefore it is not possible to select a secret key without - having the public key. Normally it shoud never happen that the + having the public key. Normally it should never happen that the public key got lost but the secret key is still available. The reality is different, so GnuPG implements a special way to deal with it: Simply use the long keyID to specify the key to delete, @@ -427,17 +427,18 @@ you could search in the mailing list arc awk '/^\[GNUPG:\] ENC_TO / { print $3 }' [H /samp] - I can't decrypt my symmetrical-only (-c) encrypted messages with - a new version of GnuPG. + Why can't I decrypt files encrypted as symmetrical-only (-c) with + a version of GnuPG prior to 1.0.1. - There was a bug in GnuPG versions prior to 1.0.1 which affected - messages only if 3DES or Twofish was used for symmetric-only - encryption (this has never been the default). The bug has been - fixed, but to enable decryption of old messages you should run gpg - with the option "--emulate-3des-s2k-bug", decrypt the message and - encrypt it again without this option. The option will be removed - in version 1.1 when released, so please re-encrypt any affected - messages now. + There was a bug in GnuPG versions prior to 1.0.1 which affected files + only if 3DES or Twofish was used for symmetric-only encryption (this has + never been the default). The bug has been fixed, but to enable decryption + of old files you should run gpg with the option "--emulate-3des-s2k-bug", + decrypt the file and encrypt it again without this option. + + NOTE: This option was removed in GnuPG development version 1.1.0 and later + updates, so you will need to use a version between 1.0.1 and 1.0.7 to + re-encrypt any affected files. How can I use GnuPG in an automated environment? @@ -540,8 +541,7 @@ you could search in the mailing list arc [H /pre] Good overviews of OpenPGP-support can be found at:[H br] - [H a href=http://cryptorights.org/pgp-users/resources/pgp-mail-clients.html][H /a],[H br] - [H a href=http://www.geocities.com/openpgp/courrier_en.html][H /a], and[H br] + [H a href=http://www.openpgp.fr.st/courrier_en.html][H /a] and[H br] [H a href=http://www.bretschneidernet.de/tips/secmua.html][H /a]. Users of Win32 MUAs that lack OpenPGP support may look into @@ -624,9 +624,9 @@ you could search in the mailing list arc $ gpg --verify foobar.tar.gz.sig [H /samp] - How do I export a keyring with only selected signatures? + How do I export a keyring with only selected signatures (keys)? - If you're wanting to create a keyring with only a subset of signatures + If you're wanting to create a keyring with only a subset of keys selected from a master keyring (for a club, user group, or company department for example), simply specify the keys you want to export: @@ -1072,6 +1072,46 @@ you could search in the mailing list arc command, which was built into this release and increases the speed of many operations for existing keyrings. + Doesn't a fully trusted user ID on a key prevent warning messages + when encrypting to other IDs on the key? + + No. That was actually a key validity bug in GnuPG 1.2.1 and earlier + versions. As part of the development of GnuPG 1.2.2, a bug was + discovered in the key validation code. This bug causes keys with + more than one user ID to give all user IDs on the key the amount of + validity given to the most-valid key. The bug has been fixed in GnuPG + release 1.2.2, and upgrading is the recommended fix for this problem. + More information and a patch for a some pre-1.2.2 versions of GnuPG + can be found at: + + [H a href=http://lists.gnupg.org/pipermail/gnupg-announce/2003q2/000268.html][H /a] + + I just compiled GnuPG from source on my GNU/Linux RPM-based system + and it's not working. Why? + + Many GNU/Linux distributions that are RPM-based will install a + version of GnuPG as part of its standard installation, placing the + binaries in the /usr/bin directory. Later, compiling and installing + GnuPG from source other than from a source RPM won't normally + overwrite these files, as the default location for placement of + GnuPG binaries is in /usr/local/bin unless the '--prefix' switch + is used during compile to specify an alternate location. Since the + /usr/bin directory more than likely appears in your path before + /usr/local/bin, the older RPM-version binaries will continue to + be used when called since they were not replaced. + + To resolve this, uninstall the RPM-based version with 'rpm -e gnupg' + before installing the binaries compiled from source. If dependency + errors are displayed when attempting to uninstall the RPM (such as + when Red Hat's up2date is also installed, which uses GnuPG), uninstall + the RPM with 'rpm -e gnupg --nodeps' to force the uninstall. Any + dependent files should be automatically replaced during the install + of the compiled version. If the default /usr/local/bin directory is + used, some packages such as SuSE's Yast Online Update may need to be + configured to look for GnuPG binaries in the /usr/local/bin directory, + or symlinks can be created in /usr/bin that point to the binaries + located in /usr/local/bin. + ADVANCED TOPICS @@ -1299,4 +1339,4 @@ Copyright (C) 2000, 2001, 2002, 2003 Fre 59 Temple Place - Suite 330, Boston, MA 02111, USA Verbatim copying and distribution of this entire article is permitted in -any medium, provided this notice is preserved. +any medium, provided this notice is preserved. \ No newline at end of file diff -urpP gnupg-1.2.2/doc/gpg.1 gnupg-1.2.3/doc/gpg.1 --- gnupg-1.2.2/doc/gpg.1 2003-05-01 14:10:41.000000000 +0000 +++ gnupg-1.2.3/doc/gpg.1 2003-08-21 17:02:01.000000000 +0000 @@ -130,8 +130,13 @@ The same as --encrypt-files with the dif decrypted. The syntax or the filenames is the same. .IP "--list-keys [\fBnames\fR]" 10 .IP "--list-public-keys [\fBnames\fR]" 10 -List all keys from the public keyrings, or just the -ones given on the command line. +List all keys from the public keyrings, or just the ones given on the +command line. +.IP "" 10 +Avoid using the output of this command in scripts or other programs as +it is likely to change as GnuPG changes. See --with-colons for a +machine-parseable key listing command that is appropriate for use in +scripts and other programs. .IP "--list-secret-keys [\fBnames\fR]" 10 List all keys from the secret keyrings, or just the ones given on the command line. A '#' after the letters 'sec' means that the secret key @@ -139,6 +144,16 @@ is not usable (for example, if it was cr --export-secret-subkeys). .IP "--list-sigs [\fBnames\fR]" 10 Same as --list-keys, but the signatures are listed too. +.IP "" 10 +For each signature listed, there are several flags in between the +"sig" tag and keyid. These flags give additional information about +each signature. From left to right, they are the numbers 1-3 for +certificate check level (see --default-cert-check-level), "L" for a +local or non-exportable signature (see --lsign-key), "R" for a +nonRevocable signature (see --nrsign-key), "P" for a signature that +contains a policy URL (see --cert-policy-url), "N" for a signature +that contains a notation (see --cert-notation), and "X" for an eXpired +signature (see --ask-cert-expire). .IP "--check-sigs [\fBnames\fR]" 10 Same as --list-sigs, but the signatures are verified. .IP "--fingerprint [\fBnames\fR]" 10 @@ -666,7 +681,8 @@ and "%%" for an actual percent sign. If then the photo will be supplied to the viewer on standard input. .IP "" 10 The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' -stdin" +stdin". Note that if your image viewer program is not secure, then +executing it from GnuPG does not make it secure. .IP "--exec-path \fBstring\fR" 10 Sets a list of directories to search for photo viewers and keyserver helpers. If not provided, keyserver helpers use the compiled-in @@ -678,18 +694,22 @@ display the name of the keyring a given useful when you're listing a specific key or set of keys. It has no effect when listing all keys. .IP "--keyring \fBfile\fR" 10 -Add \fBfile\fR to the list of keyrings. -If \fBfile\fR begins with a tilde and a slash, these -are replaced by the HOME directory. If the filename -does not contain a slash, it is assumed to be in the -home-directory ("~/.gnupg" if --homedir is not used). -The filename may be prefixed with a scheme: +Add \fBfile\fR to the list of keyrings. If \fBfile\fR begins with a +tilde and a slash, these are replaced by the HOME directory. If the +filename does not contain a slash, it is assumed to be in the GnuPG +home directory ("~/.gnupg" if --homedir is not used). The filename +may be prefixed with a scheme: .IP "" 10 "gnupg-ring:" is the default one. .IP "" 10 It might make sense to use it together with --no-default-keyring. .IP "--secret-keyring \fBfile\fR" 10 Same as --keyring but for the secret keyrings. +.IP "--trustdb-name \fBfile\fR" 10 +Use \fBfile\fR instead of the default trustdb. If \fBfile\fR begins +with a tilde and a slash, these are replaced by the HOME directory. If +the filename does not contain a slash, it is assumed to be in the +GnuPG home directory ("~/.gnupg" if --homedir is not used). .IP "--homedir \fBdirectory\fR" 10 Set the name of the home directory to \fBdirectory\fR If this option is not used it defaults to "~/.gnupg". It does @@ -763,10 +783,11 @@ Please note that this has nothing to do text signatures or armor headers. --no-sk-comments disables this option. .IP "--no-comment" 10 -See --sk-comments. This option is deprecated and may be removed soon. +See --no-sk-comments. This option is deprecated and may be removed +soon. .IP "--comment \fBstring\fR" 10 -Use \fBstring\fR as comment string in clear text signatures. -The default is not do write a comment string. +Use \fBstring\fR as the comment string in clear text signatures. The +default behavior is not to use a comment string. .IP "--default-comment" 10 Force to write the standard comment string in clear text signatures. Use this to overwrite a --comment @@ -778,7 +799,7 @@ Force inclusion of the version string in --no-emit-version disables this option. .IP "--sig-notation \fBname=value\fR" 10 .IP "--cert-notation \fBname=value\fR" 10 -.IP "-N, --notation-data \fBname=value\fR" 10 +.IP "-N, --set-notation \fBname=value\fR" 10 Put the name value pair into the signature as notation data. \fBname\fR must consist only of printable characters or spaces, and must contain a '@' character. This is to help prevent pollution of @@ -788,16 +809,18 @@ encoded in UTF8, so you should check tha correctly. If you prefix \fBname\fR with an exclamation mark, the notation data will be flagged as critical (rfc2440:5.2.3.15). --sig-notation sets a notation for data signatures. --cert-notation -sets a notation for key signatures (certifications). --notation-data +sets a notation for key signatures (certifications). --set-notation sets both. .IP "" 10 There are special codes that may be used in notation names. "%k" will -be expanded into the key ID of the key being signed, "%K" for the long -key ID of the key being signed, "%f" for the key fingerprint of the -key being signed, "%s" for the key ID of the key making the signature, -"%S" for the long key ID of the key making the signature, and "%%" -results in a single "%". %k, %K, and %f are only meaningful when -making a key signature (certification). +be expanded into the key ID of the key being signed, "%K" into the +long key ID of the key being signed, "%f" into the fingerprint of the +key being signed, "%s" into the key ID of the key making the +signature, "%S" into the long key ID of the key making the signature, +"%g" into the fingerprint of the key making the signature (which might +be a subkey), "%p" into the fingerprint of the primary key of the key +making the signature, and "%%" results in a single "%". %k, %K, and +%f are only meaningful when making a key signature (certification). .IP "--show-notation" 10 .IP "--no-show-notation" 10 Show signature notations in the --list-sigs or --check-sigs listings @@ -810,7 +833,7 @@ Use \fBstring\fR as Policy URL for signa you prefix it with an exclamation mark, the policy URL packet will be flagged as critical. --sig-policy-url sets a a policy url for data signatures. --cert-policy-url sets a policy url for key signatures -(certifications). -set-policy-url sets both. +(certifications). --set-policy-url sets both. .IP "" 10 The same %-expandos used for notation data are available here as well. .IP "--show-policy-url" 10 @@ -819,8 +842,9 @@ Show policy URLs in the --list-sigs or - as when verifying a signature with a policy URL in it. --no-show-policy-url disables this option. .IP "--set-filename \fBstring\fR" 10 -Use \fBstring\fR as the name of file which is stored in -messages. +Use \fBstring\fR as the filename which is stored inside messages. +This overrides the default, which is to use the actual filename of the +file being encrypted. .IP "--for-your-eyes-only" 10 .IP "--no-for-your-eyes-only" 10 Set the `for your eyes only' flag in the message. This causes GnuPG @@ -955,23 +979,40 @@ option. .IP "--gpg-agent-info" 10 Override the value of the environment variable \fBGPG_AGENT_INFO\fP. This is only used when --use-agent has been given +.IP "Compliance options" 10 +These options control what GnuPG is compliant to. Only one of these +options may be active at a time. Note that the default setting of +this is nearly always the correct one. See the INTEROPERABILITY WITH +OTHER OPENPGP PROGRAMS section below before using one of these +options. +.RS +.IP "--gnupg" 10 +Use standard GnuPG behavior. This is essentially OpenPGP behavior +(see --openpgp), but with some additional workarounds for common +compatibility problems in different versions of PGP. This is the +default option, so it is not generally needed, but it may be useful to +override a different compliance option in the gpg.conf file. +.IP "--openpgp" 10 +Reset all packet, cipher and digest options to strict OpenPGP +behavior. Use this option to reset all previous options like +--rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and +--compress-algo to OpenPGP compliant values. All PGP workarounds are +disabled. .IP "--rfc1991" 10 -Try to be more RFC1991 (PGP 2.x) compliant. +Try to be more RFC-1991 (PGP 2.x) compliant. .IP "--pgp2" 10 -.IP "--no-pgp2" 10 Set up all options to be as PGP 2.x compliant as possible, and warn if an action is taken (e.g. encrypting to a non-RSA key) that will create a message that PGP 2.x will not be able to handle. Note that `PGP 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x available, but the MIT release is a good common baseline. .IP "" 10 -This option implies `--rfc1991 --no-openpgp --disable-mdc ---no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs +This option implies `--rfc1991 --disable-mdc --no-force-v4-certs +--no-sk-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA --digest-algo MD5 --compress-algo 1'. It also disables --textmode -when encrypting. --no-pgp2 disables this option. +when encrypting. .IP "--pgp6" 10 -.IP "--no-pgp6" 10 Set up all options to be as PGP 6 compliant as possible. This restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the @@ -979,29 +1020,20 @@ compression algorithms none and ZIP. Th --throw-keyid, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. .IP "" 10 -This option implies `--disable-mdc --no-comment --escape-from-lines ---force-v3-sigs --no-ask-sig-expire --compress-algo 1' --no-pgp6 -disables this option. +This option implies `--disable-mdc --no-sk-comment --escape-from-lines +--force-v3-sigs --no-ask-sig-expire' .IP "--pgp7" 10 -.IP "--no-pgp7" 10 Set up all options to be as PGP 7 compliant as possible. This is identical to --pgp6 except that MDCs are not disabled, and the list of allowable ciphers is expanded to add AES128, AES192, AES256, and -TWOFISH. --no-pgp7 disables this option. +TWOFISH. .IP "--pgp8" 10 -.IP "--no-pgp8" 10 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable --throw-keyid and set --escape-from-lines and ---compress-algo 1. The allowed algorithms list is the same as --pgp7 -with the addition of the SHA-256 digest algorithm. --no-pgp8 disables -this option. -.IP "--openpgp" 10 -Reset all packet, cipher and digest options to OpenPGP behavior. Use -this option to reset all previous options like --rfc1991, ---force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and ---compress-algo to OpenPGP compliant values. All PGP workarounds and ---pgpX modes are also disabled. +all this does is disable --throw-keyid and set --escape-from-lines. +The allowed algorithms list is the same as --pgp7 with the addition of +the SHA-256 digest algorithm. +.RE .IP "--force-v3-sigs" 10 .IP "--no-force-v3-sigs" 10 OpenPGP states that an implementation should generate v4 signatures @@ -1035,14 +1067,16 @@ one. This option should only be used in it does not ensure the de-facto standard format of user IDs. .IP "--ignore-time-conflict" 10 GnuPG normally checks that the timestamps associated with keys and -signatures have plausible values. However, sometimes a signature seems to -be older than the key due to clock problems. This option makes these -checks just a warning. +signatures have plausible values. However, sometimes a signature +seems to be older than the key due to clock problems. This option +makes these checks just a warning. See also --ignore-valid-from for +timestamp issues on subkeys. .IP "--ignore-valid-from" 10 -GnuPG normally does not select and use subkeys created in the future. This -option allows the use of such keys and thus exhibits the pre-1.0.7 -behaviour. You should not use this option unless you there is some -clock problem. +GnuPG normally does not select and use subkeys created in the future. +This option allows the use of such keys and thus exhibits the +pre-1.0.7 behaviour. You should not use this option unless you there +is some clock problem. See also --ignore-time-conflict for timestamp +issues with signatures. .IP "--ignore-crc-error" 10 The ASCII armor used by OpenPGP is protected by a CRC checksum against transmission errors. Sometimes it happens that the CRC gets mangled @@ -1081,11 +1115,17 @@ Suppress the initial copyright message. .IP "--no-secmem-warning" 10 Suppress the warning about "using insecure memory". .IP "--no-permission-warning" 10 -Suppress the warning about unsafe file permissions. Note that the -file permission checks that GnuPG performs are not intended to be -authoritative, rather they simply warn about certain common permission -problems. Do not assume that the lack of a warning means that your -system is secure. +Suppress the warning about unsafe file and home directory (--homedir) +permissions. Note that the permission checks that GnuPG performs are +not intended to be authoritative, but rather they simply warn about +certain common permission problems. Do not assume that the lack of a +warning means that your system is secure. +.IP "" 10 +Note that the warning for unsafe --homedir permissions cannot be +supressed in the gpg.conf file, as this would allow an attacker to +place an unsafe gpg.conf file in place, and use this file to supress +warnings about itself. The --homedir permissions warning may only be +supressed on the command line. .IP "--no-mdc-warning" 10 Suppress the warning about missing MDC integrity protection. .IP "--no-armor" 10 @@ -1098,8 +1138,12 @@ Skip the signature verification step. T used to make the decryption faster if the signature verification is not needed. .IP "--with-colons" 10 -Print key listings delimited by colons. Note, that the output will be -encoded in UTF-8 regardless of any --charset setting. +Print key listings delimited by colons. Note that the output will be +encoded in UTF-8 regardless of any --charset setting. This format is +useful when GnuPG is called from scripts and other programs as it is +easily machine parsed. The details of this format are documented in +the file doc/DETAILS, which is included in the GnuPG source +distribution. .IP "--with-key-data" 10 Print key listings delimited by colons (like --with-colons) and print the public key data. .IP "--with-fingerprint" 10 @@ -1201,6 +1245,7 @@ Set the list of personal digest preferen should be a string similar to the one printed by the command "pref" in the edit menu. This allows the user to factor in their own preferred algorithms when algorithms are chosen via recipient key preferences. +The default value is "H2" indicating SHA-1. .IP "--personal-compress-preferences \fBstring\fR" 10 Set the list of personal compression preferences to \fBstring\fR, this list should be a string similar to the one printed by the command @@ -1368,4 +1413,4 @@ operating system from writing memory pag warning message about insecure memory your operating system supports locking without being root. The program drops root privileges as soon as locked memory is allocated. -...\" created by instant / docbook-to-man, Thu 01 May 2003, 16:10 +...\" created by instant / docbook-to-man, Thu 21 Aug 2003, 19:01 diff -urpP gnupg-1.2.2/doc/gpg.sgml gnupg-1.2.3/doc/gpg.sgml --- gnupg-1.2.2/doc/gpg.sgml 2003-05-01 14:09:12.000000000 +0000 +++ gnupg-1.2.3/doc/gpg.sgml 2003-07-30 07:44:43.000000000 +0000 @@ -215,8 +215,13 @@ B<-k> [I] [I] --list-keys &OptParmNames; --list-public-keys &OptParmNames; -List all keys from the public keyrings, or just the -ones given on the command line. +List all keys from the public keyrings, or just the ones given on the +command line. + +Avoid using the output of this command in scripts or other programs as +it is likely to change as GnuPG changes. See --with-colons for a +machine-parseable key listing command that is appropriate for use in +scripts and other programs. @@ -234,6 +239,16 @@ is not usable (for example, if it was cr --list-sigs &OptParmNames; Same as --list-keys, but the signatures are listed too. + +For each signature listed, there are several flags in between the +"sig" tag and keyid. These flags give additional information about +each signature. From left to right, they are the numbers 1-3 for +certificate check level (see --default-cert-check-level), "L" for a +local or non-exportable signature (see --lsign-key), "R" for a +nonRevocable signature (see --nrsign-key), "P" for a signature that +contains a policy URL (see --cert-policy-url), "N" for a signature +that contains a notation (see --cert-notation), and "X" for an eXpired +signature (see --ask-cert-expire). @@ -1178,6 +1193,7 @@ photo ID attached to the key, if any. S --photo-viewer &ParmString; + This is the command line that should be run to view a photo ID. "%i" will be expanded to a filename containing the photo. "%I" does the same, except the file will not be deleted once the viewer exits. @@ -1188,7 +1204,8 @@ and "%%" for an actual percent sign. If then the photo will be supplied to the viewer on standard input. The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' -stdin" +stdin". Note that if your image viewer program is not secure, then +executing it from GnuPG does not make it secure. @@ -1212,12 +1229,11 @@ effect when listing all keys. --keyring &ParmFile; -Add &ParmFile to the list of keyrings. -If &ParmFile begins with a tilde and a slash, these -are replaced by the HOME directory. If the filename -does not contain a slash, it is assumed to be in the -home-directory ("~/.gnupg" if --homedir is not used). -The filename may be prefixed with a scheme: +Add &ParmFile; to the list of keyrings. If &ParmFile; begins with a +tilde and a slash, these are replaced by the HOME directory. If the +filename does not contain a slash, it is assumed to be in the GnuPG +home directory ("~/.gnupg" if --homedir is not used). The filename +may be prefixed with a scheme: "gnupg-ring:" is the default one. It might make sense to use it together with --no-default-keyring. @@ -1231,6 +1247,18 @@ Same as --keyring but for the secret key +--trustdb-name &ParmFile; + + +Use &ParmFile; instead of the default trustdb. If &ParmFile; begins +with a tilde and a slash, these are replaced by the HOME directory. If +the filename does not contain a slash, it is assumed to be in the +GnuPG home directory ("~/.gnupg" if --homedir is not used). + + + + + --homedir &ParmDir; Set the name of the home directory to &ParmDir; If this @@ -1374,15 +1402,16 @@ option. --no-comment -See --sk-comments. This option is deprecated and may be removed soon. +See --no-sk-comments. This option is deprecated and may be removed +soon. --comment &ParmString; -Use &ParmString; as comment string in clear text signatures. -The default is not do write a comment string. +Use &ParmString; as the comment string in clear text signatures. The +default behavior is not to use a comment string. @@ -1408,7 +1437,7 @@ Force inclusion of the version string in --sig-notation &ParmNameValue; --cert-notation &ParmNameValue; --N, --notation-data &ParmNameValue; +-N, --set-notation &ParmNameValue; Put the name value pair into the signature as notation data. &ParmName; must consist only of printable characters or spaces, and @@ -1419,18 +1448,20 @@ encoded in UTF8, so you should check tha correctly. If you prefix &ParmName; with an exclamation mark, the notation data will be flagged as critical (rfc2440:5.2.3.15). --sig-notation sets a notation for data signatures. --cert-notation -sets a notation for key signatures (certifications). --notation-data +sets a notation for key signatures (certifications). --set-notation sets both. There are special codes that may be used in notation names. "%k" will -be expanded into the key ID of the key being signed, "%K" for the long -key ID of the key being signed, "%f" for the key fingerprint of the -key being signed, "%s" for the key ID of the key making the signature, -"%S" for the long key ID of the key making the signature, and "%%" -results in a single "%". %k, %K, and %f are only meaningful when -making a key signature (certification). +be expanded into the key ID of the key being signed, "%K" into the +long key ID of the key being signed, "%f" into the fingerprint of the +key being signed, "%s" into the key ID of the key making the +signature, "%S" into the long key ID of the key making the signature, +"%g" into the fingerprint of the key making the signature (which might +be a subkey), "%p" into the fingerprint of the primary key of the key +making the signature, and "%%" results in a single "%". %k, %K, and +%f are only meaningful when making a key signature (certification). @@ -1454,10 +1485,8 @@ Use &ParmString; as Policy URL for signa you prefix it with an exclamation mark, the policy URL packet will be flagged as critical. --sig-policy-url sets a a policy url for data signatures. --cert-policy-url sets a policy url for key signatures -(certifications). -set-policy-url sets both. - - - +(certifications). --set-policy-url sets both. + The same %-expandos used for notation data are available here as well. @@ -1473,8 +1502,9 @@ as when verifying a signature with a pol --set-filename &ParmString; -Use &ParmString; as the name of file which is stored in -messages. +Use &ParmString; as the filename which is stored inside messages. +This overrides the default, which is to use the actual filename of the +file being encrypted. @@ -1727,16 +1757,44 @@ Override the value of the environment va GPG_AGENT_INFO. This is only used when --use-agent has been given + +Compliance options + +These options control what GnuPG is compliant to. Only one of these +options may be active at a time. Note that the default setting of +this is nearly always the correct one. See the INTEROPERABILITY WITH +OTHER OPENPGP PROGRAMS section below before using one of these +options. + + + +--gnupg + +Use standard GnuPG behavior. This is essentially OpenPGP behavior +(see --openpgp), but with some additional workarounds for common +compatibility problems in different versions of PGP. This is the +default option, so it is not generally needed, but it may be useful to +override a different compliance option in the gpg.conf file. + + + +--openpgp + +Reset all packet, cipher and digest options to strict OpenPGP +behavior. Use this option to reset all previous options like +--rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and +--compress-algo to OpenPGP compliant values. All PGP workarounds are +disabled. + --rfc1991 -Try to be more RFC1991 (PGP 2.x) compliant. +Try to be more RFC-1991 (PGP 2.x) compliant. --pgp2 ---no-pgp2 Set up all options to be as PGP 2.x compliant as possible, and warn if an action is taken (e.g. encrypting to a non-RSA key) that will create @@ -1744,16 +1802,15 @@ a message that PGP 2.x will not be able 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x available, but the MIT release is a good common baseline. -This option implies `--rfc1991 --no-openpgp --disable-mdc ---no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs +This option implies `--rfc1991 --disable-mdc --no-force-v4-certs +--no-sk-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA --digest-algo MD5 --compress-algo 1'. It also disables --textmode -when encrypting. --no-pgp2 disables this option. +when encrypting. --pgp6 ---no-pgp6 Set up all options to be as PGP 6 compliant as possible. This restricts you to the ciphers IDEA (if the IDEA plugin is installed), @@ -1762,42 +1819,30 @@ compression algorithms none and ZIP. Th --throw-keyid, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. -This option implies `--disable-mdc --no-comment --escape-from-lines ---force-v3-sigs --no-ask-sig-expire --compress-algo 1' --no-pgp6 -disables this option. +This option implies `--disable-mdc --no-sk-comment --escape-from-lines +--force-v3-sigs --no-ask-sig-expire' --pgp7 ---no-pgp7 Set up all options to be as PGP 7 compliant as possible. This is identical to --pgp6 except that MDCs are not disabled, and the list of allowable ciphers is expanded to add AES128, AES192, AES256, and -TWOFISH. --no-pgp7 disables this option. +TWOFISH. --pgp8 ---no-pgp8 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable --throw-keyid and set --escape-from-lines and ---compress-algo 1. The allowed algorithms list is the same as --pgp7 -with the addition of the SHA-256 digest algorithm. --no-pgp8 disables -this option. +all this does is disable --throw-keyid and set --escape-from-lines. +The allowed algorithms list is the same as --pgp7 with the addition of +the SHA-256 digest algorithm. - ---openpgp - -Reset all packet, cipher and digest options to OpenPGP behavior. Use -this option to reset all previous options like --rfc1991, ---force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and ---compress-algo to OpenPGP compliant values. All PGP workarounds and ---pgpX modes are also disabled. - + --force-v3-sigs @@ -1858,18 +1903,20 @@ it does not ensure the de-facto standard --ignore-time-conflict GnuPG normally checks that the timestamps associated with keys and -signatures have plausible values. However, sometimes a signature seems to -be older than the key due to clock problems. This option makes these -checks just a warning. +signatures have plausible values. However, sometimes a signature +seems to be older than the key due to clock problems. This option +makes these checks just a warning. See also --ignore-valid-from for +timestamp issues on subkeys. --ignore-valid-from -GnuPG normally does not select and use subkeys created in the future. This -option allows the use of such keys and thus exhibits the pre-1.0.7 -behaviour. You should not use this option unless you there is some -clock problem. +GnuPG normally does not select and use subkeys created in the future. +This option allows the use of such keys and thus exhibits the +pre-1.0.7 behaviour. You should not use this option unless you there +is some clock problem. See also --ignore-time-conflict for timestamp +issues with signatures. @@ -1948,11 +1995,18 @@ Suppress the warning about "using insecu --no-permission-warning -Suppress the warning about unsafe file permissions. Note that the -file permission checks that GnuPG performs are not intended to be -authoritative, rather they simply warn about certain common permission -problems. Do not assume that the lack of a warning means that your -system is secure. + +Suppress the warning about unsafe file and home directory (--homedir) +permissions. Note that the permission checks that GnuPG performs are +not intended to be authoritative, but rather they simply warn about +certain common permission problems. Do not assume that the lack of a +warning means that your system is secure. + +Note that the warning for unsafe --homedir permissions cannot be +supressed in the gpg.conf file, as this would allow an attacker to +place an unsafe gpg.conf file in place, and use this file to supress +warnings about itself. The --homedir permissions warning may only be +supressed on the command line. @@ -1989,8 +2043,12 @@ verification is not needed. --with-colons -Print key listings delimited by colons. Note, that the output will be -encoded in UTF-8 regardless of any --charset setting. +Print key listings delimited by colons. Note that the output will be +encoded in UTF-8 regardless of any --charset setting. This format is +useful when GnuPG is called from scripts and other programs as it is +easily machine parsed. The details of this format are documented in +the file doc/DETAILS, which is included in the GnuPG source +distribution. @@ -2182,6 +2240,7 @@ Set the list of personal digest preferen should be a string similar to the one printed by the command "pref" in the edit menu. This allows the user to factor in their own preferred algorithms when algorithms are chosen via recipient key preferences. +The default value is "H2" indicating SHA-1. diff -urpP gnupg-1.2.2/doc/gpg.texi gnupg-1.2.3/doc/gpg.texi --- gnupg-1.2.2/doc/gpg.texi 2003-05-01 14:10:00.000000000 +0000 +++ gnupg-1.2.3/doc/gpg.texi 2003-08-21 16:19:51.000000000 +0000 @@ -101,8 +101,13 @@ decrypted. The syntax or the filenames i @item ---list-keys @code{names} @itemx ---list-public-keys @code{names} -List all keys from the public keyrings, or just the -ones given on the command line. +List all keys from the public keyrings, or just the ones given on the +command line. + +Avoid using the output of this command in scripts or other programs as +it is likely to change as GnuPG changes. See ---with-colons for a +machine-parseable key listing command that is appropriate for use in +scripts and other programs. @item ---list-secret-keys @code{names} List all keys from the secret keyrings, or just the ones given on the @@ -113,6 +118,16 @@ is not usable (for example, if it was cr @item ---list-sigs @code{names} Same as ---list-keys, but the signatures are listed too. +For each signature listed, there are several flags in between the +"sig" tag and keyid. These flags give additional information about +each signature. From left to right, they are the numbers 1-3 for +certificate check level (see ---default-cert-check-level), "L" for a +local or non-exportable signature (see ---lsign-key), "R" for a +nonRevocable signature (see ---nrsign-key), "P" for a signature that +contains a policy URL (see ---cert-policy-url), "N" for a signature +that contains a notation (see ---cert-notation), and "X" for an eXpired +signature (see ---ask-cert-expire). + @item ---check-sigs @code{names} Same as ---list-sigs, but the signatures are verified. @@ -764,7 +779,8 @@ and "%%" for an actual percent sign. If then the photo will be supplied to the viewer on standard input. The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' -stdin" +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} Sets a list of directories to search for photo viewers and keyserver @@ -779,12 +795,11 @@ useful when you're listing a specific ke effect when listing all keys. @item ---keyring @code{file} -Add @code{file} to the list of keyrings. -If @code{file} begins with a tilde and a slash, these -are replaced by the HOME directory. If the filename -does not contain a slash, it is assumed to be in the -home-directory ("~/.gnupg" if ---homedir is not used). -The filename may be prefixed with a scheme: +Add @code{file} to the list of keyrings. If @code{file} begins with a +tilde and a slash, these are replaced by the HOME directory. If the +filename does not contain a slash, it is assumed to be in the GnuPG +home directory ("~/.gnupg" if ---homedir is not used). The filename +may be prefixed with a scheme: "gnupg-ring:" is the default one. @@ -793,6 +808,12 @@ It might make sense to use it together w @item ---secret-keyring @code{file} Same as ---keyring but for the secret keyrings. +@item ---trustdb-name @code{file} +Use @code{file} instead of the default trustdb. If @code{file} begins +with a tilde and a slash, these are replaced by the HOME directory. If +the filename does not contain a slash, it is assumed to be in the +GnuPG home directory ("~/.gnupg" if ---homedir is not used). + @item ---homedir @code{directory} Set the name of the home directory to @code{directory} If this option is not used it defaults to "~/.gnupg". It does @@ -885,11 +906,12 @@ text signatures or armor headers. ---no- option. @item ---no-comment -See ---sk-comments. This option is deprecated and may be removed soon. +See ---no-sk-comments. This option is deprecated and may be removed +soon. @item ---comment @code{string} -Use @code{string} as comment string in clear text signatures. -The default is not do write a comment string. +Use @code{string} as the comment string in clear text signatures. The +default behavior is not to use a comment string. @item ---default-comment Force to write the standard comment string in clear @@ -904,7 +926,7 @@ Force inclusion of the version string in @item ---sig-notation @code{name=value} @itemx ---cert-notation @code{name=value} -@itemx -N, ---notation-data @code{name=value} +@itemx -N, ---set-notation @code{name=value} Put the name value pair into the signature as notation data. @code{name} must consist only of printable characters or spaces, and must contain a '@@' character. This is to help prevent pollution of @@ -914,16 +936,18 @@ encoded in UTF8, so you should check tha correctly. If you prefix @code{name} with an exclamation mark, the notation data will be flagged as critical (rfc2440:5.2.3.15). ---sig-notation sets a notation for data signatures. --cert-notation -sets a notation for key signatures (certifications). ---notation-data +sets a notation for key signatures (certifications). ---set-notation sets both. There are special codes that may be used in notation names. "%k" will -be expanded into the key ID of the key being signed, "%K" for the long -key ID of the key being signed, "%f" for the key fingerprint of the -key being signed, "%s" for the key ID of the key making the signature, -"%S" for the long key ID of the key making the signature, and "%%" -results in a single "%". %k, %K, and %f are only meaningful when -making a key signature (certification). +be expanded into the key ID of the key being signed, "%K" into the +long key ID of the key being signed, "%f" into the fingerprint of the +key being signed, "%s" into the key ID of the key making the +signature, "%S" into the long key ID of the key making the signature, +"%g" into the fingerprint of the key making the signature (which might +be a subkey), "%p" into the fingerprint of the primary key of the key +making the signature, and "%%" results in a single "%". %k, %K, and +%f are only meaningful when making a key signature (certification). @item ---show-notation @itemx ---no-show-notation @@ -938,7 +962,7 @@ Use @code{string} as Policy URL for sign you prefix it with an exclamation mark, the policy URL packet will be flagged as critical. ---sig-policy-url sets a a policy url for data signatures. ---cert-policy-url sets a policy url for key signatures -(certifications). -set-policy-url sets both. +(certifications). ---set-policy-url sets both. The same %-expandos used for notation data are available here as well. @@ -949,8 +973,9 @@ as when verifying a signature with a pol ---no-show-policy-url disables this option. @item ---set-filename @code{string} -Use @code{string} as the name of file which is stored in -messages. +Use @code{string} as the filename which is stored inside messages. +This overrides the default, which is to use the actual filename of the +file being encrypted. @item ---for-your-eyes-only @itemx ---no-for-your-eyes-only @@ -1111,25 +1136,45 @@ option. Override the value of the environment variable @samp{GPG_AGENT_INFO}. This is only used when ---use-agent has been given +@item Compliance options +These options control what GnuPG is compliant to. Only one of these +options may be active at a time. Note that the default setting of +this is nearly always the correct one. See the INTEROPERABILITY WITH +OTHER OPENPGP PROGRAMS section below before using one of these +options. + +@table @asis +@item ---gnupg +Use standard GnuPG behavior. This is essentially OpenPGP behavior +(see ---openpgp), but with some additional workarounds for common +compatibility problems in different versions of PGP. This is the +default option, so it is not generally needed, but it may be useful to +override a different compliance option in the gpg.conf file. + +@item ---openpgp +Reset all packet, cipher and digest options to strict OpenPGP +behavior. Use this option to reset all previous options like +---rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and +---compress-algo to OpenPGP compliant values. All PGP workarounds are +disabled. + @item ---rfc1991 -Try to be more RFC1991 (PGP 2.x) compliant. +Try to be more RFC-1991 (PGP 2.x) compliant. @item ---pgp2 -@itemx ---no-pgp2 Set up all options to be as PGP 2.x compliant as possible, and warn if an action is taken (e.g. encrypting to a non-RSA key) that will create a message that PGP 2.x will not be able to handle. Note that `PGP 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x available, but the MIT release is a good common baseline. -This option implies `---rfc1991 --no-openpgp --disable-mdc ----no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs +This option implies `---rfc1991 --disable-mdc --no-force-v4-certs +---no-sk-comment --escape-from-lines --force-v3-sigs ---no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA ---digest-algo MD5 --compress-algo 1'. It also disables --textmode -when encrypting. ---no-pgp2 disables this option. +when encrypting. @item ---pgp6 -@itemx ---no-pgp6 Set up all options to be as PGP 6 compliant as possible. This restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the @@ -1137,32 +1182,23 @@ compression algorithms none and ZIP. Thi ---throw-keyid, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. -This option implies `---disable-mdc --no-comment --escape-from-lines ----force-v3-sigs --no-ask-sig-expire --compress-algo 1' --no-pgp6 -disables this option. +This option implies `---disable-mdc --no-sk-comment --escape-from-lines +---force-v3-sigs --no-ask-sig-expire' @item ---pgp7 -@itemx ---no-pgp7 Set up all options to be as PGP 7 compliant as possible. This is identical to ---pgp6 except that MDCs are not disabled, and the list of allowable ciphers is expanded to add AES128, AES192, AES256, and -TWOFISH. ---no-pgp7 disables this option. +TWOFISH. @item ---pgp8 -@itemx ---no-pgp8 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable ---throw-keyid and set --escape-from-lines and ----compress-algo 1. The allowed algorithms list is the same as --pgp7 -with the addition of the SHA-256 digest algorithm. ---no-pgp8 disables -this option. +all this does is disable ---throw-keyid and set --escape-from-lines. +The allowed algorithms list is the same as ---pgp7 with the addition of +the SHA-256 digest algorithm. -@item ---openpgp -Reset all packet, cipher and digest options to OpenPGP behavior. Use -this option to reset all previous options like ---rfc1991, ----force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and ----compress-algo to OpenPGP compliant values. All PGP workarounds and ----pgpX modes are also disabled. +@end table @item ---force-v3-sigs @itemx ---no-force-v3-sigs @@ -1203,15 +1239,17 @@ it does not ensure the de-facto standard @item ---ignore-time-conflict GnuPG normally checks that the timestamps associated with keys and -signatures have plausible values. However, sometimes a signature seems to -be older than the key due to clock problems. This option makes these -checks just a warning. +signatures have plausible values. However, sometimes a signature +seems to be older than the key due to clock problems. This option +makes these checks just a warning. See also ---ignore-valid-from for +timestamp issues on subkeys. @item ---ignore-valid-from -GnuPG normally does not select and use subkeys created in the future. This -option allows the use of such keys and thus exhibits the pre-1.0.7 -behaviour. You should not use this option unless you there is some -clock problem. +GnuPG normally does not select and use subkeys created in the future. +This option allows the use of such keys and thus exhibits the +pre-1.0.7 behaviour. You should not use this option unless you there +is some clock problem. See also ---ignore-time-conflict for timestamp +issues with signatures. @item ---ignore-crc-error The ASCII armor used by OpenPGP is protected by a CRC checksum against @@ -1260,11 +1298,17 @@ Suppress the initial copyright message. Suppress the warning about "using insecure memory". @item ---no-permission-warning -Suppress the warning about unsafe file permissions. Note that the -file permission checks that GnuPG performs are not intended to be -authoritative, rather they simply warn about certain common permission -problems. Do not assume that the lack of a warning means that your -system is secure. +Suppress the warning about unsafe file and home directory (---homedir) +permissions. Note that the permission checks that GnuPG performs are +not intended to be authoritative, but rather they simply warn about +certain common permission problems. Do not assume that the lack of a +warning means that your system is secure. + +Note that the warning for unsafe ---homedir permissions cannot be +supressed in the gpg.conf file, as this would allow an attacker to +place an unsafe gpg.conf file in place, and use this file to supress +warnings about itself. The ---homedir permissions warning may only be +supressed on the command line. @item ---no-mdc-warning Suppress the warning about missing MDC integrity protection. @@ -1282,8 +1326,12 @@ used to make the decryption faster if th verification is not needed. @item ---with-colons -Print key listings delimited by colons. Note, that the output will be -encoded in UTF-8 regardless of any ---charset setting. +Print key listings delimited by colons. Note that the output will be +encoded in UTF-8 regardless of any ---charset setting. This format is +useful when GnuPG is called from scripts and other programs as it is +easily machine parsed. The details of this format are documented in +the file doc/DETAILS, which is included in the GnuPG source +distribution. @item ---with-key-data Print key listings delimited by colons (like ---with-colons) and print the public key data. @@ -1407,6 +1455,7 @@ Set the list of personal digest preferen should be a string similar to the one printed by the command "pref" in the edit menu. This allows the user to factor in their own preferred algorithms when algorithms are chosen via recipient key preferences. +The default value is "H2" indicating SHA-1. @item ---personal-compress-preferences @code{string} Set the list of personal compression preferences to @code{string}, this diff -urpP gnupg-1.2.2/doc/gpgv.1 gnupg-1.2.3/doc/gpgv.1 --- gnupg-1.2.2/doc/gpgv.1 2003-05-01 14:10:45.000000000 +0000 +++ gnupg-1.2.3/doc/gpgv.1 2003-06-19 10:16:11.000000000 +0000 @@ -135,4 +135,4 @@ If set directory used instead of "~/.gnu .SH "FILES" .IP "~/.gnupg/trustedkeys.gpg" 10 The default keyring with the allowed keys -...\" created by instant / docbook-to-man, Thu 01 May 2003, 16:10 +...\" created by instant / docbook-to-man, Thu 19 Jun 2003, 12:16 diff -urpP gnupg-1.2.2/doc/samplekeys.asc gnupg-1.2.3/doc/samplekeys.asc --- gnupg-1.2.2/doc/samplekeys.asc 2003-03-06 09:43:51.000000000 +0000 +++ gnupg-1.2.3/doc/samplekeys.asc 2003-08-21 17:11:08.000000000 +0000 @@ -3,12 +3,12 @@ pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) - pub 1024D/621CC013 1998-07-07 Werner Koch + pub 1024D/621CC013 1998-07-07 Werner Koch uid Werner Koch - uid Werner Koch + uid Werner Koch sub 1536g/ADF6A6E1 1999-02-20 [expires: 2002-11-01] sub 1536G/B5A18FF4 1998-07-07 [expires: 2002-07-06] - sub 1536R/23D2A63D 2002-07-30 [expires: 2003-07-31] + sub 1536R/23D2A63D 2002-07-30 [expires: 2003-12-31] pub 4096R/99242560 2002-01-28 David M. Shaw sub 2048g/1643B926 2002-01-28 [expires: 2012-01-26] @@ -16,1110 +16,1114 @@ pub 1024D/B2D7795E 2001-01-04 Philip R. Zimmermann uid Philip R. Zimmermann - uid [jpeg image of size 3457] uid [jpeg image of size 3369] + uid [jpeg image of size 3457] sub 3072g/A8E92834 2001-01-04 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.2rc1 (GNU/Linux) +Version: GnuPG v1.2.3rc1 (GNU/Linux) -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 +SsvVA4Pxk9dNhe68gdCihL81tFfeIU78Z7Kft75UJpuhyDUd64BH3/2/cHwtwsmo +xe+1Ur9FFQM/06HRC+iIRgQQEQIABgUCOlaPIgAKCRDHRjY5std5XgfRAKCSnx3t +oHhFsCAaIsCRkmFdI4Hn9gCbBDKIqvBEjybcnaBW+iZufcjAzseIRgQQEQIABgUC +OleFogAKCRCsuxZLz3PsTDo9AJ97srZSNDeiQUHoiGsETRMKG6Uf+ACgwsiJIzN2 +rVgvAgCfq89g/efv8hSIRgQQEQIABgUCOlrmxQAKCRBnkE+tCnkWEFGpAJ9MTxfQ +jleEdi8f4jNaD+FT3dc2xgCg95lpK17OyyNr8a8afH3LeOErrmGIRgQQEQIABgUC +OqqgvAAKCRDu0N9wv2fS6wzzAKC4DGHdrN2edFO1Fxj36yATMn3AbACghUiAThZd +2kiO8zNV0dHICrVM2rDRzH//AAANOgEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJ +RgABAQAAAQABAAD/2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIf +IiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7 +KCIoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozv/wAARCACQAHgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAEC +AwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJx +FDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpT +VFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ip +qrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6 +/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcF +BAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl +8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6 +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 +0xwLad1BCtIWAIx1AqzCjIAwOGPWoogzyunyhSR90VfEf9DW2xh1IP3jORk9anVG +8sbjyKfgA09edwouFiJ+GH4il2ZUjvQ/b609SN2KYC4AGexopkzHyyB1ooSBs//Z +iE4EEBECAAYFAjpWjyIAEgkQx0Y2ObLXeV4HZUdQRwABAQfRAKCSnx3toHhFsCAa +IsCRkmFdI4Hn9gCbBDKIqvBEjybcnaBW+iZufcjAzseITAQQEQIADAUCOlaPbgUD +EO1ygAAKCRBjy2kd+uvV/Bv7AJ9yNVEkLzTBAtHTdRJfhYh7Mxk4TwCfYDsvdC3/ +yuAd/SebBzGIJ99CckCIRgQQEQIABgUCOlcn3wAKCRDXjLzlZqdLMfZsAKCn45nl +IkqVQ7X2KHPXIeXJn8z4egCg8jsV7aHGKMqqI9zrXHL14RIx6s6IRgQQEQIABgUC +OlrmxQAKCRBnkE+tCnkWEFGpAJ9MTxfQjleEdi8f4jNaD+FT3dc2xgCg95lpK17O +yyNr8a8afH3LeOErrmHRzNf/AAANkgEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJ +RgABAQAAAQABAAD/2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIf +IiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7 +KCIoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozv/wAARCACPAHUDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAEC +AwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJx +FDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpT +VFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ip +qrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6 +/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcF +BAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl +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 -IsCRkmFdI4Hn9gCbBDKIqvBEjybcnaBW+iZufcjAzseIRgQQEQIABgUCOlcpSQAK -CRDXjLzlZqdLMaqdAJ4+skmsueAfQwNisNSqsrWO7b8EdQCeJ4Qi0olSg30VfNpx -WwQVbUPRTBCIRgQQEQIABgUCOleFogAKCRCsuxZLz3PsTDo9AJ97srZSNDeiQUHo -iGsETRMKG6Uf+ACgwsiJIzN2rVgvAgCfq89g/efv8hSIRgQQEQIABgUCOlrmxQAK -CRBnkE+tCnkWEFGpAJ9MTxfQjleEdi8f4jNaD+FT3dc2xgCg95lpK17OyyNr8a8a -fH3LeOErrmGIRgQQEQIABgUCOqqgvAAKCRDu0N9wv2fS6wzzAKC4DGHdrN2edFO1 -Fxj36yATMn3AbACghUiAThZd2kiO8zNV0dHICrVM2rDRzNf/AAANkgEQAAEBAAAA -AAAAAAAAAAAA/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAoHBwgHBgoICAgLCgoL -DhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9 -Pjv/2wBDAQoLCw4NDhwQEBw7KCIoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozv/wAARCACPAHUDASIAAhEBAxEB/8QAHwAA -AQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9 -AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJico -KSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJ -ipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi -4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcI -CQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKR -obHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldY -WVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0 -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 -v5VYlwblAW6qMZ9c1mztgSleCzAKR26c1T0dwL1sDNPNOed7HafYcCr8MnlSAZwr -dSfWobSLZCij0xRLlXHHDVBojSLZGSTz29KYFDK6nncMVHbTCSMqx+739RUJvWz+ -5A4/jbp+VIZSnGFOAOKbC3zZzjr0pbjvnkk9qihyZAB34oFfU0IEO05BH9f0oq1h -IkXIySKKBn//2YhGBBARAgAGBQI8ZiQyAAoJEMdGNjmy13leJSIAoIx0Ql/m4Gf4 -ZZeFQ1Of+zq6499DAKCHBzmIEtE740kuUl5HGNvCJ4QbMIhGBBARAgAGBQI8ZiXu -AAoJEGPLaR3669X8OzwAoKHGtOZfI1nc4NEGzRLorYzuHN2YAKC6koYnTdhlsiEO -JxiaUxTGi+Vv4ohGBBARAgAGBQI8eeQVAAoJENeMvOVmp0sxgFcAoMxHrvckZbPi -4AWxG8t24oeDLhSnAJkB3buFQhtx+RUleKEsJBD+kILz3tHMf/8AAA06ARAAAQEA -AAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAAABAAEAAP/bAEMACgcHCAcGCggICAsK -CgsOGBAODQ0OHRUWERgjHyUkIh8iISYrNy8mKTQpISIwQTE0OTs+Pj4lLkRJQzxI -Nz0+O//bAEMBCgsLDg0OHBAQHDsoIig7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAJAAeAMBIgACEQEDEQH/xAAf -AAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAA -AX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUm -JygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaH -iImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna -4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUG -BwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgU -QpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVW -V1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqy -s7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAM -AwEAAhEDEQA/AOopcUoNISAMk4FdJ54dqgmuooh8zCqV5qfJSL86yLi52o0sz4RR -kk00iW+xqS6qOdhrNvPEqWiks4dh/CprlL/xC87GO3JjXPXuaypZmkYDO7PXA/rU -ua6GsaTe50dx471EviBI0HoRuNVT4113dgSKv1QVz6ctgLj2NaFu3lRbREgZunIr -O7NuWK6G5Z+OdTDfvvKlC/e+Tb+tdVpXijTtUUKJRDN3jc/yPevNWmcsRIiAeiil -kkhgjE8ODz1Vvu01JkummewghgCCCPUUprhdD8buvl297EjRHhZVOCPqOldvHKs0 -ayRncjDIIPUVadzFprcXbig0tFMkjIop5xRTAeOtZuqXZj/coeT1rTzgc9q5m7uB -Ncux6Z4oSCTIua5LxNqpeY2UbfKh+fB6munup1trWWdukaFq88ffI3msfnkO4k0q -j0sXRjd3ZPaxO37x1+U9BjOTW3BokrwB5ULF+Qo4xUGjWokuYlI+QfMfeu7htEmV -eMVztnYlc4G50GUjIRgB69qrwWQtGyV3knr3FekNo0Lk8HJ98CqUnhvzCQWI9OOl -JyL9mcDdxcNuZyxGQSaggsZZiSm73Nd+PCTOAZSpUe1aFtoVtbKMRru9hSUh+zPL -57W4sSGeN9jdeOK7bwR4lknddKnG5VTMUncexrR1TTYjAwKAjvxXERwHSfECeU5Q -N88Z9DWkXqY1I3R67SVDZzi5s4ph/Ggapq2OMbRS0UxBOwWB2PZTXMYHY5/Cug1N -ytk+O/Fc/mnEmRmeIX2aLPn+LC/rXED5pQM5HfHeur8XSFbCGMfxyZP4CuYgi82Z -Il4PrWVTc6qK906fQo1M+5TnHGB0FdnZMAg57VgaPYi0thgZOK1IruCFyGkGT2FY -PU6oqxsJyR7VaR1xggVRhmjcja4OfSrYUgjHekbLUkcAkAAc1WkK7iRwKkUlpmA6 -KKgmba+3oT0pDM+9kBQgc1wviOMLcWr9w5H4V210ecetcf4lKMyZ7E/yqosxqHW+ -CriS48M25lzmMtGCe4B4rez6VieDY9nhi0B5J3Hn/eNbldS2POluxpNFKeKKZJR1 -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 -=3yWH ++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 +=jL6u -----END PGP PUBLIC KEY BLOCK----- diff -urpP gnupg-1.2.2/g10/ChangeLog gnupg-1.2.3/g10/ChangeLog --- gnupg-1.2.2/g10/ChangeLog 2003-05-01 11:02:17.000000000 +0000 +++ gnupg-1.2.3/g10/ChangeLog 2003-08-21 17:20:03.000000000 +0000 @@ -1,3 +1,386 @@ +2003-08-21 Werner Koch + + * keyserver.c (keyserver_search_prompt): Flush stdout before + issuing the prompt. Requested by Todd Vierling. + +2003-08-18 David Shaw + + * options.skel: Note that keyserver.pgp.com isn't synchronized, + and explain the roundrobin a bit better. + + * sig-check.c (check_key_signature2), import.c (import_one, + import_revoke_cert, chk_self_sigs, delete_inv_parts, + collapse_uids, merge_blocks): Make much quieter during import of + slightly munged, but recoverable, keys. Use log_error for + unrecoverable import failures. + +2003-08-12 David Shaw + + * keyring.c (keyring_rebuild_cache): Comment. + + * sign.c (mk_notation_and_policy): Making a v3 signature with + notations or policy urls is an error, not an info (i.e. increment + the errorcount). Don't print the notation or policy url to stdout + since it can be mixed into the output stream when piping and munge + the stream. + +2003-08-02 David Shaw + + * parse-packet.c (parse_signature): Don't give "signature packet + without xxxx" warnings for experimental pk algorithms. An + experimental algorithm may not have a notion of (for example) a + keyid (i.e. PGP's x.509 stuff). + +2003-07-31 Stefan Bellon + + * gpgv.c [read_trust_options]: Removed trailing semicolon to avoid + "declaration with no effect" error with Norcroft C. + +2003-07-30 Werner Koch + + * passphrase.c (agent_send_all_options): Make use of $GPG_TTY. + + * photoid.c, passphrase.c, g10.c, exec.c: Replaced some + __MINGW32__ by _WIN32. + + * g10.c (main): Disable use-agent if passphrase-fd is given + later. Suggested by Kurt Garloff. + +2003-07-28 Werner Koch + + * parse-packet.c (parse_key): Allow to parse the gnu-divert-to-s2k + mode. + +2003-07-27 David Shaw + + * packet.h, sig-check.c (signature_check2, do_check, + do_check_messages): Provide a signing-key-is-revoked flag. Change + all callers. + + * status.h, status.c (get_status_string): New REVKEYSIG status + tag for a good signature from a revoked key. + + * mainproc.c (do_check_sig, check_sig_and_print): Use it here. + + * import.c (import_revoke_cert, merge_blocks, merge_sigs): Compare + actual signatures on import rather than using keyid or class + matching. This does not change actual behavior with a key, but + does mean that all sigs are imported whether they will be used or + not. + +2003-07-21 David Shaw + + * trustdb.h, trustdb.c (read_trust_options): New. Returns items + from the trustdb version record. + + * keylist.c (public_key_list): Use it here for the new "tru" + record. + + * gpgv.c (read_trust_options): Stub. + + * sig-check.c (signature_check, signature_check2, + check_key_signature, check_key_signature2): Allow passing NULLs + for unused parameters in the x2 form of each function to avoid the + need for dummy variables. getkey.c, mainproc.c: Change all + callers. + +2003-07-15 David Shaw + + * keygen.c (do_add_key_flags): Don't set the certify flag for + subkeys. + (ask_algo): Provide key flags for DSA, Elgamal_e, and Elgamal + subkeys. + (generate_keypair): Provide key flags for the default DSA/Elgamal + keys. + +2003-07-04 David Shaw + + * misc.c (pct_expando): Minor performance tweak. Don't bother to + re-fetch the primary key if the key making the signature is the + primary key. + + * parse-packet.c (parse_signature): No need to reserve 8 bytes for + the unhashed signature cache any longer. + +2003-07-01 David Shaw + + * misc.c (pct_expando): Add two new expandos - signer's + fingerprint (%g), and signer's primary fingerprint (%p). + + * tdbio.h, tdbio.c (create_version_record, tdbio_write_nextcheck, + tdbio_read_record, tdbio_write_record): Force a 0 into the + trust_model field. This is to help smooth the 1.2->1.4 + switchover, as otherwise a 1.4 trustdb could be rebuilt as classic + on 1.2 while still claiming to be a non-classic trust model. + +2003-06-26 David Shaw + + * keyserver.c (keyserver_spawn): Use ascii_isspace instead of + spacep since ascii_isspace includes \r and \n. + +2003-06-24 David Shaw + + * signal.c, tdbio.c: Comment out the transaction code. It was not + used in this version, and was causing some build problems on + quasi-posix platforms (Solaris and Forte c89). + +2003-06-19 David Shaw + + * Makefile.am: Include W32LIBS where appropriate. + + * keyedit.c (sign_uids): Add additional prompt to the signature + level question. + (menu_expire): When changing expiration dates, don't replace + selfsigs on revoked uids since this would effectively unrevoke + them. There is also no point in replacing expired selfsigs. This + is bug #181. + + * g10.c (main): Add --rfc2440 alias for --openpgp since in a few + months, they won't be the same thing. + +2003-06-18 David Shaw + + * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for + "hkp", since it is occasionally written that way. + + * mainproc.c (check_sig_and_print): Grammar fix ;) + + * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the + email field as well as the name field, and allow mixing fields + when it is set. + +2003-06-17 David Shaw + + * hkp.c (hkp_search): Return proper error code on failure. + + * keyedit.c (sign_uids): Do not allow signing a user ID without a + self-signature. --expert overrides. + + * options.skel: Use subkeys.pgp.net as the default keyserver. + + * trustdb.c (validate_one_keyblock): Certifications on revoked or + expired uids do not count in the web of trust. + +2003-06-14 David Shaw + + * keylist.c (list_keyblock_colon): Don't include validity values + when listing secret keys since they can be incorrect and/or + misleading. This is a temporary kludge, and will be handled + properly in 1.9/2.0. + + * signal.c (init_one_signal, pause_on_sigusr, do_block): Only use + sigprocmask() if we have sigset_t, and only use sigaction() if we + have struct sigaction. This is for Forte c89 on Solaris which + seems to define only the function call half of the two pairs by + default. + (pause_on_sigusr): Typo. + (do_block): If we can't use sigprocmask() and sigset_t, try to get + the number of signals from NSIG as well as MAXSIG, and if we + can't, fail with an explanation. + +2003-06-10 Werner Koch + + * parse-packet.c (parse): Disallow old style partial length for + all key material packets to avoid possible corruption of keyrings. + +2003-06-08 Werner Koch + + * import.c (import_keys): Invalidate the cache so that the file + descriptor gets closed. Fixes bug reported by Juan F. Codagnone. + +2003-06-07 David Shaw + + * keyedit.c (sign_uids): Do not sign expired uids without --expert + (same behavior as revoked uids). + + * mainproc.c (print_notation_data, check_sig_and_print): Only show + the "key available from" preferred keyserver line if the key is + not currently present. + +2003-06-07 Werner Koch + + * g10.c (add_notation_data): Make sure that only ascii is passed + to iscntrl. Noted by Christian Biere. + * getkey.c (classify_user_id2): Replaced isspace by spacep + * keygen.c (keygen_set_std_prefs): Likewise. Also for isdigit. + (ask_user_id): Ditto. + (get_parameter_algo): Ditto. + * keyedit.c (keyedit_menu): Ditto. + * tdbdump.c (import_ownertrust): Ditto. s/isxdigit/hexdigitp/. + * revoke.c (ask_revocation_reason): + * keyserver.c (keyserver_spawn): Dito. + +2003-06-04 David Shaw + + * options.skel: Use new hkp://subkeys.pgp.net as sample keyserver + since they at least handle subkeys correctly. + + * mainproc.c (print_notation_data), parse-packet.c + (dump_sig_subpkt, parse_one_sig_subpkt, can_handle_critical): Add + read-only support for preferred keyserver subpackets. They're + basically policy URLs with a different name. + + * g10.c (main): Add "--set-notation" as alias to "--notation-data" + this is to make things consistent with --set-policy-url meaning + both sigs and certs. + +2003-05-31 David Shaw + + * main.h, misc.c (parse_options): New general option line parser. + Fix the bug in the old version that did not handle report syntax + errors after a valid entry. + + * import.c (parse_import_options), export.c + (parse_export_options): Call it here instead of duplicating the + code. + +2003-05-30 David Shaw + + * keylist.c (list_one): Don't show the keyring filename when in + --with-colons mode. Actually translate "Keyring" string. + + * mainproc.c (proc_tree): We can't currently handle multiple + signatures of different classes or digests (we'd pretty much have + to run a different hash context for each), but if they are all the + same, make an exception. This is Debian bug #194292. + + * sig-check.c (check_key_signature2): Make string translatable. + + * packet.h, getkey.c (fixup_uidnode): Mark real primary uids + differently than assumed primaries. + + * keyedit.c (no_primary_warning): Use the differently marked + primaries here in a new function to warn when an --edit-key + command might rearrange the self-sig dates enough to change which + uid is primary. + (menu_expire, menu_set_preferences): Use no_primary_warning() + here. + + * Makefile.am: Use @DLLIBS@ for -ldl. + +2003-05-21 David Shaw + + * armor.c, g10.c, kbnode.c, misc.c, pkclist.c, sign.c, + build-packet.c, getkey.c, keydb.c, openfile.c, plaintext.c, + status.c, gpgv.c, keygen.c, options.h, sig-check.c, tdbio.h, + encode.c, hkp.c, mainproc.c, parse-packet.c, signal.c, + textfilter.c: Edit all preprocessor instructions to remove + whitespace before the '#'. This is not required by C89, but there + are some compilers out there that don't like it. + +2003-05-21 Werner Koch + + * sign.c (write_plaintext_packet) + * progress.c (handle_progress) + * encode.c (encode_simple,encode_crypt): Make sure that a filename + of "-" is considered to be stdin so that iobuf_get_filelength + won't get called. This fixes bug 156 reported by Gregery Barton. + +2003-05-20 David Shaw + + * keylist.c (list_keyblock_print): Don't dump attribs for + revoked/expired/etc uids for non-colon key listings. This is for + consistency with --show-photos. + + * main.h, keylist.c (dump_attribs), mainproc.c + (check_sig_and_print): Dump attribs if --attrib-fd is set when + verifying signatures. + +2003-05-11 David Shaw + + * parse-packet.c (parse_key): Clear disabled flag when parsing a + new key. Just in case someone forgets to clear the whole key. + + * getkey.c (merge_selfsigs_main): Add an "if all else fails" path + for setting a single user ID primary when there are multiple set + primaries all at the same second, or no primaries set and the most + recent user IDs are at the same second, or no signed user IDs at + all. This is arbitrary, but deterministic. + + * exec.h, photoid.h: Add copyright message. + +2003-05-09 David Shaw + + * g10.c (main): New --gnupg option to disable the various + --openpgp, --pgpX, etc. options. This is the same as --no-XXXX + for those options. + + * packet.h, getkey.c (skip_disabled), keylist.c + (print_capabilities): New "pk_is_disabled" macro to retrieve the + cached disabled value if available, and fill it in via + cache_disabled_value if not available. + + * trustdb.h, gpgv.c (is_disabled), trustdb.c (is_disabled): Rename + to cache_disabled_value. Cache the result of the check so we + don't need to hit the trustdb more than once. + + * trustdb.c (get_validity): Cache the disabled value since we have + it handy and it might be useful later. + +2003-05-07 David Shaw + + * revoke.c (ask_revocation_reason): Clear old reason if user + elects to repeat question. This is bug 153. + + * keyedit.c (sign_uids): Show keyid of the key making the + signature. + + * trustdb.h, trustdb.c (is_disabled), keylist.c + (print_capabilities), gpgv.c (is_disabled): is_disabled now takes + a pk and not just the keyid. This is for speed since there is no + need to re-fetch a key when we already have that key handy. + + * getkey.c (skip_disabled): New function to get a pk and call + is_disabled on it. + (key_byname): Use it here. + +2003-05-02 David Shaw + + * g10.c (main): Show errors for failure in export, send-keys, + recv-keys, and refresh-keys. + + * keyserver.c (keyserver_work): Range check the TCP port for HKP. + + * options.h, g10.c (main): Give algorithm warnings for algorithms + chosen against the --pgpX and --openpgp rules. + + * keydb.h, pkclist.c (algo_available): Make TIGER192 invalid in + --openpgp mode. + + * sign.c (sign_file), pkclist.c (algo_available): Allow passing a + hint of 0. + + * sign.c (sign_file): Fix bug that causes a spurious compression + preference warning. + + * sign.c (clearsign_file): Fix bug that prevents proper warning + message from appearing when clearsigning in --pgp2 mode with a + non-v3 RSA key. + + * main.h, misc.c (compliance_option_string, compliance_string, + compliance_failure), sign.c (sign_file, clearsign_file), encode.c + (encode_crypt, write_pubkey_enc_from_list): New functions to put + the "this message may not be usable...." warning in one place. + + * options.h, armor.c, cipher.c, g10.c, keyedit.c, pkclist.c, + sign.c, encode.c, getkey.c, revoke.c: The current flags for + different levels of PGP-ness are massively complex. This is step + one in simplifying them. No functional change yet, just use a + macro to check for compliance level. + + * options.h, g10.c (main): Part two of the simplification. Use a + single enum to indicate what we are compliant to (1991, 2440, + PGPx, etc.) + +2003-05-01 David Shaw + + * packet.h, build-packet.c (build_sig_subpkt), export.c + (do_export_stream), import.c (remove_bad_stuff, import), + parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt): Remove + vestigal code for the old sig cache subpacket. This wasn't + completely harmless as it caused subpacket 101 to disappear on + import and export. + 2003-04-30 David Shaw * pkclist.c (do_we_trust_pre): If an untrusted key was chosen by a diff -urpP gnupg-1.2.2/g10/Makefile.am gnupg-1.2.3/g10/Makefile.am --- gnupg-1.2.2/g10/Makefile.am 2003-04-15 13:57:47.000000000 +0000 +++ gnupg-1.2.3/g10/Makefile.am 2003-07-28 18:34:41.000000000 +0000 @@ -18,7 +18,7 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl EXTRA_DIST = options.skel # it seems that we can't use this with automake 1.5 #OMIT_DEPENDENCIES = zlib.h zconf.h @@ -26,7 +26,7 @@ libexecdir = @libexecdir@/@PACKAGE@ if ! HAVE_DOSISH_SYSTEM AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" endif -needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@ +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a #noinst_PROGRAMS = gpgd bin_PROGRAMS = gpg gpgv @@ -96,15 +96,10 @@ gpg_SOURCES = g10.c \ photoid.c photoid.h \ exec.c exec.h - - gpgv_SOURCES = gpgv.c \ $(common_source) \ verify.c - - - #gpgd_SOURCES = gpgd.c \ # ks-proto.h \ # ks-proto.c \ @@ -112,9 +107,9 @@ gpgv_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @ZLIBS@ @INTLLIBS@ +LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it -gpg_LDADD = @LIBOBJS@ $(LDADD) @NETLIBS@ +gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ $(PROGRAMS): $(needed_libs) diff -urpP gnupg-1.2.2/g10/Makefile.in gnupg-1.2.3/g10/Makefile.in --- gnupg-1.2.2/g10/Makefile.in 2003-05-01 14:37:35.000000000 +0000 +++ gnupg-1.2.3/g10/Makefile.in 2003-08-21 19:55:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -199,10 +202,10 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl EXTRA_DIST = options.skel @HAVE_DOSISH_SYSTEM_FALSE@AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" -needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@ +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a #noinst_PROGRAMS = gpgd bin_PROGRAMS = gpg gpgv @@ -286,10 +289,11 @@ gpgv_SOURCES = gpgv.c \ # ks-db.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @ZLIBS@ @INTLLIBS@ +LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it -gpg_LDADD = @LIBOBJS@ $(LDADD) @NETLIBS@ +gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ subdir = g10 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -469,7 +473,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -480,7 +484,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ diff -urpP gnupg-1.2.2/g10/armor.c gnupg-1.2.3/g10/armor.c --- gnupg-1.2.2/g10/armor.c 2003-03-06 09:43:51.000000000 +0000 +++ gnupg-1.2.3/g10/armor.c 2003-06-07 18:55:20.000000000 +0000 @@ -39,9 +39,9 @@ #include "i18n.h" #ifdef HAVE_DOSISH_SYSTEM - #define LF "\r\n" +#define LF "\r\n" #else - #define LF "\n" +#define LF "\n" #endif #define MAX_LINELEN 20000 @@ -298,7 +298,7 @@ is_armor_header( byte *line, unsigned le /* Some mail programs on Windows seem to add spaces to the end of the line. This becomes strict if --openpgp is set. */ - if(!opt.rfc2440) + if(!RFC2440) while(*p==' ') p++; @@ -773,7 +773,7 @@ radix64_read( armor_filter_context_t *af /* FIXME: Here we should emit another control packet, * so that we know in mainproc that we are processing * a clearsign message */ - #if 0 +#if 0 for(rc=0;!rc;) { rc = 0 /*check_trailer( &fhdr, c )*/; if( !rc ) { @@ -791,7 +791,7 @@ radix64_read( armor_filter_context_t *af log_error(_("error in trailer line\n")); rc = G10ERR_INVALID_ARMOR; } - #endif +#endif } } } @@ -817,14 +817,14 @@ armor_filter( void *opaque, int control, int idx, idx2; size_t n=0; u32 crc; - #if 0 +#if 0 static FILE *fp ; if( !fp ) { fp = fopen("armor.out", "w"); assert(fp); } - #endif +#endif if( DBG_FILTER ) log_debug("armor-filter: control: %d\n", control ); @@ -921,11 +921,11 @@ armor_filter( void *opaque, int control, } else rc = radix64_read( afx, a, &n, buf, size ); - #if 0 +#if 0 if( n ) if( fwrite(buf, n, 1, fp ) != 1 ) BUG(); - #endif +#endif *ret_len = n; } else if( control == IOBUFCTRL_FLUSH && !afx->cancel ) { @@ -960,10 +960,10 @@ armor_filter( void *opaque, int control, if ( afx->hdrlines ) { for ( s = afx->hdrlines; *s; s++ ) { - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM if ( *s == '\n' ) iobuf_put( a, '\r'); - #endif +#endif iobuf_put(a, *s ); } } @@ -1334,5 +1334,3 @@ unarmor_pump (UnarmorPump x, int c) return rval; } - - diff -urpP gnupg-1.2.2/g10/build-packet.c gnupg-1.2.3/g10/build-packet.c --- gnupg-1.2.2/g10/build-packet.c 2003-04-29 07:19:17.000000000 +0000 +++ gnupg-1.2.3/g10/build-packet.c 2003-06-07 18:55:20.000000000 +0000 @@ -266,12 +266,12 @@ hash_public_key( MD_HANDLE md, PKT_publi ulong pktlen; int c; IOBUF a = iobuf_temp(); - #if 0 +#if 0 FILE *fp = fopen("dump.pk", "a"); int i=0; fprintf(fp, "\nHashing PK (v%d):\n", pk->version); - #endif +#endif /* build the packet */ init_packet(&pkt); @@ -316,19 +316,19 @@ hash_public_key( MD_HANDLE md, PKT_publi } /* hash the packet body */ while( (c=iobuf_get(a)) != -1 ) { - #if 0 +#if 0 fprintf( fp," %02x", c ); if( (++i == 24) ) { putc('\n', fp); i=0; } - #endif +#endif md_putc( md, c ); } - #if 0 +#if 0 putc('\n', fp); fclose(fp); - #endif +#endif iobuf_cancel(a); } @@ -782,9 +782,6 @@ build_sig_subpkt (PKT_signature *sig, si nlen = 1; /* just a 1 byte length header */ switch( type ) { - case SIGSUBPKT_PRIV_VERIFY_CACHE: /*(obsolete)*/ - BUG(); - break; /* The issuer being unhashed is a historical oddity. It should work equally as well hashed. Of course, if even an unhashed issuer is tampered with, it makes it awfully hard diff -urpP gnupg-1.2.2/g10/cipher.c gnupg-1.2.3/g10/cipher.c --- gnupg-1.2.2/g10/cipher.c 2002-08-13 19:00:23.000000000 +0000 +++ gnupg-1.2.3/g10/cipher.c 2003-05-06 07:33:08.000000000 +0000 @@ -55,7 +55,7 @@ write_header( cipher_filter_context_t *c memset( &ed, 0, sizeof ed ); ed.len = cfx->datalen; ed.extralen = blocksize+2; - ed.new_ctb = !ed.len && !opt.rfc1991; + ed.new_ctb = !ed.len && !RFC1991; if( cfx->dek->use_mdc ) { ed.mdc_method = DIGEST_ALGO_SHA1; cfx->mdc_hash = md_open( DIGEST_ALGO_SHA1, 0 ); diff -urpP gnupg-1.2.2/g10/encode.c gnupg-1.2.3/g10/encode.c --- gnupg-1.2.2/g10/encode.c 2003-04-15 13:57:47.000000000 +0000 +++ gnupg-1.2.3/g10/encode.c 2003-06-07 18:55:20.000000000 +0000 @@ -165,7 +165,7 @@ encode_simple( const char *filename, int compress_filter_context_t zfx; text_filter_context_t tfx; progress_filter_context_t pfx; - int do_compress = opt.compress && !opt.rfc1991; + int do_compress = opt.compress && !RFC1991; memset( &cfx, 0, sizeof cfx); memset( &afx, 0, sizeof afx); @@ -188,13 +188,13 @@ encode_simple( const char *filename, int /* Due the the fact that we use don't use an IV to encrypt the session key we can't use the new mode with RFC1991 because it has no S2K salt. RFC1991 always uses simple S2K. */ - if ( opt.rfc1991 && !compat ) + if ( RFC1991 && !compat ) compat = 1; cfx.dek = NULL; if( mode ) { s2k = m_alloc_clear( sizeof *s2k ); - s2k->mode = opt.rfc1991? 0:opt.s2k_mode; + s2k->mode = RFC1991? 0:opt.s2k_mode; s2k->hash_algo = opt.def_digest_algo ? opt.def_digest_algo : opt.s2k_digest_algo; cfx.dek = passphrase_to_dek( NULL, 0, @@ -243,15 +243,15 @@ encode_simple( const char *filename, int if( opt.armor ) iobuf_push_filter( out, armor_filter, &afx ); - #ifdef ENABLE_COMMENT_PACKETS +#ifdef ENABLE_COMMENT_PACKETS else { write_comment( out, "#created by GNUPG v" VERSION " (" PRINTABLE_OS_NAME ")"); if( opt.comment_string ) write_comment( out, opt.comment_string ); } - #endif - if( s2k && !opt.rfc1991 ) { +#endif + if( s2k && !RFC1991 ) { PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc + seskeylen + 1 ); enc->version = 4; enc->cipher_algo = cfx.dek->algo; @@ -294,7 +294,8 @@ encode_simple( const char *filename, int either partial length or fixed length with the new style messages. */ - if( filename && !opt.textmode ) { + if (filename && *filename && !(*filename == '-' && !filename[1]) + && !opt.textmode ) { off_t tmpsize; if ( !(tmpsize = iobuf_get_filelength(inp)) ) @@ -315,7 +316,7 @@ encode_simple( const char *filename, int pt->timestamp = make_timestamp(); pt->mode = opt.textmode? 't' : 'b'; pt->len = filesize; - pt->new_ctb = !pt->len && !opt.rfc1991; + pt->new_ctb = !pt->len && !RFC1991; pt->buf = inp; pkt.pkttype = PKT_PLAINTEXT; pkt.pkt.plaintext = pt; @@ -396,7 +397,7 @@ encode_crypt( const char *filename, STRL text_filter_context_t tfx; progress_filter_context_t pfx; PK_LIST pk_list,work_list; - int do_compress = opt.compress && !opt.rfc1991; + int do_compress = opt.compress && !RFC1991; memset( &cfx, 0, sizeof cfx); @@ -408,15 +409,14 @@ encode_crypt( const char *filename, STRL if( (rc=build_pk_list( remusr, &pk_list, PUBKEY_USAGE_ENC)) ) return rc; - if(opt.pgp2) { + if(PGP2) { for(work_list=pk_list; work_list; work_list=work_list->next) if(!(is_RSA(work_list->pk->pubkey_algo) && nbits_from_pk(work_list->pk)<=2048)) { log_info(_("you can only encrypt to RSA keys of 2048 bits or " "less in --pgp2 mode\n")); - log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); - opt.pgp2=0; + compliance_failure(); break; } } @@ -442,14 +442,14 @@ encode_crypt( const char *filename, STRL if( opt.armor ) iobuf_push_filter( out, armor_filter, &afx ); - #ifdef ENABLE_COMMENT_PACKETS +#ifdef ENABLE_COMMENT_PACKETS else { write_comment( out, "#created by GNUPG v" VERSION " (" PRINTABLE_OS_NAME ")"); if( opt.comment_string ) write_comment( out, opt.comment_string ); } - #endif +#endif /* create a session key */ cfx.dek = m_alloc_secure_clear (sizeof *cfx.dek); if( !opt.def_cipher_algo ) { /* try to get it from the prefs */ @@ -464,11 +464,10 @@ encode_crypt( const char *filename, STRL if( cfx.dek->algo == -1 ) { cfx.dek->algo = CIPHER_ALGO_3DES; - if( opt.pgp2 ) { + if( PGP2 ) { log_info(_("unable to use the IDEA cipher for all of the keys " "you are encrypting to.\n")); - log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); - opt.pgp2=0; + compliance_failure(); } } } @@ -527,7 +526,8 @@ encode_crypt( const char *filename, STRL } } - if( filename && !opt.textmode ) { + if (filename && *filename && !(*filename == '-' && !filename[1]) + && !opt.textmode ) { off_t tmpsize; if ( !(tmpsize = iobuf_get_filelength(inp)) ) @@ -548,7 +548,7 @@ encode_crypt( const char *filename, STRL pt->timestamp = make_timestamp(); pt->mode = opt.textmode ? 't' : 'b'; pt->len = filesize; - pt->new_ctb = !pt->len && !opt.rfc1991; + pt->new_ctb = !pt->len && !RFC1991; pt->buf = inp; pkt.pkttype = PKT_PLAINTEXT; pkt.pkt.plaintext = pt; @@ -716,16 +716,11 @@ write_pubkey_enc_from_list( PK_LIST pk_l keyid_from_pk( pk, enc->keyid ); enc->throw_keyid = opt.throw_keyid; - if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7 || opt.pgp8)) + if(opt.throw_keyid && (PGP2 || PGP6 || PGP7 || PGP8)) { log_info(_("you may not use %s while in %s mode\n"), - "--throw-keyid", - opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":opt.pgp7?"--pgp7":"--pgp8"); - - log_info(_("this message may not be usable by %s\n"), - opt.pgp2?"PGP 2.x":opt.pgp6?"PGP 6.x":opt.pgp7?"PGP 7.x":"PGP 8.x"); - - opt.pgp2=opt.pgp6=opt.pgp7=opt.pgp8=0; + "--throw-keyid",compliance_option_string()); + compliance_failure(); } /* Okay, what's going on: We have the session key somewhere in diff -urpP gnupg-1.2.2/g10/exec.c gnupg-1.2.3/g10/exec.c --- gnupg-1.2.2/g10/exec.c 2003-04-29 07:19:17.000000000 +0000 +++ gnupg-1.2.3/g10/exec.c 2003-07-30 15:22:59.000000000 +0000 @@ -1,5 +1,5 @@ /* exec.c - generic call-a-program code - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -59,7 +59,7 @@ int set_exec_path(const char *path,int m char *mkdtemp(char *template); #endif -#if defined (__MINGW32__) +#if defined (_WIN32) /* This is a nicer system() for windows that waits for programs to return before returning control to the caller. I hate helpful computers. */ @@ -139,7 +139,7 @@ static int make_tempdir(struct exec_info if(tmp==NULL) { -#if defined (__MINGW32__) +#if defined (_WIN32) tmp=m_alloc(256); if(GetTempPath(256,tmp)==0) strcpy(tmp,"c:\\windows\\temp"); @@ -176,7 +176,7 @@ static int make_tempdir(struct exec_info sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp); -#if defined (__MINGW32__) +#if defined (_WIN32) m_free(tmp); #endif @@ -502,7 +502,7 @@ int exec_read(struct exec_info *info) if(DBG_EXTPROG) log_debug("system() command is %s\n",info->command); -#if defined (__MINGW32__) +#if defined (_WIN32) info->progreturn=win_system(info->command); #else info->progreturn=system(info->command); diff -urpP gnupg-1.2.2/g10/exec.h gnupg-1.2.3/g10/exec.h --- gnupg-1.2.2/g10/exec.h 2002-07-24 19:24:08.000000000 +0000 +++ gnupg-1.2.3/g10/exec.h 2003-05-21 08:42:56.000000000 +0000 @@ -1,3 +1,23 @@ +/* exec.h + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + #ifndef _EXEC_H_ #define _EXEC_H_ diff -urpP gnupg-1.2.2/g10/export.c gnupg-1.2.3/g10/export.c --- gnupg-1.2.2/g10/export.c 2003-04-27 10:04:21.000000000 +0000 +++ gnupg-1.2.3/g10/export.c 2003-06-07 18:55:20.000000000 +0000 @@ -41,13 +41,7 @@ static int do_export_stream( IOBUF out, int parse_export_options(char *str,unsigned int *options) { - char *tok; - int hit=0; - struct - { - char *name; - unsigned int bit; - } export_opts[]= + struct parse_options export_opts[]= { {"include-non-rfc",EXPORT_INCLUDE_NON_RFC}, {"include-local-sigs",EXPORT_INCLUDE_LOCAL_SIGS}, @@ -57,34 +51,7 @@ parse_export_options(char *str,unsigned /* add tags for include revoked and disabled? */ }; - while((tok=strsep(&str," ,"))) - { - int i,rev=0; - - if(ascii_strncasecmp("no-",tok,3)==0) - { - rev=1; - tok+=3; - } - - for(i=0;export_opts[i].name;i++) - { - if(ascii_strcasecmp(export_opts[i].name,tok)==0) - { - if(rev) - *options&=~export_opts[i].bit; - else - *options|=export_opts[i].bit; - hit=1; - break; - } - } - - if(!hit && !export_opts[i].name) - return 0; - } - - return hit; + return parse_options(str,options,export_opts); } /**************** @@ -280,10 +247,6 @@ do_export_stream( IOBUF out, STRLIST use if(ipkt->pkt.signature->numrevkeys) continue; } - - /* delete our verification cache */ - delete_sig_subpkt (node->pkt->pkt.signature->unhashed, - SIGSUBPKT_PRIV_VERIFY_CACHE); } /* Don't export attribs? */ @@ -347,4 +310,3 @@ do_export_stream( IOBUF out, STRLIST use log_info(_("WARNING: nothing exported\n")); return rc; } - diff -urpP gnupg-1.2.2/g10/g10.c gnupg-1.2.3/g10/g10.c --- gnupg-1.2.2/g10/g10.c 2003-04-27 10:04:22.000000000 +0000 +++ gnupg-1.2.3/g10/g10.c 2003-07-30 15:24:20.000000000 +0000 @@ -26,7 +26,7 @@ #include #include #ifdef HAVE_DOSISH_SYSTEM - #include /* for setmode() */ +#include /* for setmode() */ #endif #ifdef HAVE_STAT #include /* for stat() */ @@ -69,7 +69,7 @@ enum cmd_and_opt_values { aNull = 0, oUser = 'u', oVerbose = 'v', oCompress = 'z', - oNotation = 'N', + oSetNotation = 'N', oBatch = 500, oSigNotation, oCertNotation, @@ -162,16 +162,14 @@ enum cmd_and_opt_values { aNull = 0, oMarginalsNeeded, oMaxCertDepth, oLoadExtension, + oGnuPG, oRFC1991, + oRFC2440, oOpenPGP, oPGP2, - oNoPGP2, oPGP6, - oNoPGP6, oPGP7, - oNoPGP7, oPGP8, - oNoPGP8, oCipherAlgo, oDigestAlgo, oCertDigestAlgo, @@ -439,16 +437,18 @@ static ARGPARSE_OPTS opts[] = { { oMaxCertDepth, "max-cert-depth", 1, "@" }, { oTrustedKey, "trusted-key", 2, N_("|KEYID|ultimately trust this key")}, { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")}, + { oGnuPG, "gnupg", 0, "@"}, + { oGnuPG, "no-pgp2", 0, "@"}, + { oGnuPG, "no-pgp6", 0, "@"}, + { oGnuPG, "no-pgp7", 0, "@"}, + { oGnuPG, "no-pgp8", 0, "@"}, { oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")}, + { oRFC2440, "rfc2440", 0, "@" }, { oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")}, { oPGP2, "pgp2", 0, N_("set all packet, cipher and digest options to PGP 2.x behavior")}, - { oNoPGP2, "no-pgp2", 0, "@"}, { oPGP6, "pgp6", 0, "@"}, - { oNoPGP6, "no-pgp6", 0, "@"}, { oPGP7, "pgp7", 0, "@"}, - { oNoPGP7, "no-pgp7", 0, "@"}, { oPGP8, "pgp8", 0, "@"}, - { oNoPGP8, "no-pgp8", 0, "@"}, { oS2KMode, "s2k-mode", 1, N_("|N|use passphrase mode N")}, { oS2KDigest, "s2k-digest-algo",2, N_("|NAME|use message digest algorithm NAME for passphrases")}, @@ -463,9 +463,10 @@ static ARGPARSE_OPTS opts[] = { { oShowPhotos, "show-photos", 0, N_("Show Photo IDs")}, { oNoShowPhotos, "no-show-photos", 0, N_("Don't show Photo IDs")}, { oPhotoViewer, "photo-viewer", 2, N_("Set command line to view Photo IDs")}, - { oNotation, "notation-data", 2, "@" }, - { oSigNotation, "sig-notation", 2, "@" }, - { oCertNotation, "cert-notation", 2, "@" }, + { oSetNotation, "set-notation", 2, "@" }, + { oSetNotation, "notation-data", 2, "@" }, /* Alias */ + { oSigNotation, "sig-notation", 2, "@" }, + { oCertNotation, "cert-notation", 2, "@" }, { 302, NULL, 0, N_( "@\n(See the man page for a complete listing of all commands and options)\n" @@ -739,15 +740,15 @@ build_list( const char *text, char lette static void i18n_init(void) { - #ifdef USE_SIMPLE_GETTEXT +#ifdef USE_SIMPLE_GETTEXT set_gettext_file( PACKAGE ); - #else - #ifdef ENABLE_NLS +#else +#ifdef ENABLE_NLS setlocale( LC_ALL, "" ); bindtextdomain( PACKAGE, G10_LOCALEDIR ); textdomain( PACKAGE ); - #endif - #endif +#endif +#endif } static void @@ -1073,14 +1074,14 @@ main( int argc, char **argv ) int pwfd = -1; int with_fpr = 0; /* make an option out of --fingerprint */ int any_explicit_recipient = 0; - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING ulong requested_shm_size=0; - #endif +#endif - #ifdef __riscos__ +#ifdef __riscos__ riscos_global_defaults(); opt.lock_once = 1; - #endif /* __riscos__ */ +#endif /* __riscos__ */ trap_unaligned(); secmem_set_flags( secmem_get_flags() | 2 ); /* suspend warnings */ @@ -1119,7 +1120,7 @@ main( int argc, char **argv ) opt.keyserver_options.include_subkeys=1; opt.keyserver_options.include_revoked=1; opt.mangle_dos_filenames = 1; -#if defined (__MINGW32__) +#if defined (_WIN32) set_homedir ( read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" )); #else @@ -1149,7 +1150,7 @@ main( int argc, char **argv ) set_homedir ( pargs.r.ret_str ); else if( pargs.r_opt == oNoPermissionWarn ) opt.no_perm_warn=1; - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING else if( pargs.r_opt == oRunAsShmCP ) { /* does not make sense in a options file, we do it here, * so that we are the able to drop setuid as soon as possible */ @@ -1161,7 +1162,7 @@ main( int argc, char **argv ) * initialized when init_shm_coprocessing() is called */ set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) ); } - #endif +#endif } #ifdef HAVE_DOSISH_SYSTEM @@ -1424,7 +1425,7 @@ main( int argc, char **argv ) break; case oLoadExtension: #ifndef __riscos__ -#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__) +#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32) if(check_permissions(pargs.r.ret_str,2)) log_info(_("cipher extension \"%s\" not loaded due to " "unsafe permissions\n"),pargs.r.ret_str); @@ -1437,17 +1438,16 @@ main( int argc, char **argv ) #endif /* __riscos__ */ break; case oRFC1991: - opt.rfc1991 = 1; - opt.rfc2440 = 0; + opt.compliance = CO_RFC1991; opt.force_v4_certs = 0; opt.disable_mdc = 1; opt.escape_from = 1; break; + case oRFC2440: case oOpenPGP: /* TODO: When 2440bis becomes a RFC, these may need changing. */ - opt.rfc1991 = 0; - opt.rfc2440 = 1; + opt.compliance = CO_RFC2440; opt.disable_mdc = 1; opt.allow_non_selfsigned_uid = 1; opt.allow_freeform_uid = 1; @@ -1460,23 +1460,16 @@ main( int argc, char **argv ) opt.def_cipher_algo = 0; opt.def_digest_algo = 0; opt.cert_digest_algo = 0; - opt.def_compress_algo = 1; + opt.def_compress_algo = -1; opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_digest_algo = DIGEST_ALGO_SHA1; opt.s2k_cipher_algo = CIPHER_ALGO_3DES; - opt.pgp2 = 0; - opt.pgp6 = 0; - opt.pgp7 = 0; - opt.pgp8 = 0; - break; - case oPGP2: opt.pgp2 = 1; break; - case oNoPGP2: opt.pgp2 = 0; break; - case oPGP6: opt.pgp6 = 1; break; - case oNoPGP6: opt.pgp6 = 0; break; - case oPGP7: opt.pgp7 = 1; break; - case oNoPGP7: opt.pgp7 = 0; break; - case oPGP8: opt.pgp8 = 1; break; - case oNoPGP8: opt.pgp8 = 0; break; + break; + case oPGP2: opt.compliance = CO_PGP2; break; + case oPGP6: opt.compliance = CO_PGP6; break; + case oPGP7: opt.compliance = CO_PGP7; break; + case oPGP8: opt.compliance = CO_PGP8; break; + case oGnuPG: opt.compliance = CO_GNUPG; break; case oEmuMDEncodeBug: opt.emulate_bugs |= EMUBUG_MDENCODE; break; case oCompressSigs: opt.compress_sigs = 1; break; case oRunAsShmCP: @@ -1544,6 +1537,7 @@ main( int argc, char **argv ) case oCompress: opt.compress = pargs.r.ret_int; break; case oPasswdFD: pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); + opt.use_agent = 0; break; #ifdef __riscos__ case oPasswdFile: @@ -1616,7 +1610,7 @@ main( int argc, char **argv ) else opt.exec_path_set=1; break; - case oNotation: + case oSetNotation: add_notation_data( pargs.r.ret_str, 0 ); add_notation_data( pargs.r.ret_str, 1 ); break; @@ -1727,13 +1721,13 @@ main( int argc, char **argv ) strusage(11), strusage(13), strusage(14) ); fprintf(stderr, "%s\n", strusage(15) ); } - #ifdef IS_DEVELOPMENT_VERSION +#ifdef IS_DEVELOPMENT_VERSION if( !opt.batch ) { log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n"); log_info("It is only intended for test purposes and should NOT be\n"); log_info("used in a production environment or with production keys!\n"); } - #endif +#endif if (opt.verbose > 2) log_info ("using character set `%s'\n", get_native_charset ()); @@ -1770,113 +1764,98 @@ main( int argc, char **argv ) set_debug(); /* Do these after the switch(), so they can override settings. */ - if(opt.pgp2 && (opt.pgp6 || opt.pgp7 || opt.pgp8)) - log_error(_("%s not allowed with %s!\n"), - "--pgp2",opt.pgp6?"--pgp6":opt.pgp7?"--pgp7":"--pgp8"); - else + if(PGP2) { - if(opt.pgp2) + int unusable=0; + + if(cmd==aSign && !detached_sig) { - int unusable=0; + log_info(_("you can only make detached or clear signatures " + "while in --pgp2 mode\n")); + unusable=1; + } + else if(cmd==aSignEncr || cmd==aSignSym) + { + log_info(_("you can't sign and encrypt at the " + "same time while in --pgp2 mode\n")); + unusable=1; + } + else if(argc==0 && (cmd==aSign || cmd==aEncr || cmd==aSym)) + { + log_info(_("you must use files (and not a pipe) when " + "working with --pgp2 enabled.\n")); + unusable=1; + } + else if(cmd==aEncr || cmd==aSym) + { + /* Everything else should work without IDEA (except using + a secret key encrypted with IDEA and setting an IDEA + preference, but those have their own error + messages). */ - if(cmd==aSign && !detached_sig) - { - log_info(_("you can only make detached or clear signatures " - "while in --pgp2 mode\n")); - unusable=1; - } - else if(cmd==aSignEncr || cmd==aSignSym) - { - log_info(_("you can't sign and encrypt at the " - "same time while in --pgp2 mode\n")); - unusable=1; - } - else if(argc==0 && (cmd==aSign || cmd==aEncr || cmd==aSym)) + if(check_cipher_algo(CIPHER_ALGO_IDEA)) { - log_info(_("you must use files (and not a pipe) when " - "working with --pgp2 enabled.\n")); + log_info(_("encrypting a message in --pgp2 mode requires " + "the IDEA cipher\n")); + idea_cipher_warn(1); unusable=1; } - else if(cmd==aEncr || cmd==aSym) + else if(cmd==aSym) { - /* Everything else should work without IDEA (except using - a secret key encrypted with IDEA and setting an IDEA - preference, but those have their own error - messages). */ - - if(check_cipher_algo(CIPHER_ALGO_IDEA)) - { - log_info(_("encrypting a message in --pgp2 mode requires " - "the IDEA cipher\n")); - idea_cipher_warn(1); - unusable=1; - } - else if(cmd==aSym) - { - /* This only sets IDEA for symmetric encryption - since it is set via select_algo_from_prefs for - pk encryption. */ - m_free(def_cipher_string); - def_cipher_string = m_strdup("idea"); - } - - /* PGP2 can't handle the output from the textmode - filter, so we disable it for anything that could - create a literal packet (only encryption and - symmetric encryption, since we disable signing - above). */ - if(!unusable) - opt.textmode=0; + /* This only sets IDEA for symmetric encryption + since it is set via select_algo_from_prefs for + pk encryption. */ + m_free(def_cipher_string); + def_cipher_string = m_strdup("idea"); } - if(unusable) - { - log_info(_("this message may not be usable by %s\n"), - "PGP 2.x"); - opt.pgp2=0; - } - else - { - opt.rfc1991 = 1; - opt.rfc2440 = 0; - opt.force_mdc = 0; - opt.disable_mdc = 1; - opt.force_v4_certs = 0; - opt.sk_comments = 0; - opt.escape_from = 1; - opt.force_v3_sigs = 1; - opt.pgp2_workarounds = 1; - opt.ask_sig_expire = 0; - opt.ask_cert_expire = 0; - m_free(def_digest_string); - def_digest_string = m_strdup("md5"); - opt.def_compress_algo = 1; - } + /* PGP2 can't handle the output from the textmode + filter, so we disable it for anything that could + create a literal packet (only encryption and + symmetric encryption, since we disable signing + above). */ + if(!unusable) + opt.textmode=0; } - else if(opt.pgp6) - { - opt.sk_comments=0; - opt.escape_from=1; - opt.force_v3_sigs=1; - opt.ask_sig_expire=0; - opt.def_compress_algo=1; - opt.force_mdc=0; - opt.disable_mdc=1; - } - else if(opt.pgp7) - { - opt.sk_comments=0; - opt.escape_from=1; - opt.force_v3_sigs=1; - opt.ask_sig_expire=0; - opt.def_compress_algo=1; - } - else if(opt.pgp8) + + if(unusable) + compliance_failure(); + else { - opt.escape_from=1; - opt.def_compress_algo=1; + opt.force_mdc = 0; + opt.disable_mdc = 1; + opt.force_v4_certs = 0; + opt.sk_comments = 0; + opt.escape_from = 1; + opt.force_v3_sigs = 1; + opt.pgp2_workarounds = 1; + opt.ask_sig_expire = 0; + opt.ask_cert_expire = 0; + m_free(def_digest_string); + def_digest_string = m_strdup("md5"); + opt.def_compress_algo = 1; } } + else if(PGP6) + { + opt.sk_comments=0; + opt.escape_from=1; + opt.force_v3_sigs=1; + opt.ask_sig_expire=0; + opt.force_mdc=0; + opt.disable_mdc=1; + } + else if(PGP7) + { + opt.sk_comments=0; + opt.escape_from=1; + opt.force_v3_sigs=1; + opt.ask_sig_expire=0; + } + else if(PGP8) + { + opt.escape_from=1; + } /* must do this after dropping setuid, because string_to... * may try to load an module */ @@ -1958,6 +1937,66 @@ main( int argc, char **argv ) if( log_get_errorcount(0) ) g10_exit(2); + /* Check our chosen algorithms against the list of legal + algorithms. */ + + if(!GNUPG) + { + const char *badalg=NULL; + preftype_t badtype=PREFTYPE_NONE; + + if(opt.def_cipher_algo + && !algo_available(PREFTYPE_SYM,opt.def_cipher_algo,NULL)) + { + badalg=cipher_algo_to_string(opt.def_cipher_algo); + badtype=PREFTYPE_SYM; + } + else if(opt.def_digest_algo + && !algo_available(PREFTYPE_HASH,opt.def_digest_algo,NULL)) + { + badalg=digest_algo_to_string(opt.def_digest_algo); + badtype=PREFTYPE_HASH; + } + else if(opt.cert_digest_algo + && !algo_available(PREFTYPE_HASH,opt.cert_digest_algo,NULL)) + { + badalg=digest_algo_to_string(opt.cert_digest_algo); + badtype=PREFTYPE_HASH; + } + else if(opt.def_compress_algo!=-1 + && !algo_available(PREFTYPE_ZIP,opt.def_compress_algo,NULL)) + { + badalg=compress_algo_to_string(opt.def_compress_algo); + badtype=PREFTYPE_ZIP; + } + + if(badalg) + { + switch(badtype) + { + case PREFTYPE_SYM: + log_info(_("you may not use cipher algorithm \"%s\" " + "while in %s mode\n"), + badalg,compliance_option_string()); + break; + case PREFTYPE_HASH: + log_info(_("you may not use digest algorithm \"%s\" " + "while in %s mode\n"), + badalg,compliance_option_string()); + break; + case PREFTYPE_ZIP: + log_info(_("you may not use compression algorithm \"%s\" " + "while in %s mode\n"), + badalg,compliance_option_string()); + break; + default: + BUG(); + } + + compliance_failure(); + } + } + /* set the random seed file */ if( use_random_seed ) { char *p = make_filename(opt.homedir, "random_seed", NULL ); @@ -2289,11 +2328,20 @@ main( int argc, char **argv ) for( ; argc; argc--, argv++ ) add_to_strlist2( &sl, *argv, utf8_strings ); if( cmd == aSendKeys ) - keyserver_export( sl ); + rc=keyserver_export( sl ); else if( cmd == aRecvKeys ) - keyserver_import( sl ); + rc=keyserver_import( sl ); else - export_pubkeys( sl, opt.export_options ); + rc=export_pubkeys( sl, opt.export_options ); + if(rc) + { + if(cmd==aSendKeys) + log_error(_("keyserver send failed: %s\n"),g10_errstr(rc)); + else if(cmd==aRecvKeys) + log_error(_("keyserver receive failed: %s\n"),g10_errstr(rc)); + else + log_error(_("key export failed: %s\n"),g10_errstr(rc)); + } free_strlist(sl); break; @@ -2302,7 +2350,9 @@ main( int argc, char **argv ) for( ; argc; argc--, argv++ ) append_to_strlist2( &sl, *argv, utf8_strings ); - keyserver_search( sl ); + rc=keyserver_search( sl ); + if(rc) + log_error(_("keyserver search failed: %s\n"),g10_errstr(rc)); free_strlist(sl); break; @@ -2310,7 +2360,9 @@ main( int argc, char **argv ) sl = NULL; for( ; argc; argc--, argv++ ) add_to_strlist2( &sl, *argv, utf8_strings ); - keyserver_refresh(sl); + rc=keyserver_refresh(sl); + if(rc) + log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc)); free_strlist(sl); break; @@ -2415,9 +2467,9 @@ main( int argc, char **argv ) size_t n = !endless && count < 99? count : 99; p = get_random_bits( n*8, level, 0); - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM setmode ( fileno(stdout), O_BINARY ); - #endif +#endif if (opt.armor) { char *tmp = make_radix64_string (p, n); fputs (tmp, stdout); @@ -2704,9 +2756,9 @@ print_mds( const char *fname, int algo ) if( !fname ) { fp = stdin; - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM setmode ( fileno(fp) , O_BINARY ); - #endif +#endif } else { fp = fopen( fname, "rb" ); @@ -2828,13 +2880,13 @@ add_notation_data( const char *string, i /* we only support printable text - therefore we enforce the use * of only printable characters (an empty value is valid) */ for( s++; *s ; s++ ) { - if( iscntrl(*s) ) { + if ((*s & 0x80)) + highbit = 1; + else if (iscntrl(*s)) { log_error(_("a notation value must not use " "any control characters\n") ); return; } - else if( *s & 0x80 ) - highbit = 1; } if( highbit ) /* must use UTF8 encoding */ diff -urpP gnupg-1.2.2/g10/getkey.c gnupg-1.2.3/g10/getkey.c --- gnupg-1.2.2/g10/getkey.c 2003-04-29 07:26:40.000000000 +0000 +++ gnupg-1.2.3/g10/getkey.c 2003-07-28 18:34:41.000000000 +0000 @@ -1,5 +1,6 @@ /* getkey.c - Get a key from the database - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -38,7 +39,7 @@ #define MAX_UID_CACHE_ENTRIES 200 #if MAX_PK_CACHE_ENTRIES < 2 - #error We need the cache for key creation +#error We need the cache for key creation #endif @@ -83,7 +84,7 @@ typedef struct keyid_list { #endif #if MAX_UID_CACHE_ENTRIES < 5 - #error we really need the userid cache +#error we really need the userid cache #endif typedef struct user_id_db { struct user_id_db *next; @@ -118,7 +119,7 @@ print_stats() void cache_public_key( PKT_public_key *pk ) { - #if MAX_PK_CACHE_ENTRIES +#if MAX_PK_CACHE_ENTRIES pk_cache_entry_t ce; u32 keyid[2]; @@ -157,7 +158,7 @@ cache_public_key( PKT_public_key *pk ) ce->pk = copy_public_key( NULL, pk ); ce->keyid[0] = keyid[0]; ce->keyid[1] = keyid[1]; - #endif +#endif } @@ -265,7 +266,7 @@ cache_user_id( KBNODE keyblock ) void getkey_disable_caches() { - #if MAX_PK_CACHE_ENTRIES +#if MAX_PK_CACHE_ENTRIES { pk_cache_entry_t ce, ce2; @@ -278,7 +279,7 @@ getkey_disable_caches() pk_cache_entries = 0; pk_cache = NULL; } - #endif +#endif /* fixme: disable user id cache ? */ } @@ -318,7 +319,7 @@ get_pubkey( PKT_public_key *pk, u32 *key int internal = 0; int rc = 0; - #if MAX_PK_CACHE_ENTRIES +#if MAX_PK_CACHE_ENTRIES { /* Try to get it from the cache */ pk_cache_entry_t ce; for( ce = pk_cache; ce; ce = ce->next ) { @@ -329,7 +330,7 @@ get_pubkey( PKT_public_key *pk, u32 *key } } } - #endif +#endif /* more init stuff */ if( !pk ) { pk = m_alloc_clear( sizeof *pk ); @@ -568,7 +569,7 @@ classify_user_id2( const char *name, memset (desc, 0, sizeof *desc); *force_exact = 0; /* skip leading spaces. Fixme: what is with trailing spaces? */ - for(s = name; *s && isspace(*s); s++ ) + for(s = name; *s && spacep (s); s++ ) ; switch (*s) { @@ -649,7 +650,7 @@ classify_user_id2( const char *name, } /* check if a hexadecimal number is terminated by EOS or blank */ - if (hexlength && s[hexlength] && !isspace(s[hexlength])) { + if (hexlength && s[hexlength] && !spacep(s+hexlength)) { if (hexprefix) /* a "0x" prefix without correct */ return 0; /* termination is an error */ else /* The first chars looked like */ @@ -733,6 +734,27 @@ classify_user_id (const char *name, KEYD return classify_user_id2 (name, desc, &dummy); } +static int +skip_disabled(void *dummy,u32 *keyid) +{ + int rc,disabled=0; + PKT_public_key *pk=m_alloc_clear(sizeof(PKT_public_key)); + + rc = get_pubkey(pk, keyid); + if(rc) + { + log_error("error checking disabled status of %08lX: %s\n", + (ulong)keyid[1],g10_errstr(rc)); + goto leave; + } + + disabled=pk_is_disabled(pk); + + leave: + free_public_key(pk); + return disabled; +} + /**************** * Try to get the pubkey by the userid. This function looks for the * first pubkey certificate which has the given name in a user_id. @@ -784,7 +806,7 @@ key_byname( GETKEY_CTX *retctx, STRLIST && ctx->items[n].mode!=KEYDB_SEARCH_MODE_FPR16 && ctx->items[n].mode!=KEYDB_SEARCH_MODE_FPR20 && ctx->items[n].mode!=KEYDB_SEARCH_MODE_FPR) - ctx->items[n].skipfnc=is_disabled; + ctx->items[n].skipfnc=skip_disabled; } ctx->kr_handle = keydb_new (secmode); @@ -1265,7 +1287,7 @@ fixup_uidnode ( KBNODE uidnode, KBNODE s uid->is_primary = 0; p = parse_sig_subpkt ( sig->hashed, SIGSUBPKT_PRIMARY_UID, NULL ); if ( p && *p ) - uid->is_primary = 1; + uid->is_primary = 2; /* We could also query this from the unhashed area if it is not in * the hased area and then later try to decide which is the better * there should be no security problem with this. @@ -1310,7 +1332,6 @@ fixup_uidnode ( KBNODE uidnode, KBNODE s p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_FEATURES, &n); if (p && n && (p[0] & 0x01)) uid->mdc_feature = 1; - } static void @@ -1574,8 +1595,6 @@ merge_selfsigs_main( KBNODE keyblock, in else if ( k->pkt->pkttype == PKT_SIGNATURE && uidnode ) { PKT_signature *sig = k->pkt->pkt.signature; - u32 dummy; - int dum2; if(sig->keyid[0] != kid[0] || sig->keyid[1]!=kid[1]) { @@ -1585,7 +1604,7 @@ merge_selfsigs_main( KBNODE keyblock, in if(get_pubkey_fast(ultimate_pk,sig->keyid)==0 && check_key_signature2(keyblock,k,ultimate_pk, - NULL,&dummy,&dum2)==0 + NULL,NULL,NULL)==0 && get_ownertrust(ultimate_pk)==TRUST_ULTIMATE) { free_public_key(ultimate_pk); @@ -1673,14 +1692,38 @@ merge_selfsigs_main( KBNODE keyblock, in if ( k->pkt->pkttype == PKT_USER_ID && !k->pkt->pkt.user_id->attrib_data) { PKT_user_id *uid = k->pkt->pkt.user_id; - if ( uid->is_primary && uid->created > uiddate ) { - uiddate = uid->created; - uidnode = k; - } - if ( !uid->is_primary && uid->created > uiddate2 ) { - uiddate2 = uid->created; - uidnode2 = k; - } + if (uid->is_primary) + { + if(uid->created > uiddate) + { + uiddate = uid->created; + uidnode = k; + } + else if(uid->created==uiddate && uidnode) + { + /* The dates are equal, so we need to do a + different (and arbitrary) comparison. This + should rarely, if ever, happen. It's good to + try and guarantee that two different GnuPG + users with two different keyrings at least pick + the same primary. */ + if(cmp_user_ids(uid,uidnode->pkt->pkt.user_id)>0) + uidnode=k; + } + } + else + { + if(uid->created > uiddate2) + { + uiddate2 = uid->created; + uidnode2 = k; + } + else if(uid->created==uiddate2 && uidnode2) + { + if(cmp_user_ids(uid,uidnode2->pkt->pkt.user_id)>0) + uidnode2=k; + } + } } } if ( uidnode ) { @@ -1695,23 +1738,43 @@ merge_selfsigs_main( KBNODE keyblock, in } } else if( uidnode2 ) { - /* none is flagged primary - use the latest user ID we have */ + /* none is flagged primary - use the latest user ID we have, + and disambiguate with the arbitrary packet comparison. */ uidnode2->pkt->pkt.user_id->is_primary = 1; } else { - /* None of our uids were self-signed, so pick the first one to - be the primary. This is the best we can do here since - there are no self sigs to date the uids. */ + /* None of our uids were self-signed, so pick the one that + sorts first to be the primary. This is the best we can do + here since there are no self sigs to date the uids. */ + + uidnode = NULL; for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) { - if(k->pkt->pkttype==PKT_USER_ID && - !k->pkt->pkt.user_id->attrib_data) + if(k->pkt->pkttype==PKT_USER_ID + && !k->pkt->pkt.user_id->attrib_data) { - k->pkt->pkt.user_id->is_primary=1; - break; + if(!uidnode) + { + uidnode=k; + uidnode->pkt->pkt.user_id->is_primary=1; + continue; + } + else + { + if(cmp_user_ids(k->pkt->pkt.user_id, + uidnode->pkt->pkt.user_id)>0) + { + uidnode->pkt->pkt.user_id->is_primary=0; + uidnode=k; + uidnode->pkt->pkt.user_id->is_primary=1; + } + else + k->pkt->pkt.user_id->is_primary=0; /* just to be + safe */ + } } } } @@ -2071,14 +2134,14 @@ finish_lookup (GETKEY_CTX ctx) KBNODE k; KBNODE foundk = NULL; PKT_user_id *foundu = NULL; - #define USAGE_MASK (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC) +#define USAGE_MASK (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC) unsigned int req_usage = ( ctx->req_usage & USAGE_MASK ); /* Request the primary if we're certifying another key, and also if signing data while --pgp6 or --pgp7 is on since pgp 6 and 7 do not understand signatures made by a signing subkey. PGP 8 does. */ int req_prim = (ctx->req_usage & PUBKEY_USAGE_CERT) || - ((opt.pgp6 || opt.pgp7) && (ctx->req_usage & PUBKEY_USAGE_SIG)); + ((PGP6 || PGP7) && (ctx->req_usage & PUBKEY_USAGE_SIG)); u32 latest_date; KBNODE latest_key; u32 curtime = make_timestamp (); diff -urpP gnupg-1.2.2/g10/gpgv.c gnupg-1.2.3/g10/gpgv.c --- gnupg-1.2.2/g10/gpgv.c 2003-04-09 15:13:33.000000000 +0000 +++ gnupg-1.2.3/g10/gpgv.c 2003-08-01 14:03:21.000000000 +0000 @@ -26,7 +26,7 @@ #include #include #ifdef HAVE_DOSISH_SYSTEM - #include /* for setmode() */ +#include /* for setmode() */ #endif #define INCLUDED_BY_MAIN_MODULE 1 @@ -125,20 +125,20 @@ set_homedir (char *dir) static void i18n_init(void) { - #ifdef USE_SIMPLE_GETTEXT +#ifdef USE_SIMPLE_GETTEXT set_gettext_file( PACKAGE ); - #else - #ifdef ENABLE_NLS - #ifdef HAVE_LC_MESSAGES +#else +#ifdef ENABLE_NLS +#ifdef HAVE_LC_MESSAGES setlocale( LC_TIME, "" ); setlocale( LC_MESSAGES, "" ); - #else +#else setlocale( LC_ALL, "" ); - #endif +#endif bindtextdomain( PACKAGE, G10_LOCALEDIR ); textdomain( PACKAGE ); - #endif - #endif +#endif +#endif } @@ -151,9 +151,9 @@ main( int argc, char **argv ) STRLIST nrings=NULL; unsigned configlineno; - #ifdef __riscos__ +#ifdef __riscos__ riscos_global_defaults(); - #endif /* __riscos__ */ +#endif /* __riscos__ */ log_set_name("gpgv"); init_signals(); @@ -236,6 +236,8 @@ check_signatures_trust( PKT_signature *s return 0; } +void +read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck) {} /* Stub: * We don't have the trustdb , so we have to provide some stub functions @@ -243,7 +245,7 @@ check_signatures_trust( PKT_signature *s */ int -is_disabled(void *dummy,u32 *keyid) +cache_disabled_value(PKT_public_key *pk) { return 0; } diff -urpP gnupg-1.2.2/g10/hkp.c gnupg-1.2.3/g10/hkp.c --- gnupg-1.2.2/g10/hkp.c 2003-04-27 10:04:22.000000000 +0000 +++ gnupg-1.2.3/g10/hkp.c 2003-06-19 09:20:04.000000000 +0000 @@ -180,7 +180,7 @@ hkp_export( STRLIST users ) opt.keyserver_host, g10_errstr(rc) ); } else { - #if 1 +#if 1 if( opt.verbose ) { int c; while( (c=iobuf_get(hd.fp_read)) != EOF ) @@ -189,7 +189,7 @@ hkp_export( STRLIST users ) else putchar ( '?' ); } - #endif +#endif if( (status/100) == 2 ) log_info(_("success sending to `%s' (status=%u)\n"), opt.keyserver_host, status ); @@ -366,7 +366,7 @@ parse_hkp_index(IOBUF buffer,char *line) { m_free(key); m_free(uid); - log_error(_("this keyserver is not fully HKP compatible\n")); + log_error(_("this keyserver does not support --search-keys\n")); return -1; } @@ -598,7 +598,10 @@ int hkp_search(STRLIST tokens) ret=parse_hkp_index(buffer,line); if(ret==-1) - break; + { + rc=G10ERR_KEYSERVER; + break; + } if(rc!=0) count+=ret; diff -urpP gnupg-1.2.2/g10/import.c gnupg-1.2.3/g10/import.c --- gnupg-1.2.2/g10/import.c 2003-04-15 08:26:28.000000000 +0000 +++ gnupg-1.2.3/g10/import.c 2003-08-21 16:06:47.000000000 +0000 @@ -1,5 +1,6 @@ /* import.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + * Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -60,7 +61,6 @@ static int import( IOBUF inp, int fast, struct stats_s *stats, unsigned int options ); static int read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ); static void revocation_present(KBNODE keyblock); -static void remove_bad_stuff (KBNODE keyblock); static int import_one( const char *fname, KBNODE keyblock, int fast, struct stats_s *stats, unsigned int options); static int import_secret_one( const char *fname, KBNODE keyblock, @@ -87,13 +87,7 @@ static int merge_keysigs( KBNODE dst, KB int parse_import_options(char *str,unsigned int *options) { - char *tok; - int hit=0; - struct - { - char *name; - unsigned int bit; - } import_opts[]= + struct parse_options import_opts[]= { {"allow-local-sigs",IMPORT_ALLOW_LOCAL_SIGS}, {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG}, @@ -101,34 +95,7 @@ parse_import_options(char *str,unsigned {NULL,0} }; - while((tok=strsep(&str," ,"))) - { - int i,rev=0; - - if(ascii_strncasecmp("no-",tok,3)==0) - { - rev=1; - tok+=3; - } - - for(i=0;import_opts[i].name;i++) - { - if(ascii_strcasecmp(import_opts[i].name,tok)==0) - { - if(rev) - *options&=~import_opts[i].bit; - else - *options|=import_opts[i].bit; - hit=1; - break; - } - } - - if(!hit && !import_opts[i].name) - return 0; - } - - return hit; + return parse_options(str,options,import_opts); } void * @@ -197,6 +164,8 @@ import_keys( char **fnames, int nnames, else { int rc = import( inp, fast, fname, stats, options ); iobuf_close(inp); + /* must invalidate that ugly cache to actually close it */ + iobuf_ioctl (NULL, 2, 0, (char*)fname); if( rc ) log_error("import from `%s' failed: %s\n", fname, g10_errstr(rc) ); @@ -247,7 +216,6 @@ import( IOBUF inp, int fast, const char* } while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) { - remove_bad_stuff (keyblock); if( keyblock->pkt->pkttype == PKT_PUBLIC_KEY ) rc = import_one( fname, keyblock, fast, stats, options ); else if( keyblock->pkt->pkttype == PKT_SECRET_KEY ) @@ -437,22 +405,6 @@ read_block( IOBUF a, PACKET **pending_pk return rc; } - -static void -remove_bad_stuff (KBNODE keyblock) -{ - KBNODE node; - - for (node=keyblock; node; node = node->next ) { - if( node->pkt->pkttype == PKT_SIGNATURE ) { - /* delete the subpackets we used to use for the - verification cache */ - delete_sig_subpkt (node->pkt->pkt.signature->unhashed, - SIGSUBPKT_PRIV_VERIFY_CACHE); - } - } -} - /* Walk through the subkeys on a pk to find if we have the PKS disease: multiple subkeys with their binding sigs stripped, and the sig for the first subkey placed after the last subkey. That is, @@ -630,7 +582,8 @@ import_one( const char *fname, KBNODE ke /* It's really PKS corruption, not HKP corruption, but I won't change the string in stable. */ - if((options&IMPORT_REPAIR_PKS_SUBKEY_BUG) && fix_pks_corruption(keyblock)) + if((options&IMPORT_REPAIR_PKS_SUBKEY_BUG) && fix_pks_corruption(keyblock) + && opt.verbose) log_info(_("key %08lX: HKP subkey corruption repaired\n"), (ulong)keyid[1]); @@ -652,11 +605,9 @@ import_one( const char *fname, KBNODE ke } if( !delete_inv_parts( fname, keyblock, keyid, options ) ) { - if( !opt.quiet ) { - log_info( _("key %08lX: no valid user IDs\n"), - (ulong)keyid[1]); - log_info(_("this may be caused by a missing self-signature\n")); - } + log_error( _("key %08lX: no valid user IDs\n"), (ulong)keyid[1]); + if( !opt.quiet ) + log_info(_("this may be caused by a missing self-signature\n")); stats->no_user_id++; return 0; } @@ -946,8 +897,8 @@ import_revoke_cert( const char *fname, K pk = m_alloc_clear( sizeof *pk ); rc = get_pubkey( pk, keyid ); if( rc == G10ERR_NO_PUBKEY ) { - log_info( _("key %08lX: no public key - " - "can't apply revocation certificate\n"), (ulong)keyid[1]); + log_error( _("key %08lX: no public key - " + "can't apply revocation certificate\n"), (ulong)keyid[1]); rc = 0; goto leave; } @@ -997,12 +948,12 @@ import_revoke_cert( const char *fname, K if( onode->pkt->pkttype == PKT_USER_ID ) break; else if( onode->pkt->pkttype == PKT_SIGNATURE - && onode->pkt->pkt.signature->sig_class == 0x20 - && keyid[0] == onode->pkt->pkt.signature->keyid[0] - && keyid[1] == onode->pkt->pkt.signature->keyid[1] ) { + && !cmp_signatures(node->pkt->pkt.signature, + onode->pkt->pkt.signature)) + { rc = 0; goto leave; /* yes, we already know about it */ - } + } } @@ -1091,15 +1042,18 @@ chk_self_sigs( const char *fname, KBNODE rc = check_key_signature( keyblock, n, NULL); if( rc ) { - char *p=utf8_to_native(unode->pkt->pkt.user_id->name, + if( opt.verbose ) + { + char *p=utf8_to_native(unode->pkt->pkt.user_id->name, strlen(unode->pkt->pkt.user_id->name),0); - log_info( rc == G10ERR_PUBKEY_ALGO ? - _("key %08lX: unsupported public key " - "algorithm on user id \"%s\"\n"): - _("key %08lX: invalid self-signature " - "on user id \"%s\"\n"), - (ulong)keyid[1],p); - m_free(p); + log_info( rc == G10ERR_PUBKEY_ALGO ? + _("key %08lX: unsupported public key " + "algorithm on user id \"%s\"\n"): + _("key %08lX: invalid self-signature " + "on user id \"%s\"\n"), + (ulong)keyid[1],p); + m_free(p); + } } else unode->flag |= 1; /* mark that signature checked */ @@ -1111,17 +1065,19 @@ chk_self_sigs( const char *fname, KBNODE revocation targets, this may need to be revised. */ if( !knode ) { - log_info( _("key %08lX: no subkey for key binding\n"), - (ulong)keyid[1]); + if(opt.verbose) + log_info( _("key %08lX: no subkey for key binding\n"), + (ulong)keyid[1]); n->flag |= 4; /* delete this */ } else { rc = check_key_signature( keyblock, n, NULL); if( rc ) { - log_info( rc == G10ERR_PUBKEY_ALGO ? + if(opt.verbose) + log_info(rc == G10ERR_PUBKEY_ALGO ? _("key %08lX: unsupported public key algorithm\n"): - _("key %08lX: invalid subkey binding\n"), - (ulong)keyid[1]); + _("key %08lX: invalid subkey binding\n"), + (ulong)keyid[1]); n->flag|=4; } else { @@ -1132,8 +1088,9 @@ chk_self_sigs( const char *fname, KBNODE bsnode->flag|=4; /* Delete the last binding sig since this one is newer */ - log_info(_("key %08lX: removed multiple subkey " - "binding\n"),(ulong)keyid[1]); + if(opt.verbose) + log_info(_("key %08lX: removed multiple subkey " + "binding\n"),(ulong)keyid[1]); } bsnode=n; @@ -1152,18 +1109,21 @@ chk_self_sigs( const char *fname, KBNODE See the comment in getkey.c:merge_selfsigs_subkey for more */ if( !knode ) { - log_info( _("key %08lX: no subkey for key revocation\n"), - (ulong)keyid[1]); + if(opt.verbose) + log_info( _("key %08lX: no subkey for key revocation\n"), + (ulong)keyid[1]); n->flag |= 4; /* delete this */ } else { rc = check_key_signature( keyblock, n, NULL); if( rc ) { - log_info( rc == G10ERR_PUBKEY_ALGO ? + if(opt.verbose) + log_info(rc == G10ERR_PUBKEY_ALGO ? _("key %08lX: unsupported public key algorithm\n"): - _("key %08lX: invalid subkey revocation\n"), - (ulong)keyid[1]); - n->flag|=4; + _("key %08lX: invalid subkey revocation\n"), + (ulong)keyid[1]); + + n->flag|=4; } else { /* It's valid, so is it newer? */ @@ -1172,8 +1132,9 @@ chk_self_sigs( const char *fname, KBNODE rsnode->flag|=4; /* Delete the last revocation sig since this one is newer */ - log_info(_("key %08lX: removed multiple subkey " - "revocation\n"),(ulong)keyid[1]); + if(opt.verbose) + log_info(_("key %08lX: removed multiple subkey " + "revocation\n"),(ulong)keyid[1]); } rsnode=n; @@ -1258,18 +1219,18 @@ delete_inv_parts( const char *fname, KBN * to import non-exportable signature when we have the * the secret key used to create this signature - it * seems that this makes sense */ - log_info( _("key %08lX: non exportable signature " - "(class %02x) - skipped\n"), - (ulong)keyid[1], - node->pkt->pkt.signature->sig_class ); + if(opt.verbose) + log_info( _("key %08lX: non exportable signature " + "(class %02x) - skipped\n"), + (ulong)keyid[1], node->pkt->pkt.signature->sig_class ); delete_kbnode( node ); } else if( node->pkt->pkttype == PKT_SIGNATURE && node->pkt->pkt.signature->sig_class == 0x20 ) { if( uid_seen ) { - log_error( _("key %08lX: revocation certificate " - "at wrong place - skipped\n"), - (ulong)keyid[1]); + if(opt.verbose) + log_info( _("key %08lX: revocation certificate " + "at wrong place - skipped\n"), (ulong)keyid[1]); delete_kbnode( node ); } else { @@ -1284,9 +1245,10 @@ delete_inv_parts( const char *fname, KBN int rc = check_key_signature( keyblock, node, NULL); if( rc ) { - log_error( _("key %08lX: invalid revocation " - "certificate: %s - skipped\n"), - (ulong)keyid[1], g10_errstr(rc)); + if(opt.verbose) + log_info( _("key %08lX: invalid revocation " + "certificate: %s - skipped\n"), + (ulong)keyid[1], g10_errstr(rc)); delete_kbnode( node ); } } @@ -1296,17 +1258,18 @@ delete_inv_parts( const char *fname, KBN (node->pkt->pkt.signature->sig_class == 0x18 || node->pkt->pkt.signature->sig_class == 0x28) && !subkey_seen ) { - log_error( _("key %08lX: subkey signature " - "in wrong place - skipped\n"), - (ulong)keyid[1]); + if(opt.verbose) + log_info( _("key %08lX: subkey signature " + "in wrong place - skipped\n"), (ulong)keyid[1]); delete_kbnode( node ); } else if( node->pkt->pkttype == PKT_SIGNATURE && !IS_CERT(node->pkt->pkt.signature)) { - log_error(_("key %08lX: unexpected signature class (0x%02X) -" - " skipped\n"),(ulong)keyid[1], - node->pkt->pkt.signature->sig_class); + if(opt.verbose) + log_info(_("key %08lX: unexpected signature class (0x%02X) -" + " skipped\n"),(ulong)keyid[1], + node->pkt->pkt.signature->sig_class); delete_kbnode(node); } else if( (node->flag & 4) ) /* marked for deletion */ @@ -1402,8 +1365,9 @@ collapse_uids( KBNODE *keyblock ) kid1 = keyid_from_sk( n->pkt->pkt.secret_key, NULL ); else kid1 = 0; - log_info(_("key %08lX: duplicated user ID detected - merged\n"), - (ulong)kid1); + if(!opt.quiet) + log_info(_("key %08lX: duplicated user ID detected - merged\n"), + (ulong)kid1); return 1; } @@ -1518,23 +1482,25 @@ merge_blocks( const char *fname, KBNODE break; else if( onode->pkt->pkttype == PKT_SIGNATURE && onode->pkt->pkt.signature->sig_class == 0x20 - && node->pkt->pkt.signature->keyid[0] - == onode->pkt->pkt.signature->keyid[0] - && node->pkt->pkt.signature->keyid[1] - == onode->pkt->pkt.signature->keyid[1] ) { + && !cmp_signatures(onode->pkt->pkt.signature, + node->pkt->pkt.signature)) + { found = 1; break; - } + } } if( !found ) { - char *p=get_user_id_printable (keyid); KBNODE n2 = clone_kbnode(node); insert_kbnode( keyblock_orig, n2, 0 ); n2->flag |= 1; ++*n_sigs; - log_info(_("key %08lX: \"%s\" revocation certificate added\n"), - (ulong)keyid[1],p); - m_free(p); + if(!opt.quiet) + { + char *p=get_user_id_printable (keyid); + log_info(_("key %08lX: \"%s\" revocation " + "certificate added\n"), (ulong)keyid[1],p); + m_free(p); + } } } } @@ -1563,8 +1529,9 @@ merge_blocks( const char *fname, KBNODE insert_kbnode( keyblock_orig, n2, 0 ); n2->flag |= 1; ++*n_sigs; - log_info( _("key %08lX: direct key signature added\n"), - (ulong)keyid[1]); + if(!opt.quiet) + log_info( _("key %08lX: direct key signature added\n"), + (ulong)keyid[1]); } } } @@ -1732,20 +1699,12 @@ merge_sigs( KBNODE dst, KBNODE src, int || n->pkt->pkt.signature->sig_class == 0x28 ) continue; /* skip signatures which are only valid on subkeys */ found = 0; - for(n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next){ - if( n2->pkt->pkttype == PKT_SIGNATURE - && n->pkt->pkt.signature->keyid[0] - == n2->pkt->pkt.signature->keyid[0] - && n->pkt->pkt.signature->keyid[1] - == n2->pkt->pkt.signature->keyid[1] - && n->pkt->pkt.signature->timestamp - <= n2->pkt->pkt.signature->timestamp - && n->pkt->pkt.signature->sig_class - == n2->pkt->pkt.signature->sig_class ) { - found++; - break; + for(n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next) + if(!cmp_signatures(n->pkt->pkt.signature,n2->pkt->pkt.signature)) + { + found++; + break; } - } if( !found ) { /* This signature is new or newer, append N to DST. * We add a clone to the original keyblock, because this diff -urpP gnupg-1.2.2/g10/kbnode.c gnupg-1.2.3/g10/kbnode.c --- gnupg-1.2.2/g10/kbnode.c 2002-06-29 13:46:34.000000000 +0000 +++ gnupg-1.2.3/g10/kbnode.c 2003-06-07 18:55:21.000000000 +0000 @@ -54,12 +54,12 @@ static void free_node( KBNODE n ) { if( n ) { - #if USE_UNUSED_NODES +#if USE_UNUSED_NODES n->next = unused_nodes; unused_nodes = n; - #else +#else m_free( n ); - #endif +#endif } } diff -urpP gnupg-1.2.2/g10/keydb.c gnupg-1.2.3/g10/keydb.c --- gnupg-1.2.2/g10/keydb.c 2003-03-06 09:43:51.000000000 +0000 +++ gnupg-1.2.3/g10/keydb.c 2003-06-07 18:55:21.000000000 +0000 @@ -96,13 +96,13 @@ keydb_add_resource (const char *url, int rt = KEYDB_RESOURCE_TYPE_KEYRING; resname += 11; } - #if !defined(HAVE_DRIVE_LETTERS) && !defined(__riscos__) +#if !defined(HAVE_DRIVE_LETTERS) && !defined(__riscos__) else if (strchr (resname, ':')) { log_error ("invalid key resource URL `%s'\n", url ); rc = G10ERR_GENERAL; goto leave; } - #endif /* !HAVE_DRIVE_LETTERS && !__riscos__ */ +#endif /* !HAVE_DRIVE_LETTERS && !__riscos__ */ } if (*resname != DIRSEP_C ) { /* do tilde expansion etc */ @@ -688,6 +688,3 @@ keydb_search_fpr (KEYDB_HANDLE hd, const memcpy (desc.u.fpr, fpr, MAX_FINGERPRINT_LEN); return keydb_search (hd, &desc, 1); } - - - diff -urpP gnupg-1.2.2/g10/keydb.h gnupg-1.2.3/g10/keydb.h --- gnupg-1.2.2/g10/keydb.h 2003-04-09 15:05:44.000000000 +0000 +++ gnupg-1.2.3/g10/keydb.h 2003-05-06 07:33:09.000000000 +0000 @@ -164,8 +164,9 @@ void show_revocation_reason( PKT_public_ int check_signatures_trust( PKT_signature *sig ); void release_pk_list( PK_LIST pk_list ); int build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use ); -int select_algo_from_prefs( PK_LIST pk_list, int preftype, - int request, void *hint ); +int algo_available( preftype_t preftype, int algo, void *hint ); +int select_algo_from_prefs( PK_LIST pk_list, int preftype, + int request, void *hint ); int select_mdc_from_pklist (PK_LIST pk_list); /*-- skclist.c --*/ diff -urpP gnupg-1.2.2/g10/keyedit.c gnupg-1.2.3/g10/keyedit.c --- gnupg-1.2.2/g10/keyedit.c 2003-04-29 07:19:17.000000000 +0000 +++ gnupg-1.2.3/g10/keyedit.c 2003-07-28 18:34:41.000000000 +0000 @@ -284,7 +284,7 @@ sign_uids( KBNODE keyblock, STRLIST locu int all_v3=1; /* Are there any non-v3 sigs on this key already? */ - if(opt.pgp2) + if(PGP2) for(node=keyblock;node;node=node->next) if(node->pkt->pkttype==PKT_SIGNATURE && node->pkt->pkt.signature->version>3) @@ -377,10 +377,46 @@ sign_uids( KBNODE keyblock, STRLIST locu tty_printf(_(" Unable to sign.\n")); } } - else if(!uidnode->pkt->pkt.user_id->created) + else if(uidnode->pkt->pkt.user_id->is_expired) { - tty_printf(_("WARNING: user ID \"%s\" is not " - "self-signed.\n"),user); + tty_printf(_("User ID \"%s\" is expired."),user); + + if(opt.expert) + { + tty_printf("\n"); + /* No, so remove the mark and continue */ + if(!cpr_get_answer_is_yes("sign_uid.expire_okay", + _("Are you sure you " + "still want to sign " + "it? (y/N) "))) + uidnode->flag &= ~NODFLG_MARK_A; + } + else + { + uidnode->flag &= ~NODFLG_MARK_A; + tty_printf(_(" Unable to sign.\n")); + } + } + else if(!uidnode->pkt->pkt.user_id->created && !selfsig) + { + tty_printf(_("User ID \"%s\" is not self-signed."), + user); + + if(opt.expert) + { + tty_printf("\n"); + /* No, so remove the mark and continue */ + if(!cpr_get_answer_is_yes("sign_uid.nosig_okay", + _("Are you sure you " + "still want to sign " + "it? (y/N) "))) + uidnode->flag &= ~NODFLG_MARK_A; + } + else + { + uidnode->flag &= ~NODFLG_MARK_A; + tty_printf(_(" Unable to sign.\n")); + } } m_free(user); @@ -569,7 +605,7 @@ sign_uids( KBNODE keyblock, STRLIST locu /* Is --pgp2 on, it's a v3 key, all the sigs on the key are currently v3 and we're about to sign it with a v4 sig? If so, danger! */ - if(opt.pgp2 && all_v3 && + if(PGP2 && all_v3 && (sk->version>3 || force_v4) && primary_pk->version<=3) { tty_printf(_("You may not make an OpenPGP signature on a " @@ -613,7 +649,8 @@ sign_uids( KBNODE keyblock, STRLIST locu while(class==0) { - answer = cpr_get("sign_uid.class",_("Your selection? ")); + answer = cpr_get("sign_uid.class",_("Your selection? " + "(enter '?' for more information): ")); if(answer[0]=='\0') class=0x10+opt.def_cert_check_level; /* Default */ @@ -637,7 +674,7 @@ sign_uids( KBNODE keyblock, STRLIST locu p = get_user_id( sk_keyid, &n ); tty_print_utf8_string( p, n ); m_free(p); p = NULL; - tty_printf("\"\n"); + tty_printf("\" (%08lX)\n",(ulong)sk_keyid[1]); if(selfsig) { @@ -1100,7 +1137,7 @@ keyedit_menu( const char *username, STRL cmd = cmdLIST; else if( *answer == CONTROL_D ) cmd = cmdQUIT; - else if( isdigit( *answer ) ) { + else if( digitp(answer ) ) { cmd = cmdSELUID; arg_number = atoi(answer); } @@ -1215,11 +1252,11 @@ keyedit_menu( const char *username, STRL break; case cmdADDPHOTO: - if (opt.rfc2440 || opt.rfc1991 || opt.pgp2) + if (RFC2440 || RFC1991 || PGP2) { tty_printf( _("This command is not allowed while in %s mode.\n"), - opt.rfc2440?"OpenPGP":opt.pgp2?"PGP2":"RFC-1991"); + RFC2440?"OpenPGP":PGP2?"PGP2":"RFC-1991"); break; } photo=1; @@ -2036,6 +2073,40 @@ show_key_and_fingerprint( KBNODE keybloc } +/* Show a warning if no uids on the key have the primary uid flag + set. */ +static void +no_primary_warning(KBNODE keyblock, int uids) +{ + KBNODE node; + int select_all=1,have_uid=0,uid_count=0; + + if(uids) + select_all=!count_selected_uids(keyblock); + + /* TODO: if we ever start behaving differently with a primary or + non-primary attribute ID, we will need to check for attributes + here as well. */ + + for(node=keyblock; node; node = node->next) + { + if(node->pkt->pkttype==PKT_USER_ID + && node->pkt->pkt.user_id->attrib_data==NULL) + { + uid_count++; + + if((select_all || (node->flag & NODFLG_SELUID)) + && node->pkt->pkt.user_id->is_primary==2) + have_uid|=2; + else + have_uid|=1; + } + } + + if(uid_count>1 && have_uid&1 && !(have_uid&2)) + log_info(_("WARNING: no user ID has been marked as primary. This command " + "may\n cause a different user ID to become the assumed primary.\n")); +} /**************** * Ask for a new user id, do the selfsignature and put it into @@ -2530,6 +2601,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE mainkey=1; } + no_primary_warning(pub_keyblock,0); + expiredate = ask_expiredate(); node = find_kbnode( sec_keyblock, PKT_SECRET_KEY ); sk = copy_secret_key( NULL, node->pkt->pkt.secret_key); @@ -2555,7 +2628,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE && ( mainkey || sub_pk ) ) { PKT_signature *sig = node->pkt->pkt.signature; if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] - && ( (mainkey && uid && (sig->sig_class&~3) == 0x10) + && ( (mainkey && uid + && uid->created && (sig->sig_class&~3) == 0x10) || (!mainkey && sig->sig_class == 0x18) ) ) { /* this is a selfsignature which is to be replaced */ PKT_signature *newsig; @@ -2779,6 +2853,8 @@ menu_set_preferences (KBNODE pub_keybloc int selected, select_all; int modified = 0; + no_primary_warning(pub_keyblock,1); + select_all = !count_selected_uids (pub_keyblock); node = find_kbnode( sec_keyblock, PKT_SECRET_KEY ); diff -urpP gnupg-1.2.2/g10/keygen.c gnupg-1.2.3/g10/keygen.c --- gnupg-1.2.2/g10/keygen.c 2003-04-09 14:58:01.000000000 +0000 +++ gnupg-1.2.3/g10/keygen.c 2003-07-28 18:34:41.000000000 +0000 @@ -137,7 +137,12 @@ do_add_key_flags (PKT_signature *sig, un buf[0] = 0; if (use & PUBKEY_USAGE_SIG) - buf[0] |= 0x01 | 0x02; + { + if(sig->sig_class==0x18) + buf[0] |= 0x02; /* Don't set the certify flag for subkeys */ + else + buf[0] |= 0x01 | 0x02; + } if (use & PUBKEY_USAGE_ENC) buf[0] |= 0x04 | 0x08; build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, 1); @@ -244,17 +249,17 @@ keygen_set_std_prefs (const char *string string = ""; for (s=string; *s; s = s2) { - if ((*s=='s' || *s == 'S') && isdigit(s[1]) ) { + if ((*s=='s' || *s == 'S') && digitp (s+1) ) { val = strtoul (++s, (char**)&s2, 10); if (set_one_pref (val, 'S', check_cipher_algo, sym, &nsym)) rc = -1; } - else if ((*s=='h' || *s == 'H') && isdigit(s[1]) ) { + else if ((*s=='h' || *s == 'H') && digitp (s+1) ) { val = strtoul (++s, (char**)&s2, 10); if (set_one_pref (val, 'H', check_digest_algo, hash, &nhash)) rc = -1; } - else if ((*s=='z' || *s == 'Z') && isdigit(s[1]) ) { + else if ((*s=='z' || *s == 'Z') && digitp (s+1) ) { val = strtoul (++s, (char**)&s2, 10); if (set_one_pref (val, 'Z', check_compress_algo, zip, &nzip)) rc = -1; @@ -267,7 +272,7 @@ keygen_set_std_prefs (const char *string mdc=0; s2=s+6; } - else if (isspace (*s)) + else if (spacep (s)) s2 = s+1; else { log_info (_("invalid character in preference string\n")); @@ -915,10 +920,10 @@ gen_rsa(int algo, unsigned nbits, KBNODE static int check_valid_days( const char *s ) { - if( !isdigit(*s) ) + if( !digitp(s) ) return 0; for( s++; *s; s++) - if( !isdigit(*s) ) + if( !digitp(s) ) break; if( !*s ) return 1; @@ -996,15 +1001,18 @@ ask_algo (int addmode, unsigned int *r_u _("Create anyway? "))) { algo = PUBKEY_ALGO_ELGAMAL; + *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; break; } } else if( algo == 3 && addmode ) { algo = PUBKEY_ALGO_ELGAMAL_E; + *r_usage = PUBKEY_USAGE_ENC; break; } else if( algo == 2 ) { algo = PUBKEY_ALGO_DSA; + *r_usage = PUBKEY_USAGE_SIG; break; } else @@ -1252,7 +1260,7 @@ ask_user_id( int mode ) if( strpbrk( aname, "<>" ) ) tty_printf(_("Invalid character in name\n")); - else if( isdigit(*aname) ) + else if( digitp(aname) ) tty_printf(_("Name may not start with a digit\n")); else if( strlen(aname) < 5 ) tty_printf(_("Name must be at least 5 characters long\n")); @@ -1266,7 +1274,7 @@ ask_user_id( int mode ) amail = cpr_get("keygen.email",_("Email address: ")); trim_spaces(amail); cpr_kill_prompt(); - if( !*amail ) + if( !*amail || opt.allow_freeform_uid ) break; /* no email address is okay */ else if( has_invalid_email_chars(amail) || string_count_chr(amail,'@') != 1 @@ -1319,11 +1327,13 @@ ask_user_id( int mode ) tty_printf(_("You selected this USER-ID:\n \"%s\"\n\n"), uid); /* fixme: add a warning if this user-id already exists */ - if( !*amail && (strchr( aname, '@' ) || strchr( acomment, '@'))) { + if( !*amail && !opt.allow_freeform_uid + && (strchr( aname, '@' ) || strchr( acomment, '@'))) + { fail = 1; tty_printf(_("Please don't put the email address " - "into the real name or the comment\n") ); - } + "into the real name or the comment\n") ); + } for(;;) { const char *ansstr = _("NnCcEeOoQq"); @@ -1446,7 +1456,7 @@ do_create( int algo, unsigned int nbits, else BUG(); - #ifdef ENABLE_COMMENT_PACKETS +#ifdef ENABLE_COMMENT_PACKETS if( !rc ) { add_kbnode( pub_root, make_comment_node("#created by GNUPG v" VERSION " (" @@ -1455,7 +1465,7 @@ do_create( int algo, unsigned int nbits, make_comment_node("#created by GNUPG v" VERSION " (" PRINTABLE_OS_NAME ")")); } - #endif +#endif return rc; } @@ -1522,7 +1532,7 @@ get_parameter_algo( struct para_data_s * struct para_data_s *r = get_parameter( para, key ); if( !r ) return -1; - if( isdigit( *r->u.value ) ) + if( digitp( r->u.value ) ) i = atoi( r->u.value ); else i = string_to_pubkey_algo( r->u.value ); @@ -2003,6 +2013,11 @@ generate_keypair( const char *fname ) strcpy( r->u.value, "1024" ); r->next = para; para = r; + r = m_alloc_clear( sizeof *r + 20 ); + r->key = pKEYUSAGE; + strcpy( r->u.value, "sign" ); + r->next = para; + para = r; algo = PUBKEY_ALGO_ELGAMAL_E; r = m_alloc_clear( sizeof *r + 20 ); @@ -2010,6 +2025,11 @@ generate_keypair( const char *fname ) sprintf( r->u.value, "%d", algo ); r->next = para; para = r; + r = m_alloc_clear( sizeof *r + 20 ); + r->key = pSUBKEYUSAGE; + strcpy( r->u.value, "encrypt" ); + r->next = para; + para = r; } else { r = m_alloc_clear( sizeof *r + 20 ); diff -urpP gnupg-1.2.2/g10/keyid.c gnupg-1.2.3/g10/keyid.c --- gnupg-1.2.2/g10/keyid.c 2003-04-15 12:19:05.000000000 +0000 +++ gnupg-1.2.3/g10/keyid.c 2003-07-30 07:41:37.000000000 +0000 @@ -60,6 +60,7 @@ do_fingerprint_md( PKT_public_key *pk ) int npkey = pubkey_get_npkey( pk->pubkey_algo ); md = md_open( pk->version < 4 ? DIGEST_ALGO_RMD160 : DIGEST_ALGO_SHA1, 0); + n = pk->version < 4 ? 8 : 6; for(i=0; i < npkey; i++ ) { nb[i] = mpi_get_nbits(pk->pkey[i]); diff -urpP gnupg-1.2.2/g10/keylist.c gnupg-1.2.3/g10/keylist.c --- gnupg-1.2.2/g10/keylist.c 2003-04-14 07:56:49.000000000 +0000 +++ gnupg-1.2.3/g10/keylist.c 2003-07-28 18:34:41.000000000 +0000 @@ -1,5 +1,5 @@ /* keylist.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -57,10 +57,31 @@ static FILE *attrib_fp=NULL; void public_key_list( STRLIST list ) { - if( !list ) - list_all(0); - else - list_one( list, 0 ); + if(opt.with_colons) + { + byte trust_model; + ulong created,nextcheck; + + read_trust_options(&trust_model,&created,&nextcheck); + + printf("tru:"); + + if(nextcheck && nextcheck <= make_timestamp()) + printf("o"); + if(trust_model!=0) + printf("t"); + + /* We don't show marginals, completes, or cert_depth since + they are not accurate in 1.2.x - they are not updated when + the trustdb is rebuilt with different options. */ + + printf(":%d:%lu:%lu\n",trust_model,created,nextcheck); + } + + if( !list ) + list_all(0); + else + list_one( list, 0 ); } void @@ -187,16 +208,20 @@ list_all( int secret ) log_error ("keydb_get_keyblock failed: %s\n", g10_errstr(rc)); goto leave; } - resname = keydb_get_resource_name (hd); - if (lastresname != resname ) { - int i; - - printf("%s\n", resname ); - for(i=strlen(resname); i; i-- ) - putchar('-'); - putchar('\n'); - lastresname = resname; - } + if(!opt.with_colons) + { + resname = keydb_get_resource_name (hd); + if (lastresname != resname ) + { + int i; + + printf("%s\n", resname ); + for(i=strlen(resname); i; i-- ) + putchar('-'); + putchar('\n'); + lastresname = resname; + } + } merge_keys_and_selfsig( keyblock ); list_keyblock( keyblock, secret, opt.fingerprint, opt.check_sigs?&stats:NULL); @@ -222,7 +247,7 @@ list_one( STRLIST names, int secret ) KBNODE keyblock = NULL; GETKEY_CTX ctx; const char *resname; - char *keyring_str = N_("Keyring"); + char *keyring_str = _("Keyring"); int i; struct sig_stats stats; @@ -245,7 +270,7 @@ list_one( STRLIST names, int secret ) return; } do { - if (opt.show_keyring) { + if (opt.show_keyring && !opt.with_colons) { resname = keydb_get_resource_name (get_ctx_handle(ctx)); printf("%s: %s\n", keyring_str, resname); for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- ) @@ -265,7 +290,7 @@ list_one( STRLIST names, int secret ) return; } do { - if (opt.show_keyring) { + if (opt.show_keyring && !opt.with_colons) { resname = keydb_get_resource_name (get_ctx_handle(ctx)); printf("%s: %s\n", keyring_str, resname); for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- ) @@ -315,23 +340,17 @@ print_capabilities (PKT_public_key *pk, } } - if ( keyblock ) { /* figure our the usable capabilities */ + if ( keyblock ) { /* figure out the usable capabilities */ KBNODE k; int enc=0, sign=0, cert=0, disabled=0; for (k=keyblock; k; k = k->next ) { if ( k->pkt->pkttype == PKT_PUBLIC_KEY || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) { - u32 kid[2]; pk = k->pkt->pkt.public_key; - if(k->pkt->pkttype==PKT_PUBLIC_KEY) - { - keyid_from_pk(pk,kid); - - if(is_disabled(NULL,kid)) - disabled=1; - } + if(pk->is_primary) + disabled=pk_is_disabled(pk); if ( pk->is_valid && !pk->is_revoked && !pk->has_expired ) { if ( pk->pubkey_usage & PUBKEY_USAGE_ENC ) @@ -373,13 +392,13 @@ print_capabilities (PKT_public_key *pk, putchar(':'); } -static void dump_attribs(const PKT_user_id *uid, - PKT_public_key *pk,PKT_secret_key *sk) +void +dump_attribs(const PKT_user_id *uid,PKT_public_key *pk,PKT_secret_key *sk) { int i; if(!attrib_fp) - BUG(); + return; for(i=0;inumattribs;i++) { @@ -455,8 +474,6 @@ list_keyblock_print ( KBNODE keyblock, i for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) { if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) { - if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL) - dump_attribs(node->pkt->pkt.user_id,pk,sk); /* don't list revoked or expired UIDS unless we are in * verbose mode and signature listing has not been * requested */ @@ -465,6 +482,9 @@ list_keyblock_print ( KBNODE keyblock, i node->pkt->pkt.user_id->is_expired )) continue; + if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL) + dump_attribs(node->pkt->pkt.user_id,pk,sk); + if( any ) printf("uid%*s", 28, ""); @@ -650,7 +670,7 @@ list_keyblock_colon( KBNODE keyblock, in pk = NULL; sk = node->pkt->pkt.secret_key; keyid_from_sk( sk, keyid ); - printf("sec:u:%u:%d:%08lX%08lX:%s:%s:::", + printf("sec::%u:%d:%08lX%08lX:%s:%s:::", nbits_from_sk( sk ), sk->pubkey_algo, (ulong)keyid[0],(ulong)keyid[1], @@ -714,13 +734,17 @@ list_keyblock_colon( KBNODE keyblock, in */ if( any ) { char *str=node->pkt->pkt.user_id->attrib_data?"uat":"uid"; - if ( node->pkt->pkt.user_id->is_revoked ) + /* If we're listing a secret key, leave out the + validity values for now. This is handled better in + 1.9. */ + if ( sk ) + printf("%s:::::::::",str); + else if ( node->pkt->pkt.user_id->is_revoked ) printf("%s:r::::::::",str); else if ( node->pkt->pkt.user_id->is_expired ) printf("%s:e::::::::",str); - else if ( opt.no_expensive_trust_checks ) { + else if ( opt.no_expensive_trust_checks ) printf("%s:::::::::",str); - } else { int uid_validity; diff -urpP gnupg-1.2.2/g10/keyring.c gnupg-1.2.3/g10/keyring.c --- gnupg-1.2.2/g10/keyring.c 2003-03-06 09:43:51.000000000 +0000 +++ gnupg-1.2.3/g10/keyring.c 2003-08-21 16:06:47.000000000 +0000 @@ -1367,6 +1367,13 @@ keyring_rebuild_cache (void *token) { if (node->pkt->pkttype == PKT_SIGNATURE) { + /* Note that this doesn't cache the result of a + revocation issued by a designated revoker. This is + because the pk in question does not carry the revkeys + as we haven't merged the key and selfsigs. It is + questionable whether this matters very much since + there are very very few designated revoker revocation + packets out there. */ check_key_signature (keyblock, node, NULL); sigcount++; } diff -urpP gnupg-1.2.2/g10/keyserver.c gnupg-1.2.3/g10/keyserver.c --- gnupg-1.2.2/g10/keyserver.c 2003-04-09 08:07:14.000000000 +0000 +++ gnupg-1.2.3/g10/keyserver.c 2003-08-21 16:18:04.000000000 +0000 @@ -1,5 +1,5 @@ /* keyserver.c - generic keyserver code - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -156,7 +156,8 @@ parse_keyserver_uri(char *uri,const char opt.keyserver_scheme="hkp"; opt.keyserver_options.broken_http_proxy=1; } - else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0) + else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0 + || ascii_strcasecmp(opt.keyserver_scheme,"http")==0) { /* Canonicalize this to "hkp" so it works with both the internal and external keyserver interface. */ @@ -189,11 +190,16 @@ parse_keyserver_uri(char *uri,const char ch=opt.keyserver_port; while(*ch!='\0') { - if(!isdigit(*ch)) + if(!digitp(ch)) return G10ERR_BAD_URI; ch++; } + + /* It would seem to be reasonable to limit the range of the + ports to values between 1-65535, but RFC 1738 and 1808 + imply there is no limit. Of course, the real world has + limits. */ } /* (any path part of the URI is discarded for now as no keyserver @@ -564,7 +570,7 @@ keyserver_spawn(int action,STRLIST list, /* remove trailing whitespace */ plen=strlen(ptr); - while(plen>0 && isspace(ptr[plen-1])) + while(plen>0 && ascii_isspace(ptr[plen-1])) plen--; plen[ptr]='\0'; @@ -679,6 +685,10 @@ keyserver_work(int action,STRLIST list,K log_error(_("no keyserver known (use option --keyserver)\n")); return G10ERR_BAD_URI; } + else if(opt.keyserver_port && (strlen(opt.keyserver_port)>5 + || atoi(opt.keyserver_port)<1 + || atoi(opt.keyserver_port)>65535)) + return G10ERR_BAD_URI; else { void *stats_handle = import_new_stats_handle (); @@ -1078,6 +1088,9 @@ keyserver_search_prompt(IOBUF buffer,int if(i%10==0 || rl==0) { + /* A flush doesn't change anything but might be helpful for + some applications. */ + fflush (stdout); answer=cpr_get_no_help("keysearch.prompt", _("Enter number(s), N)ext, or Q)uit > ")); /* control-d */ diff -urpP gnupg-1.2.2/g10/main.h gnupg-1.2.3/g10/main.h --- gnupg-1.2.2/g10/main.h 2003-04-15 13:57:47.000000000 +0000 +++ gnupg-1.2.3/g10/main.h 2003-06-07 18:55:21.000000000 +0000 @@ -87,6 +87,16 @@ void deprecated_warning(const char *conf const char *option,const char *repl1,const char *repl2); const char *compress_algo_to_string(int algo); int check_compress_algo(int algo); +const char *compliance_option_string(void); +void compliance_failure(void); + +struct parse_options +{ + char *name; + unsigned int bit; +}; + +int parse_options(char *str,unsigned int *options,struct parse_options *opts); /*-- helptext.c --*/ void display_online_help( const char *keyword ); @@ -199,6 +209,8 @@ void list_keyblock( KBNODE keyblock, int void print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode); void show_policy_url(PKT_signature *sig,int indent); void show_notation(PKT_signature *sig,int indent); +void dump_attribs(const PKT_user_id *uid, + PKT_public_key *pk,PKT_secret_key *sk); void set_attrib_fd(int fd); /*-- verify.c --*/ diff -urpP gnupg-1.2.2/g10/mainproc.c gnupg-1.2.3/g10/mainproc.c --- gnupg-1.2.2/g10/mainproc.c 2003-04-27 10:04:22.000000000 +0000 +++ gnupg-1.2.3/g10/mainproc.c 2003-07-28 18:34:41.000000000 +0000 @@ -660,15 +660,12 @@ proc_compressed( CTX c, PACKET *pkt ) * Returns: 0 = valid signature or an error code */ static int -do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey ) +do_check_sig( CTX c, KBNODE node, int *is_selfsig, + int *is_expkey, int *is_revkey ) { PKT_signature *sig; MD_HANDLE md = NULL, md2 = NULL; - int algo, rc, dum2; - u32 dummy; - - if(!is_expkey) - is_expkey=&dum2; + int algo, rc; assert( node->pkt->pkttype == PKT_SIGNATURE ); if( is_selfsig ) @@ -722,9 +719,9 @@ do_check_sig( CTX c, KBNODE node, int *i } else return G10ERR_SIG_CLASS; - rc = signature_check2( sig, md, &dummy, is_expkey ); + rc = signature_check2( sig, md, NULL, is_expkey, is_revkey ); if( rc == G10ERR_BAD_SIGN && md2 ) - rc = signature_check2( sig, md2, &dummy, is_expkey ); + rc = signature_check2( sig, md2, NULL, is_expkey, is_revkey ); md_close(md); md_close(md2); @@ -993,7 +990,7 @@ list_node( CTX c, KBNODE node ) fputs("sig", stdout); if( opt.check_sigs ) { fflush(stdout); - switch( (rc2=do_check_sig( c, node, &is_selfsig, NULL )) ) { + switch( (rc2=do_check_sig( c, node, &is_selfsig, NULL, NULL )) ) { case 0: sigrc = '!'; break; case G10ERR_BAD_SIGN: sigrc = '-'; break; case G10ERR_NO_PUBKEY: @@ -1242,7 +1239,7 @@ check_sig_and_print( CTX c, KBNODE node { PKT_signature *sig = node->pkt->pkt.signature; const char *astr, *tstr; - int rc, is_expkey=0; + int rc, is_expkey=0, is_revkey=0; if( opt.skip_verify ) { log_info(_("signature verification suppressed\n")); @@ -1303,19 +1300,38 @@ check_sig_and_print( CTX c, KBNODE node } } } - - tstr = asctimestamp(sig->timestamp); astr = pubkey_algo_to_string( sig->pubkey_algo ); log_info(_("Signature made %.*s using %s key ID %08lX\n"), (int)strlen(tstr), tstr, astr? astr: "?", (ulong)sig->keyid[1] ); - rc = do_check_sig(c, node, NULL, &is_expkey ); + rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); if( rc == G10ERR_NO_PUBKEY && opt.keyserver_scheme && opt.keyserver_options.auto_key_retrieve) { if( keyserver_import_keyid ( sig->keyid )==0 ) - rc = do_check_sig(c, node, NULL, &is_expkey ); + rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); } + + /* If the key still isn't found, try to inform the user where it + can be found. */ + if(rc==G10ERR_NO_PUBKEY) + { + const byte *p; + int seq=0; + size_t n; + + while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL))) + { + /* According to my favorite copy editor, in English + grammar, you say "at" if the key is located on a web + page, but "from" if it is located on a keyserver. I'm + not going to even try to make two strings here :) */ + log_info(_("Key available at: ") ); + print_string( log_stream(), p, n, 0 ); + putc( '\n', log_stream() ); + } + } + if( !rc || rc == G10ERR_BAD_SIGN ) { KBNODE un, keyblock; int count=0, statno; @@ -1327,6 +1343,8 @@ check_sig_and_print( CTX c, KBNODE node statno=STATUS_EXPSIG; else if(is_expkey) statno=STATUS_EXPKEYSIG; + else if(is_revkey) + statno=STATUS_REVKEYSIG; else statno=STATUS_GOODSIG; @@ -1421,9 +1439,14 @@ check_sig_and_print( CTX c, KBNODE node !un->pkt->pkt.user_id->attrib_data ) continue; - if(opt.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); + if(un->pkt->pkt.user_id->attrib_data) + { + dump_attribs(un->pkt->pkt.user_id,pk,NULL); + + if(opt.show_photos) + show_photos(un->pkt->pkt.user_id->attribs, + un->pkt->pkt.user_id->numattribs,pk,NULL); + } log_info( _(" aka \"")); print_utf8_string( log_stream(), un->pkt->pkt.user_id->name, @@ -1612,10 +1635,30 @@ proc_tree( CTX c, KBNODE node ) } else if( node->pkt->pkttype == PKT_SIGNATURE ) { PKT_signature *sig = node->pkt->pkt.signature; + int multiple_ok=1; - if(find_next_kbnode(node, PKT_SIGNATURE)) - log_info(_("WARNING: multiple signatures detected. " - "Only the first will be checked.\n")); + n1=find_next_kbnode(node, PKT_SIGNATURE); + if(n1) + { + byte class=sig->sig_class; + byte hash=sig->digest_algo; + + for(; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE))) + { + /* We can't currently handle multiple signatures of + different classes or digests (we'd pretty much have + to run a different hash context for each), but if + they are all the same, make an exception. */ + if(n1->pkt->pkt.signature->sig_class!=class + || n1->pkt->pkt.signature->digest_algo!=hash) + { + multiple_ok=0; + log_info(_("WARNING: multiple signatures detected. " + "Only the first will be checked.\n")); + break; + } + } + } if( sig->sig_class != 0x00 && sig->sig_class != 0x01 ) log_info(_("standalone signature of class 0x%02x\n"), @@ -1638,7 +1681,7 @@ proc_tree( CTX c, KBNODE node ) * signature has been created in textmode */ c->mfx.md2 = md_open( sig->digest_algo, 0 ); } - #if 0 /* workaround disabled */ +#if 0 /* workaround disabled */ /* Here we have another hack to work around a pgp 2 bug * It works by not using the textmode for detached signatures; * this will let the first signature check (on md) fail @@ -1647,7 +1690,7 @@ proc_tree( CTX c, KBNODE node ) * hack but it may help in some cases (and break others) */ /* c->mfx.md2? 0 :(sig->sig_class == 0x01) */ - #endif +#endif if ( DBG_HASHING ) { md_start_debug( c->mfx.md, "verify" ); if ( c->mfx.md2 ) @@ -1677,7 +1720,11 @@ proc_tree( CTX c, KBNODE node ) else if (!opt.quiet) log_info(_("old style (PGP 2.x) signature\n")); - check_sig_and_print( c, node ); + if(multiple_ok) + for( n1 = node; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )) ) + check_sig_and_print( c, n1 ); + else + check_sig_and_print( c, node ); } else { dump_kbnode (c->list); @@ -1685,7 +1732,3 @@ proc_tree( CTX c, KBNODE node ) dump_kbnode (node); } } - - - - diff -urpP gnupg-1.2.2/g10/misc.c gnupg-1.2.3/g10/misc.c --- gnupg-1.2.2/g10/misc.c 2002-09-11 07:27:54.000000000 +0000 +++ gnupg-1.2.3/g10/misc.c 2003-07-28 18:34:41.000000000 +0000 @@ -25,13 +25,13 @@ #include #include #if defined(__linux__) && defined(__alpha__) && __GLIBC__ < 2 - #include - #include +#include +#include #endif #ifdef HAVE_SETRLIMIT - #include - #include - #include +#include +#include +#include #endif #include "util.h" #include "main.h" @@ -84,10 +84,10 @@ trap_unaligned(void) int disable_core_dumps() { - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM return 0; - #else - #ifdef HAVE_SETRLIMIT +#else +#ifdef HAVE_SETRLIMIT struct rlimit limit; limit.rlim_cur = 0; @@ -96,9 +96,9 @@ disable_core_dumps() return 0; if( errno != EINVAL && errno != ENOSYS ) log_fatal(_("can't disable core dumps: %s\n"), strerror(errno) ); - #endif +#endif return 1; - #endif +#endif } @@ -320,6 +320,8 @@ pct_expando(const char *string,struct ex if(args->sk) keyid_from_sk(args->sk,sk_keyid); + /* This is used so that %k works in photoid command strings in + --list-secret-keys (which of course has a sk, but no pk). */ if(!args->pk && args->sk) keyid_from_sk(args->sk,pk_keyid); @@ -381,16 +383,38 @@ pct_expando(const char *string,struct ex } break; - case 'f': /* fingerprint */ + case 'p': /* primary pk fingerprint of a sk */ + case 'f': /* pk fingerprint */ + case 'g': /* sk fingerprint */ { byte array[MAX_FINGERPRINT_LEN]; size_t len; int i; - if(args->pk) + if((*(ch+1))=='p' && args->sk) + { + if(args->sk->is_primary) + fingerprint_from_sk(args->sk,array,&len); + else if(args->sk->main_keyid[0] || args->sk->main_keyid[1]) + { + PKT_public_key *pk= + m_alloc_clear(sizeof(PKT_public_key)); + + if(get_pubkey_fast(pk,args->sk->main_keyid)==0) + fingerprint_from_pk(pk,array,&len); + else + memset(array,0,(len=MAX_FINGERPRINT_LEN)); + free_public_key(pk); + } + else + memset(array,0,(len=MAX_FINGERPRINT_LEN)); + } + else if((*(ch+1))=='f' && args->pk) fingerprint_from_pk(args->pk,array,&len); + else if((*(ch+1))=='g' && args->sk) + fingerprint_from_sk(args->sk,array,&len); else - memset(array,0, (len=MAX_FINGERPRINT_LEN)); + memset(array,0,(len=MAX_FINGERPRINT_LEN)); if(idx+(len*2)is_disabled)?((a)->is_disabled==2):(cache_disabled_value((a)))) + typedef struct { u32 timestamp; /* key made */ u32 expiredate; /* expires at this date or 0 if not at all */ @@ -344,7 +349,6 @@ typedef enum { SIGSUBPKT_SIGNERS_UID =28, /* signer's user id */ SIGSUBPKT_REVOC_REASON =29, /* reason for revocation */ SIGSUBPKT_FEATURES =30, /* feature flags */ - SIGSUBPKT_PRIV_VERIFY_CACHE =101, /* cache verification result (obsolete)*/ SIGSUBPKT_FLAG_CRITICAL=128 } sigsubpkttype_t; @@ -447,7 +451,7 @@ int cmp_user_ids( PKT_user_id *a, PKT_us /*-- sig-check.c --*/ int signature_check( PKT_signature *sig, MD_HANDLE digest ); int signature_check2( PKT_signature *sig, MD_HANDLE digest, - u32 *r_expiredate, int *r_expired ); + u32 *r_expiredate, int *r_expired, int *r_revoked ); /*-- seckey-cert.c --*/ int is_secret_key_protected( PKT_secret_key *sk ); diff -urpP gnupg-1.2.2/g10/parse-packet.c gnupg-1.2.3/g10/parse-packet.c --- gnupg-1.2.2/g10/parse-packet.c 2003-04-27 10:04:22.000000000 +0000 +++ gnupg-1.2.3/g10/parse-packet.c 2003-08-21 16:06:47.000000000 +0000 @@ -1,5 +1,6 @@ /* parse-packet.c - read packets - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -41,9 +42,9 @@ static int list_mode = 0; static int parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos, int *skip, IOBUF out, int do_skip - #ifdef DEBUG_PARSE_PACKET +#ifdef DEBUG_PARSE_PACKET ,const char *dbg_w, const char *dbg_f, int dbg_l - #endif +#endif ); static int copy_packet( IOBUF inp, IOBUF out, int pkttype, unsigned long pktlen ); @@ -366,8 +367,28 @@ parse( IOBUF inp, PACKET *pkt, int onlyk lenbytes = ((ctb&3)==3)? 0 : (1<<(ctb & 3)); if( !lenbytes ) { pktlen = 0; /* don't know the value */ - if( pkttype != PKT_COMPRESSED ) - iobuf_set_block_mode(inp, 1); + switch (pkttype) { + case PKT_ENCRYPTED: + case PKT_PLAINTEXT: + /* These partial length encodings are from an very + early GnuPG release and deprecated. However we + still support them read-wise. Note, that we should + not allow them for any key related packets, because + this might render a keyring unusable if an errenous + packet indicated this mode but not complying to it + gets imported. */ + iobuf_set_block_mode(inp, 1); + break; + + case PKT_COMPRESSED: + break; /* the orginal pgp 2 way. */ + + default: + log_error ("%s: old style partial length " + "for invalid packet type\n", iobuf_where(inp) ); + rc = G10ERR_INVALID_PACKET; + goto leave; + } } else { for( ; lenbytes; lenbytes-- ) { @@ -860,7 +881,8 @@ dump_sig_subpkt( int hashed, int type, i printf(" %02X", buffer[i]); break; case SIGSUBPKT_PREF_KS: - p = "preferred key server"; + fputs("preferred key server: ", stdout ); + print_string( stdout, buffer, length, ')' ); break; case SIGSUBPKT_PRIMARY_UID: p = "primary user ID"; @@ -899,10 +921,12 @@ dump_sig_subpkt( int hashed, int type, i for( i=0; i < length; i++ ) printf(" %02x", buffer[i] ); break; - case SIGSUBPKT_PRIV_VERIFY_CACHE: - p = "obsolete verification cache"; + default: + if(type>=100 && type<=110) + p="experimental / private subpacket"; + else + p = "?"; break; - default: p = "?"; break; } printf("%s)\n", p? p: ""); @@ -934,6 +958,7 @@ parse_one_sig_subpkt( const byte *buffer case SIGSUBPKT_PREF_HASH: case SIGSUBPKT_PREF_COMPR: case SIGSUBPKT_POLICY: + case SIGSUBPKT_PREF_KS: case SIGSUBPKT_FEATURES: return 0; case SIGSUBPKT_EXPORTABLE: @@ -957,19 +982,6 @@ parse_one_sig_subpkt( const byte *buffer if ( n != 1 ) break; return 0; - case SIGSUBPKT_PRIV_VERIFY_CACHE: - /* We used this in gpg 1.0.5 and 1.0.6 to cache signature - * verification results - it is no longer used. - * "GPG" 0x00 - * where mode == 1: valid data, stat == 0: invalid signature - * stat == 1: valid signature - * (because we use private data, we check our marker) */ - if( n < 6 ) - break; - if( buffer[0] != 'G' || buffer[1] != 'P' - || buffer[2] != 'G' || buffer[3] ) - return -2; - return 4; default: return -1; } return -3; @@ -998,7 +1010,9 @@ can_handle_critical( const byte *buffer, case SIGSUBPKT_KEY_FLAGS: case SIGSUBPKT_PRIMARY_UID: case SIGSUBPKT_FEATURES: - case SIGSUBPKT_POLICY: /* Is it enough to show the policy? */ + /* Is it enough to show the policy or keyserver? */ + case SIGSUBPKT_POLICY: + case SIGSUBPKT_PREF_KS: return 1; default: @@ -1224,11 +1238,8 @@ parse_signature( IOBUF inp, int pkttype, goto leave; } if( n ) { - /* we add 8 extra bytes so that we have space for the signature - * status cache. Well we are wastin this if there is a cache - * packet already, but in the other case it avoids an realloc */ - sig->unhashed = m_alloc (sizeof(*sig->unhashed) + n + 8 - 1 ); - sig->unhashed->size = n + 8; + sig->unhashed = m_alloc (sizeof(*sig->unhashed) + n - 1 ); + sig->unhashed->size = n; sig->unhashed->len = n; if( iobuf_read(inp, sig->unhashed->data, n ) != n ) { log_error("premature eof while reading " @@ -1262,17 +1273,19 @@ parse_signature( IOBUF inp, int pkttype, } p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_SIG_CREATED, NULL ); - if( !p ) - log_error("signature packet without timestamp\n"); - else - sig->timestamp = buffer_to_u32(p); + if(p) + sig->timestamp = buffer_to_u32(p); + else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)) + log_error("signature packet without timestamp\n"); + p = parse_sig_subpkt2( sig, SIGSUBPKT_ISSUER, NULL ); - if( !p ) - log_error("signature packet without keyid\n"); - else { + if(p) + { sig->keyid[0] = buffer_to_u32(p); sig->keyid[1] = buffer_to_u32(p+4); - } + } + else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)) + log_error("signature packet without keyid\n"); p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_SIG_EXPIRE,NULL); if(p) @@ -1532,6 +1545,7 @@ parse_key( IOBUF inp, int pkttype, unsig pk->req_usage = 0; pk->pubkey_usage = 0; /* not yet used */ pk->is_revoked = 0; + pk->is_disabled = 0; pk->keyid[0] = 0; pk->keyid[1] = 0; } @@ -1547,6 +1561,7 @@ parse_key( IOBUF inp, int pkttype, unsig if( pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY ) { PKT_secret_key *sk = pkt->pkt.secret_key; byte temp[16]; + size_t snlen = 0; if( !npkey ) { sk->skey[0] = mpi_set_opaque( NULL, @@ -1619,6 +1634,8 @@ parse_key( IOBUF inp, int pkttype, unsig break; case 1001: if( list_mode ) printf( "\tgnu-dummy S2K" ); break; + case 1002: if (list_mode) printf("\tgnu-divert-to-card S2K"); + break; default: if( list_mode ) printf( "\tunknown %sS2K %d\n", @@ -1654,6 +1671,19 @@ parse_key( IOBUF inp, int pkttype, unsig printf("\tprotect count: %lu\n", (ulong)sk->protect.s2k.count); } + else if( sk->protect.s2k.mode == 1002 ) { + /* Read the serial number. */ + if (pktlen < 1) { + rc = G10ERR_INVALID_PACKET; + goto leave; + } + snlen = iobuf_get (inp); + pktlen--; + if (pktlen < snlen || snlen == -1) { + rc = G10ERR_INVALID_PACKET; + goto leave; + } + } } /* Note that a sk->protect.algo > 110 is illegal, but I'm not erroring on it here as otherwise there would be no @@ -1683,6 +1713,8 @@ parse_key( IOBUF inp, int pkttype, unsig } if( sk->protect.s2k.mode == 1001 ) sk->protect.ivlen = 0; + else if( sk->protect.s2k.mode == 1002 ) + sk->protect.ivlen = snlen < 16? snlen : 16; if( pktlen < sk->protect.ivlen ) { rc = G10ERR_INVALID_PACKET; @@ -1691,7 +1723,8 @@ parse_key( IOBUF inp, int pkttype, unsig for(i=0; i < sk->protect.ivlen && pktlen; i++, pktlen-- ) temp[i] = iobuf_get_noeof(inp); if( list_mode ) { - printf( "\tprotect IV: "); + printf( sk->protect.s2k.mode == 1002? "\tserial-number: " + : "\tprotect IV: "); for(i=0; i < sk->protect.ivlen; i++ ) printf(" %02x", temp[i] ); putchar('\n'); @@ -1704,7 +1737,8 @@ parse_key( IOBUF inp, int pkttype, unsig * If the user is so careless, not to protect his secret key, * we can assume, that he operates an open system :=(. * So we put the key into secure memory when we unprotect it. */ - if( sk->protect.s2k.mode == 1001 ) { + if( sk->protect.s2k.mode == 1001 + || sk->protect.s2k.mode == 1002 ) { /* better set some dummy stuff here */ sk->skey[npkey] = mpi_set_opaque(NULL, m_strdup("dummydata"), 10); pktlen = 0; diff -urpP gnupg-1.2.2/g10/passphrase.c gnupg-1.2.3/g10/passphrase.c --- gnupg-1.2.2/g10/passphrase.c 2003-04-10 08:25:40.000000000 +0000 +++ gnupg-1.2.3/g10/passphrase.c 2003-07-30 16:16:55.000000000 +0000 @@ -29,7 +29,7 @@ #include #include #endif -#if defined (__MINGW32__) || defined (__CYGWIN32__) +#if defined (_WIN32) || defined (__CYGWIN32__) # include #endif #include @@ -100,7 +100,7 @@ static char *fd_passwd = NULL; static char *next_pw = NULL; static char *last_pw = NULL; -#if defined (__MINGW32__) +#if defined (_WIN32) static int read_fd = 0; static int write_fd = 0; #endif @@ -189,7 +189,7 @@ read_passphrase_from_fd( int fd ) static int writen ( int fd, const void *buf, size_t nbytes ) { -#if defined (__MINGW32__) +#if defined (_WIN32) DWORD nwritten, nleft = nbytes; while (nleft > 0) { @@ -232,7 +232,7 @@ writen ( int fd, const void *buf, size_t static int readn ( int fd, void *buf, size_t buflen, size_t *ret_nread ) { -#if defined (__MINGW32__) +#if defined (_WIN32) DWORD nread, nleft = buflen; while (nleft > 0) { @@ -326,7 +326,7 @@ readline (int fd, char *buf, size_t bufl #if !defined (__riscos__) -#if !defined (__MINGW32__) +#if !defined (_WIN32) /* For the new Assuan protocol we may have to send options */ static int agent_send_option (int fd, const char *name, const char *value) @@ -374,7 +374,11 @@ agent_send_all_options (int fd) } if (!opt.ttyname) - dft_ttyname = tty_get_ttyname (); + { + dft_ttyname = getenv ("GPG_TTY"); + if ((!dft_ttyname || !*dft_ttyname) && tty_get_ttyname ()) + dft_ttyname = tty_get_ttyname (); + } if (opt.ttyname || dft_ttyname) { if (agent_send_option (fd, "ttyname", @@ -431,7 +435,7 @@ agent_send_all_options (int fd) #endif return rc; } -#endif /*!__MINGW32__*/ +#endif /*!_WIN32*/ /* @@ -442,7 +446,7 @@ agent_send_all_options (int fd) static int agent_open (int *ret_prot) { -#if defined (__MINGW32__) +#if defined (_WIN32) int fd; char *infostr, *p; HANDLE h; @@ -587,7 +591,7 @@ agent_open (int *ret_prot) static void agent_close ( int fd ) { -#if defined (__MINGW32__) +#if defined (_WIN32) HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent"); ResetEvent(h); #else diff -urpP gnupg-1.2.2/g10/photoid.c gnupg-1.2.3/g10/photoid.c --- gnupg-1.2.2/g10/photoid.c 2003-04-27 10:04:22.000000000 +0000 +++ gnupg-1.2.3/g10/photoid.c 2003-07-30 15:29:06.000000000 +0000 @@ -22,7 +22,7 @@ #include #include #include -#ifdef __MINGW32__ +#ifdef _WIN32 # include # ifndef VER_PLATFORM_WIN32_WINDOWS # define VER_PLATFORM_WIN32_WINDOWS 1 @@ -223,7 +223,7 @@ char *image_type_to_string(byte type,int #if !defined(FIXED_PHOTO_VIEWER) && !defined(DISABLE_PHOTO_VIEWER) static const char *get_default_photo_command(void) { -#if defined(__MINGW32__) +#if defined(_WIN32) OSVERSIONINFO osvi; memset(&osvi,0,sizeof(osvi)); diff -urpP gnupg-1.2.2/g10/photoid.h gnupg-1.2.3/g10/photoid.h --- gnupg-1.2.2/g10/photoid.h 2002-06-29 13:46:34.000000000 +0000 +++ gnupg-1.2.3/g10/photoid.h 2003-05-21 08:42:56.000000000 +0000 @@ -1,3 +1,23 @@ +/* photoid.h + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + /* Photo ID functions */ #ifndef _PHOTOID_H_ diff -urpP gnupg-1.2.2/g10/pkclist.c gnupg-1.2.3/g10/pkclist.c --- gnupg-1.2.2/g10/pkclist.c 2003-05-01 11:02:17.000000000 +0000 +++ gnupg-1.2.3/g10/pkclist.c 2003-06-07 18:55:21.000000000 +0000 @@ -1088,46 +1088,60 @@ build_pk_list( STRLIST rcpts, PK_LIST *r intersection"), and PGP has no mechanism to fix such a broken preference list, so I'm including it. -dms */ -static int -algo_available( int preftype, int algo, void *hint ) +int +algo_available( preftype_t preftype, int algo, void *hint ) { - if( preftype == PREFTYPE_SYM ) { - if( opt.pgp6 && ( algo != 1 && algo != 2 && algo != 3) ) - return 0; - - if( (opt.pgp7 || opt.pgp8) - && (algo != 1 && algo != 2 && algo != 3 - && algo != 7 && algo != 8 && algo != 9 && algo != 10) ) - return 0; + if( preftype == PREFTYPE_SYM ) + { + if(PGP6 && (algo != CIPHER_ALGO_IDEA + && algo != CIPHER_ALGO_3DES + && algo != CIPHER_ALGO_CAST5)) + return 0; + + if((PGP7 || PGP8) && (algo != CIPHER_ALGO_IDEA + && algo != CIPHER_ALGO_3DES + && algo != CIPHER_ALGO_CAST5 + && algo != CIPHER_ALGO_AES + && algo != CIPHER_ALGO_AES192 + && algo != CIPHER_ALGO_AES256 + && algo != CIPHER_ALGO_TWOFISH)) + return 0; - return algo && !check_cipher_algo( algo ); + return algo && !check_cipher_algo( algo ); } - else if( preftype == PREFTYPE_HASH ) { - int bits=0; + else if( preftype == PREFTYPE_HASH ) + { + if(hint && ((*(int *)hint) != md_digest_length(algo))) + return 0; - if(hint) - bits=*(int *)hint; + if((PGP6 || PGP7) && (algo != DIGEST_ALGO_MD5 + && algo != DIGEST_ALGO_SHA1 + && algo != DIGEST_ALGO_RMD160)) + return 0; - if(bits && (bits != md_digest_length(algo))) - return 0; - if( (opt.pgp6 || opt.pgp7) && (algo != 1 && algo != 2 && algo != 3) ) - return 0; + if(PGP8 && (algo != DIGEST_ALGO_MD5 + && algo != DIGEST_ALGO_SHA1 + && algo != DIGEST_ALGO_RMD160 + && algo != DIGEST_ALGO_SHA256)) + return 0; - if( opt.pgp8 && (algo != 1 && algo != 2 && algo != 3 && algo != 8)) - return 0; + /* TIGER is not allowed any longer according to 2440bis. */ + if( RFC2440 && algo == DIGEST_ALGO_TIGER ) + return 0; - return algo && !check_digest_algo( algo ); + return algo && !check_digest_algo( algo ); } - else if( preftype == PREFTYPE_ZIP ) { - if ( ( opt.pgp6 || opt.pgp7 || opt.pgp8 ) - && ( algo !=0 && algo != 1) ) - return 0; + else if( preftype == PREFTYPE_ZIP ) + { + if((PGP6 || PGP7 || PGP8) && (algo != COMPRESS_ALGO_NONE + && algo != COMPRESS_ALGO_ZIP)) + return 0; - return !check_compress_algo( algo ); + return !check_compress_algo( algo ); } - else - return 0; + else + return 0; } @@ -1154,7 +1168,7 @@ select_algo_from_prefs(PK_LIST pk_list, memset( mask, 0, 8 * sizeof *mask ); if( preftype == PREFTYPE_SYM ) { - if( opt.pgp2 && + if( PGP2 && pkr->pk->version < 4 && pkr->pk->selfsigversion < 4 ) mask[0] |= (1<<1); /* IDEA is implicitly there for v3 keys @@ -1172,7 +1186,7 @@ select_algo_from_prefs(PK_LIST pk_list, 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( opt.pgp2 && + if( PGP2 && pkr->pk->version < 4 && pkr->pk->selfsigversion < 4 ) mask[0] |= (1<<1); /* MD5 is there for v3 keys with v3 @@ -1203,18 +1217,18 @@ select_algo_from_prefs(PK_LIST pk_list, compr_hack = 1; } - #if 0 +#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 +#endif for(i=0; i < 8; i++ ) bits[i] &= mask[i]; - #if 0 +#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 +#endif } /* usable algorithms are now in bits * We now use the last key from pk_list to select @@ -1261,9 +1275,9 @@ select_algo_from_prefs(PK_LIST pk_list, } } - #if 0 +#if 0 log_debug("prefs of type %d: selected %d\n", preftype, i ); - #endif +#endif if( compr_hack && !i ) { /* selected no compression, but we should check whether * algorithm 1 is also available (the ordering is not relevant diff -urpP gnupg-1.2.2/g10/plaintext.c gnupg-1.2.3/g10/plaintext.c --- gnupg-1.2.2/g10/plaintext.c 2003-04-28 08:09:32.000000000 +0000 +++ gnupg-1.2.3/g10/plaintext.c 2003-06-07 18:55:21.000000000 +0000 @@ -25,7 +25,7 @@ #include #include #ifdef HAVE_DOSISH_SYSTEM - #include /* for setmode() */ +#include /* for setmode() */ #endif #include "util.h" @@ -85,9 +85,9 @@ handle_plaintext( PKT_plaintext *pt, md_ else if( !*fname || (*fname=='-' && !fname[1])) { /* no filename or "-" given; write to stdout */ fp = stdout; - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM setmode ( fileno(fp) , O_BINARY ); - #endif +#endif } else { while( !overwrite_filep (fname) ) { @@ -127,10 +127,10 @@ handle_plaintext( PKT_plaintext *pt, md_ } if( mfx->md ) md_putc(mfx->md, c ); - #ifndef HAVE_DOSISH_SYSTEM +#ifndef HAVE_DOSISH_SYSTEM if( c == '\r' ) /* convert to native line ending */ continue; /* fixme: this hack might be too simple */ - #endif +#endif if( fp ) { if( putc( c, fp ) == EOF ) { log_error("Error writing to `%s': %s\n", @@ -174,10 +174,10 @@ handle_plaintext( PKT_plaintext *pt, md_ while( (c = iobuf_get(pt->buf)) != -1 ) { if( mfx->md ) md_putc(mfx->md, c ); - #ifndef HAVE_DOSISH_SYSTEM +#ifndef HAVE_DOSISH_SYSTEM if( convert && c == '\r' ) continue; /* fixme: this hack might be too simple */ - #endif +#endif if( fp ) { if( putc( c, fp ) == EOF ) { log_error("Error writing to `%s': %s\n", @@ -414,8 +414,3 @@ hash_datafiles( MD_HANDLE md, MD_HANDLE return 0; } - - - - - diff -urpP gnupg-1.2.2/g10/progress.c gnupg-1.2.3/g10/progress.c --- gnupg-1.2.2/g10/progress.c 2003-04-28 08:12:00.000000000 +0000 +++ gnupg-1.2.3/g10/progress.c 2003-05-21 08:38:38.000000000 +0000 @@ -105,7 +105,7 @@ handle_progress (progress_filter_context if (!is_status_enabled ()) return; - if (name) + if (name && *name && !(*name == '-' && !name[1])) filesize = iobuf_get_filelength (inp); else if (opt.set_filesize) filesize = opt.set_filesize; diff -urpP gnupg-1.2.2/g10/revoke.c gnupg-1.2.3/g10/revoke.c --- gnupg-1.2.2/g10/revoke.c 2002-12-05 14:31:59.000000000 +0000 +++ gnupg-1.2.3/g10/revoke.c 2003-06-07 18:41:38.000000000 +0000 @@ -549,7 +549,7 @@ gen_revoke( const char *uname ) goto leave; } - if(opt.pgp2 || opt.pgp6 || opt.pgp7 | opt.pgp8) + if(PGP2 || PGP6 || PGP7 || PGP8) { /* Use a minimal pk for PGPx mode, since PGP can't import bare revocation certificates. */ @@ -608,6 +608,7 @@ ask_revocation_reason( int key_rev, int const char *code_text = NULL; do { + code=-1; m_free(description); description = NULL; @@ -635,7 +636,7 @@ ask_revocation_reason( int key_rev, int return NULL; /* cancel */ if( hint && !*answer ) n = hint; - else if(!isdigit( *answer ) ) + else if(!digitp( answer ) ) n = -1; else n = atoi(answer); diff -urpP gnupg-1.2.2/g10/sig-check.c gnupg-1.2.3/g10/sig-check.c --- gnupg-1.2.2/g10/sig-check.c 2003-04-29 07:25:43.000000000 +0000 +++ gnupg-1.2.3/g10/sig-check.c 2003-08-21 16:06:47.000000000 +0000 @@ -1,5 +1,6 @@ /* sig-check.c - Check a signature - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + * Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -40,7 +41,7 @@ struct cmp_help_context_s { }; static int do_check( PKT_public_key *pk, PKT_signature *sig, - MD_HANDLE digest, int *r_expired ); + MD_HANDLE digest, int *r_expired, int *r_revoked ); /**************** * Check the signature which is contained in SIG. @@ -50,20 +51,16 @@ static int do_check( PKT_public_key *pk, int signature_check( PKT_signature *sig, MD_HANDLE digest ) { - u32 dummy; - int dum2; - return signature_check2( sig, digest, &dummy, &dum2 ); + return signature_check2( sig, digest, NULL, NULL, NULL ); } int signature_check2( PKT_signature *sig, MD_HANDLE digest, - u32 *r_expiredate, int *r_expired ) + u32 *r_expiredate, int *r_expired, int *r_revoked ) { PKT_public_key *pk = m_alloc_clear( sizeof *pk ); int rc=0; - *r_expiredate = 0; - /* Sanity check that the md has a context for the hash that the sig is expecting. This can happen if a onepass sig header does not match the actual sig, and also if the clearsign "Hash:" @@ -79,8 +76,9 @@ signature_check2( PKT_signature *sig, MD rc=G10ERR_BAD_PUBKEY; /* you cannot have a good sig from an invalid subkey */ else { - *r_expiredate = pk->expiredate; - rc = do_check( pk, sig, digest, r_expired ); + if(r_expiredate) + *r_expiredate = pk->expiredate; + rc = do_check( pk, sig, digest, r_expired, r_revoked ); } free_public_key( pk ); @@ -135,7 +133,7 @@ signature_check2( PKT_signature *sig, MD static int cmp_help( void *opaque, MPI result ) { - #if 0 /* we do not use this anymore */ +#if 0 /* we do not use this anymore */ int rc=0, i, j, c, old_enc; byte *dp; const byte *asn; @@ -198,17 +196,21 @@ cmp_help( void *opaque, MPI result ) return G10ERR_BAD_SIGN; } return 0; - #else +#else return -1; - #endif +#endif } static int -do_check_messages( PKT_public_key *pk, PKT_signature *sig, int *r_expired ) +do_check_messages( PKT_public_key *pk, PKT_signature *sig, + int *r_expired, int *r_revoked ) { u32 cur_time; - *r_expired = 0; + if(r_expired) + *r_expired = 0; + if(r_revoked) + *r_revoked = 0; if( pk->version == 4 && pk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) { log_info(_("key %08lX: this is a PGP generated " "ElGamal key which is NOT secure for signatures!\n"), @@ -251,22 +253,26 @@ do_check_messages( PKT_public_key *pk, P sprintf(buf,"%lu",(ulong)pk->expiredate); write_status_text(STATUS_KEYEXPIRED,buf); write_status(STATUS_SIGEXPIRED); - *r_expired = 1; + if(r_expired) + *r_expired = 1; } + if(pk->is_revoked && r_revoked) + *r_revoked=1; + return 0; } static int do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest, - int *r_expired ) + int *r_expired, int *r_revoked ) { MPI result = NULL; int rc=0; struct cmp_help_context_s ctx; - if( (rc=do_check_messages(pk,sig,r_expired)) ) + if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) ) return rc; if( (rc=check_digest_algo(sig->digest_algo)) ) return rc; @@ -473,13 +479,13 @@ check_revocation_keys(PKT_public_key *pk int check_key_signature( KBNODE root, KBNODE node, int *is_selfsig ) { - u32 dummy; - int dum2; - return check_key_signature2(root, node, NULL, is_selfsig, &dummy, &dum2 ); + return check_key_signature2(root, node, NULL, is_selfsig, NULL, NULL ); } /* If check_pk is set, then use it to check the signature in node rather than getting it from root or the keydb. */ +/* TODO: add r_revoked here as well. It has the same problems as + r_expiredate and r_expired and the cache. */ int check_key_signature2( KBNODE root, KBNODE node, PKT_public_key *check_pk, int *is_selfsig, u32 *r_expiredate, int *r_expired ) @@ -492,8 +498,10 @@ check_key_signature2( KBNODE root, KBNOD if( is_selfsig ) *is_selfsig = 0; - *r_expiredate = 0; - *r_expired = 0; + if( r_expiredate ) + *r_expiredate = 0; + if( r_expired ) + *r_expired = 0; assert( node->pkt->pkttype == PKT_SIGNATURE ); assert( root->pkt->pkttype == PKT_PUBLIC_KEY ); @@ -511,7 +519,9 @@ check_key_signature2( KBNODE root, KBNOD if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) *is_selfsig = 1; } - if((rc=do_check_messages(pk,sig,r_expired))) + /* BUG: This is wrong for non-self-sigs.. needs to be the + actual pk */ + if((rc=do_check_messages(pk,sig,r_expired,NULL))) return rc; return sig->flags.valid? 0 : G10ERR_BAD_SIGN; } @@ -531,7 +541,7 @@ check_key_signature2( KBNODE root, KBNOD { md = md_open( algo, 0 ); hash_public_key( md, pk ); - rc = do_check( pk, sig, md, r_expired ); + rc = do_check( pk, sig, md, r_expired, NULL ); cache_sig_result ( sig, rc ); md_close(md); } @@ -543,12 +553,12 @@ check_key_signature2( KBNODE root, KBNOD md = md_open( algo, 0 ); hash_public_key( md, pk ); hash_public_key( md, snode->pkt->pkt.public_key ); - rc = do_check( pk, sig, md, r_expired ); + rc = do_check( pk, sig, md, r_expired, NULL ); cache_sig_result ( sig, rc ); md_close(md); } else { - if (!opt.quiet) + if (opt.verbose) log_info (_("key %08lX: no subkey for subkey " "revocation packet\n"), (ulong)keyid_from_pk (pk, NULL)); @@ -569,21 +579,22 @@ check_key_signature2( KBNODE root, KBNOD md = md_open( algo, 0 ); hash_public_key( md, pk ); hash_public_key( md, snode->pkt->pkt.public_key ); - rc = do_check( pk, sig, md, r_expired ); + rc = do_check( pk, sig, md, r_expired, NULL ); cache_sig_result ( sig, rc ); md_close(md); } else { if (opt.verbose) - log_info ("key %08lX: no subkey for subkey binding packet\n", - (ulong)keyid_from_pk (pk, NULL)); + log_info(_("key %08lX: no subkey for subkey " + "binding signature\n"), + (ulong)keyid_from_pk (pk, NULL)); rc = G10ERR_SIG_CLASS; } } else if( sig->sig_class == 0x1f ) { /* direct key signature */ md = md_open( algo, 0 ); hash_public_key( md, pk ); - rc = do_check( pk, sig, md, r_expired ); + rc = do_check( pk, sig, md, r_expired, NULL ); cache_sig_result ( sig, rc ); md_close(md); } @@ -601,12 +612,12 @@ check_key_signature2( KBNODE root, KBNOD { if( is_selfsig ) *is_selfsig = 1; - rc = do_check( pk, sig, md, r_expired ); + rc = do_check( pk, sig, md, r_expired, NULL ); } else if (check_pk) - rc=do_check(check_pk,sig,md,r_expired); + rc=do_check(check_pk,sig,md,r_expired,NULL); else - rc = signature_check2( sig, md, r_expiredate, r_expired ); + rc = signature_check2( sig, md, r_expiredate, r_expired, NULL ); cache_sig_result ( sig, rc ); md_close(md); diff -urpP gnupg-1.2.2/g10/sign.c gnupg-1.2.3/g10/sign.c --- gnupg-1.2.2/g10/sign.c 2003-04-29 07:19:17.000000000 +0000 +++ gnupg-1.2.3/g10/sign.c 2003-08-21 16:06:47.000000000 +0000 @@ -1,5 +1,6 @@ /* sign.c - sign data - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -42,11 +43,11 @@ #ifdef HAVE_DOSISH_SYSTEM - #define LF "\r\n" - void __stdcall Sleep(ulong); - #define sleep(a) Sleep((a)*1000) +#define LF "\r\n" +void __stdcall Sleep(ulong); +#define sleep(a) Sleep((a)*1000) #else - #define LF "\n" +#define LF "\n" #endif static int recipient_digest_algo=0; @@ -71,20 +72,25 @@ mk_notation_and_policy( PKT_signature *s args.pk=pk; args.sk=sk; + /* It is actually impossible to get here when making a v3 key + signature since keyedit.c:sign_uids will automatically bump a + signature with a notation or policy url up to v4, but it is + good to do these checks anyway. */ + /* notation data */ if(IS_SIG(sig) && opt.sig_notation_data) { if(sig->version<4) - log_info(_("can't put notation data into v3 (PGP 2.x style) " - "signatures\n")); + log_error(_("can't put notation data into v3 (PGP 2.x style) " + "signatures\n")); else nd=opt.sig_notation_data; } else if( IS_CERT(sig) && opt.cert_notation_data ) { if(sig->version<4) - log_info(_("can't put notation data into v3 (PGP 2.x style) " - "key signatures\n")); + log_error(_("can't put notation data into v3 (PGP 2.x style) " + "key signatures\n")); else nd=opt.cert_notation_data; } @@ -124,23 +130,20 @@ mk_notation_and_policy( PKT_signature *s m_free(buf); } - if(opt.show_notation) - show_notation(sig,0); - /* set policy URL */ if( IS_SIG(sig) && opt.sig_policy_url ) { if(sig->version<4) - log_info(_("can't put a policy URL into v3 (PGP 2.x style) " - "signatures\n")); + log_error(_("can't put a policy URL into v3 (PGP 2.x style) " + "signatures\n")); else pu=opt.sig_policy_url; } else if( IS_CERT(sig) && opt.cert_policy_url ) { if(sig->version<4) - log_info(_("can't put a policy URL into v3 key (PGP 2.x style) " - "signatures\n")); + log_error(_("can't put a policy URL into v3 key (PGP 2.x style) " + "signatures\n")); else pu=opt.cert_policy_url; } @@ -163,9 +166,6 @@ mk_notation_and_policy( PKT_signature *s m_free(s); } - - if(opt.show_policy_url) - show_policy_url(sig,0); } @@ -460,7 +460,7 @@ write_plaintext_packet (IOBUF out, IOBUF } /* try to calculate the length of the data */ - if (fname) { + if (fname && *fname && !(*fname=='-' && !fname[1])) { if( !(filesize = iobuf_get_filelength(inp)) ) log_info (_("WARNING: `%s' is an empty file\n"), fname); @@ -487,7 +487,7 @@ write_plaintext_packet (IOBUF out, IOBUF pt->timestamp = make_timestamp (); pt->mode = ptmode; pt->len = filesize; - pt->new_ctb = !pt->len && !opt.rfc1991; + pt->new_ctb = !pt->len && !RFC1991; pt->buf = inp; init_packet(&pkt); pkt.pkttype = PKT_PLAINTEXT; @@ -538,7 +538,7 @@ write_signature_packets (SK_LIST sk_list /* build the signature packet */ sig = m_alloc_clear (sizeof *sig); - if(opt.force_v3_sigs || opt.rfc1991) + if(opt.force_v3_sigs || RFC1991) sig->version=3; else if(duration || opt.sig_policy_url || opt.sig_notation_data) sig->version=4; @@ -637,18 +637,17 @@ sign_file( STRLIST filenames, int detach if( fname && filenames->next && (!detached || encryptflag) ) log_bug("multiple files can only be detached signed"); - if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !opt.rfc1991) + if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !RFC1991) duration=ask_expire_interval(1); if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) ) goto leave; - if(opt.pgp2 && !only_old_style(sk_list)) + if(PGP2 && !only_old_style(sk_list)) { log_info(_("you can only detach-sign with PGP 2.x style keys " "while in --pgp2 mode\n")); - log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); - opt.pgp2=0; + compliance_failure(); } if(encryptflag && (rc=build_pk_list( remusr, &pk_list, PUBKEY_USAGE_ENC ))) @@ -721,7 +720,8 @@ sign_file( STRLIST filenames, int detach hashlen=20; if((algo= - select_algo_from_prefs(pk_list,PREFTYPE_HASH,-1,&hashlen))>0) + select_algo_from_prefs(pk_list,PREFTYPE_HASH,-1, + hashlen?&hashlen:NULL))>0) recipient_digest_algo=algo; } } @@ -734,7 +734,7 @@ sign_file( STRLIST filenames, int detach if( !multifile ) iobuf_push_filter( inp, md_filter, &mfx ); - if( detached && !encryptflag && !opt.rfc1991 ) + if( detached && !encryptflag && !RFC1991 ) afx.what = 2; if( opt.armor && !outfile ) @@ -764,9 +764,9 @@ sign_file( STRLIST filenames, int detach select_algo_from_prefs(pk_list,PREFTYPE_ZIP,-1,NULL))==-1) compr_algo=DEFAULT_COMPRESS_ALGO; } - else if(!opt.expert && - select_algo_from_prefs(pk_list,PREFTYPE_ZIP, - compr_algo,NULL)!=compr_algo) + else if(!opt.expert && pk_list + && select_algo_from_prefs(pk_list,PREFTYPE_ZIP, + compr_algo,NULL)!=compr_algo) log_info(_("forcing compression algorithm %s (%d) " "violates recipient preferences\n"), compress_algo_to_string(compr_algo),compr_algo); @@ -780,7 +780,7 @@ sign_file( STRLIST filenames, int detach } /* Write the one-pass signature packets if needed */ - if (!detached && !opt.rfc1991) { + if (!detached && !RFC1991) { rc = write_onepass_sig_packets (sk_list, out, opt.textmode && !outfile ? 0x01:0x00); if (rc) @@ -874,14 +874,14 @@ clearsign_file( const char *fname, STRLI int rc = 0; SK_LIST sk_list = NULL; SK_LIST sk_rover = NULL; - int old_style = opt.rfc1991; + int old_style = RFC1991; int only_md5 = 0; u32 duration=0; memset( &afx, 0, sizeof afx); init_packet( &pkt ); - if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !opt.rfc1991) + if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !RFC1991) duration=ask_expire_interval(1); if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) ) @@ -890,12 +890,11 @@ clearsign_file( const char *fname, STRLI if( !old_style && !duration ) old_style = only_old_style( sk_list ); - if(!old_style && opt.pgp2) + if(PGP2 && !only_old_style(sk_list)) { log_info(_("you can only clearsign with PGP 2.x style keys " "while in --pgp2 mode\n")); - log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); - opt.pgp2=0; + compliance_failure(); } /* prepare iobufs */ @@ -1022,7 +1021,7 @@ sign_symencrypt_file (const char *fname, memset( &cfx, 0, sizeof cfx); init_packet( &pkt ); - if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !opt.rfc1991) + if(opt.ask_sig_expire && !opt.force_v3_sigs && !opt.batch && !RFC1991) duration=ask_expire_interval(1); rc = build_sk_list (locusr, &sk_list, 1, PUBKEY_USAGE_SIG); @@ -1041,7 +1040,7 @@ sign_symencrypt_file (const char *fname, /* prepare key */ s2k = m_alloc_clear( sizeof *s2k ); - s2k->mode = opt.rfc1991? 0:opt.s2k_mode; + s2k->mode = RFC1991? 0:opt.s2k_mode; s2k->hash_algo = opt.def_digest_algo ? opt.def_digest_algo : opt.s2k_digest_algo; @@ -1080,7 +1079,7 @@ sign_symencrypt_file (const char *fname, /* Write the symmetric key packet */ /*(current filters: armor)*/ - if (!opt.rfc1991) { + if (!RFC1991) { PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc ); enc->version = 4; enc->cipher_algo = cfx.dek->algo; @@ -1113,7 +1112,7 @@ sign_symencrypt_file (const char *fname, /* Write the one-pass signature packets */ /*(current filters: zip - encrypt - armor)*/ - if (!opt.rfc1991) { + if (!RFC1991) { rc = write_onepass_sig_packets (sk_list, out, opt.textmode? 0x01:0x00); if (rc) diff -urpP gnupg-1.2.2/g10/signal.c gnupg-1.2.3/g10/signal.c --- gnupg-1.2.2/g10/signal.c 2002-06-29 13:46:34.000000000 +0000 +++ gnupg-1.2.3/g10/signal.c 2003-07-28 18:34:41.000000000 +0000 @@ -1,5 +1,5 @@ /* signal.c - signal handling - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -34,15 +34,14 @@ #include "main.h" #include "ttyio.h" - static volatile int caught_fatal_sig = 0; static volatile int caught_sigusr1 = 0; static void init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign ) { - #ifndef HAVE_DOSISH_SYSTEM - #ifdef HAVE_SIGACTION +#ifndef HAVE_DOSISH_SYSTEM +#if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION) struct sigaction oact, nact; if (check_ign) { @@ -56,7 +55,7 @@ init_one_signal (int sig, RETSIGTYPE (*h sigemptyset (&nact.sa_mask); nact.sa_flags = 0; sigaction ( sig, &nact, NULL); - #else +#else RETSIGTYPE (*ohandler)(int); ohandler = signal (sig, handler); @@ -64,18 +63,18 @@ init_one_signal (int sig, RETSIGTYPE (*h /* Change it back if it was already set to IGN */ signal (sig, SIG_IGN); } - #endif - #endif /*!HAVE_DOSISH_SYSTEM*/ +#endif +#endif /*!HAVE_DOSISH_SYSTEM*/ } static const char * get_signal_name( int signum ) { - #if defined(SYS_SIGLIST_DECLARED) && defined(NSIG) +#if defined(SYS_SIGLIST_DECLARED) && defined(NSIG) return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?"; - #else +#else return "some signal"; - #endif +#endif } @@ -116,7 +115,7 @@ got_usr_signal( int sig ) void init_signals() { - #ifndef HAVE_DOSISH_SYSTEM +#ifndef HAVE_DOSISH_SYSTEM init_one_signal (SIGINT, got_fatal_signal, 1 ); init_one_signal (SIGHUP, got_fatal_signal, 1 ); init_one_signal (SIGTERM, got_fatal_signal, 1 ); @@ -124,15 +123,15 @@ init_signals() init_one_signal (SIGSEGV, got_fatal_signal, 1 ); init_one_signal (SIGUSR1, got_usr_signal, 0 ); init_one_signal (SIGPIPE, SIG_IGN, 0 ); - #endif +#endif } void pause_on_sigusr( int which ) { - #ifndef HAVE_DOSISH_SYSTEM - #ifdef HAVE_SIGPROCMASK +#ifndef HAVE_DOSISH_SYSTEM +#if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T) sigset_t mask, oldmask; assert( which == 1 ); @@ -144,24 +143,25 @@ pause_on_sigusr( int which ) sigsuspend( &oldmask ); caught_sigusr1 = 0; sigprocmask( SIG_UNBLOCK, &mask, NULL ); - #else +#else assert (which == 1); sighold (SIGUSR1); while (!caught_sigusr1) sigpause(SIGUSR1); caught_sigusr1 = 0; - sigrelse(SIGUSR1); ???? - #endif /*!HAVE_SIGPROCMASK*/ - #endif + sigrelse(SIGUSR1); +#endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */ +#endif } - +/* Disabled - see comment in tdbio.c:tdbio_begin_transaction() */ +#if 0 static void do_block( int block ) { - #ifndef HAVE_DOSISH_SYSTEM +#ifndef HAVE_DOSISH_SYSTEM static int is_blocked; - #ifdef HAVE_SIGPROCMASK +#if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T) static sigset_t oldmask; if( block ) { @@ -179,14 +179,23 @@ do_block( int block ) sigprocmask( SIG_SETMASK, &oldmask, NULL ); is_blocked = 0; } - #else /*!HAVE_SIGPROCMASK*/ - static void (*disposition[MAXSIG])(); +#else /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */ + +#if defined(NSIG) +#define SIGSMAX (NSIG) +#elif defined(MAXSIG) +#define SIGSMAX (MAXSIG+1) +#else +#error "define SIGSMAX to the number of signals on your platform plus one" +#endif + + static void (*disposition[SIGSMAX])(int); int sig; if( block ) { if( is_blocked ) log_bug("signals are already blocked\n"); - for (sig=1; sig < MAXSIG; sig++) { + for (sig=1; sig < SIGSMAX; sig++) { disposition[sig] = sigset (sig, SIG_HOLD); } is_blocked = 1; @@ -194,16 +203,15 @@ do_block( int block ) else { if( !is_blocked ) log_bug("signals are not blocked\n"); - for (sig=1; sig < MAXSIG; sig++) { + for (sig=1; sig < SIGSMAX; sig++) { sigset (sig, disposition[sig]); } is_blocked = 0; } - #endif /*!HAVE_SIGPROCMASK*/ - #endif /*HAVE_DOSISH_SYSTEM*/ +#endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */ +#endif /*HAVE_DOSISH_SYSTEM*/ } - void block_all_signals() { @@ -215,3 +223,4 @@ unblock_all_signals() { do_block(0); } +#endif diff -urpP gnupg-1.2.2/g10/status.c gnupg-1.2.3/g10/status.c --- gnupg-1.2.2/g10/status.c 2003-04-08 08:38:00.000000000 +0000 +++ gnupg-1.2.3/g10/status.c 2003-07-28 18:34:41.000000000 +0000 @@ -26,19 +26,19 @@ #include #include #ifdef USE_SHM_COPROCESSING - #ifdef USE_CAPABILITIES - #include - #endif - #ifdef HAVE_SYS_IPC_H - #include - #include - #endif - #ifdef HAVE_SYS_SHM_H - #include - #endif - #if defined(HAVE_MLOCK) - #include - #endif +#ifdef USE_CAPABILITIES +#include +#endif +#ifdef HAVE_SYS_IPC_H +#include +#include +#endif +#ifdef HAVE_SYS_SHM_H +#include +#endif +#if defined(HAVE_MLOCK) +#include +#endif #endif #include "util.h" #include "status.h" @@ -148,6 +148,7 @@ get_status_string ( int no ) case STATUS_SIGEXPIRED : s = "SIGEXPIRED deprecated-use-keyexpired-instead"; break; case STATUS_EXPSIG : s = "EXPSIG"; break; case STATUS_EXPKEYSIG : s = "EXPKEYSIG"; break; + case STATUS_REVKEYSIG : s = "REVKEYSIG"; break; case STATUS_ATTRIBUTE : s = "ATTRIBUTE"; break; default: s = "?"; break; } @@ -310,9 +311,9 @@ init_shm_coprocessing ( ulong requested_ char buf[100]; struct shmid_ds shmds; - #ifndef IPC_RMID_DEFERRED_RELEASE +#ifndef IPC_RMID_DEFERRED_RELEASE atexit( remove_shmid ); - #endif +#endif requested_shm_size = (requested_shm_size + 4095) & ~4095; if ( requested_shm_size > 2 * 4096 ) log_fatal("too much shared memory requested; only 8k are allowed\n"); @@ -323,7 +324,7 @@ init_shm_coprocessing ( ulong requested_ log_fatal("can't get %uk of shared memory: %s\n", (unsigned)shm_size/1024, strerror(errno)); - #if !defined(IPC_HAVE_SHM_LOCK) \ +#if !defined(IPC_HAVE_SHM_LOCK) \ && defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK) /* part of the old code which uses mlock */ shm_area = shmat( shm_id, 0, 0 ); @@ -333,25 +334,25 @@ init_shm_coprocessing ( ulong requested_ log_debug("mapped %uk shared memory at %p, id=%d\n", (unsigned)shm_size/1024, shm_area, shm_id ); if( lock_mem ) { - #ifdef USE_CAPABILITIES +#ifdef USE_CAPABILITIES cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); - #endif +#endif /* (need the cast for Solaris with Sun's workshop compilers) */ if ( mlock ( (char*)shm_area, shm_size) ) log_info("locking shared memory %d failed: %s\n", shm_id, strerror(errno)); else shm_is_locked = 1; - #ifdef USE_CAPABILITIES +#ifdef USE_CAPABILITIES cap_set_proc( cap_from_text("cap_ipc_lock+p") ); - #endif +#endif } - #ifdef IPC_RMID_DEFERRED_RELEASE +#ifdef IPC_RMID_DEFERRED_RELEASE if( shmctl( shm_id, IPC_RMID, 0) ) log_fatal("shmctl IPC_RMDID of %d failed: %s\n", shm_id, strerror(errno)); - #endif +#endif if( shmctl( shm_id, IPC_STAT, &shmds ) ) log_fatal("shmctl IPC_STAT of %d failed: %s\n", @@ -363,27 +364,27 @@ init_shm_coprocessing ( ulong requested_ shm_id, strerror(errno)); } - #else /* this is the new code which handles the changes in the SHM semantics - * introduced with Linux 2.4. The changes is that we now change the - * permissions and then attach to the memory. - */ +#else /* this is the new code which handles the changes in the SHM + * semantics introduced with Linux 2.4. The changes is that we + * now change the permissions and then attach to the memory. + */ if( lock_mem ) { - #ifdef USE_CAPABILITIES +#ifdef USE_CAPABILITIES cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); - #endif - #ifdef IPC_HAVE_SHM_LOCK +#endif +#ifdef IPC_HAVE_SHM_LOCK if ( shmctl (shm_id, SHM_LOCK, 0) ) log_info("locking shared memory %d failed: %s\n", shm_id, strerror(errno)); else shm_is_locked = 1; - #else +#else log_info("Locking shared memory %d failed: No way to do it\n", shm_id ); - #endif - #ifdef USE_CAPABILITIES +#endif +#ifdef USE_CAPABILITIES cap_set_proc( cap_from_text("cap_ipc_lock+p") ); - #endif +#endif } if( shmctl( shm_id, IPC_STAT, &shmds ) ) @@ -403,13 +404,13 @@ init_shm_coprocessing ( ulong requested_ log_debug("mapped %uk shared memory at %p, id=%d\n", (unsigned)shm_size/1024, shm_area, shm_id ); - #ifdef IPC_RMID_DEFERRED_RELEASE +#ifdef IPC_RMID_DEFERRED_RELEASE if( shmctl( shm_id, IPC_RMID, 0) ) log_fatal("shmctl IPC_RMDID of %d failed: %s\n", shm_id, strerror(errno)); - #endif +#endif - #endif +#endif /* write info; Protocol version, id, size, locked size */ sprintf( buf, "pv=1 pid=%d shmid=%d sz=%u lz=%u", (int)getpid(), shm_id, (unsigned)shm_size, shm_is_locked? (unsigned)shm_size:0 ); @@ -479,11 +480,11 @@ myread(int fd, void *buf, size_t count) eof_emmited++; } else { /* Ctrl-D not caught - do something reasonable */ - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM raise (SIGINT); /* nothing to hangup under DOS */ - #else +#else raise (SIGHUP); /* no more input data */ - #endif +#endif } } return rc; @@ -541,10 +542,10 @@ cpr_enabled() { if( opt.command_fd != -1 ) return 1; - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING if( opt.shm_coprocess ) return 1; - #endif +#endif return 0; } @@ -555,10 +556,10 @@ cpr_get_no_help( const char *keyword, co if( opt.command_fd != -1 ) return do_get_from_fd ( keyword, 0, 0 ); - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING if( opt.shm_coprocess ) return do_shm_get( keyword, 0, 0 ); - #endif +#endif for(;;) { p = tty_get( prompt ); return p; @@ -572,10 +573,10 @@ cpr_get( const char *keyword, const char if( opt.command_fd != -1 ) return do_get_from_fd ( keyword, 0, 0 ); - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING if( opt.shm_coprocess ) return do_shm_get( keyword, 0, 0 ); - #endif +#endif for(;;) { p = tty_get( prompt ); if( *p=='?' && !p[1] && !(keyword && !*keyword)) { @@ -608,10 +609,10 @@ cpr_get_hidden( const char *keyword, con if( opt.command_fd != -1 ) return do_get_from_fd ( keyword, 1, 0 ); - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING if( opt.shm_coprocess ) return do_shm_get( keyword, 1, 0 ); - #endif +#endif for(;;) { p = tty_get_hidden( prompt ); if( *p == '?' && !p[1] ) { @@ -628,10 +629,10 @@ cpr_kill_prompt(void) { if( opt.command_fd != -1 ) return; - #ifdef USE_SHM_COPROCESSING +#ifdef USE_SHM_COPROCESSING if( opt.shm_coprocess ) return; - #endif +#endif tty_kill_prompt(); return; } @@ -691,4 +692,3 @@ cpr_get_answer_yes_no_quit( const char * } } } - diff -urpP gnupg-1.2.2/g10/status.h gnupg-1.2.3/g10/status.h --- gnupg-1.2.2/g10/status.h 2003-03-06 09:43:52.000000000 +0000 +++ gnupg-1.2.3/g10/status.h 2003-07-28 18:34:41.000000000 +0000 @@ -99,6 +99,7 @@ #define STATUS_ATTRIBUTE 67 #define STATUS_IMPORT_OK 68 #define STATUS_IMPORT_CHECK 69 +#define STATUS_REVKEYSIG 70 /*-- status.c --*/ void set_status_fd ( int fd ); diff -urpP gnupg-1.2.2/g10/tdbdump.c gnupg-1.2.3/g10/tdbdump.c --- gnupg-1.2.2/g10/tdbdump.c 2002-06-29 13:46:34.000000000 +0000 +++ gnupg-1.2.3/g10/tdbdump.c 2003-06-07 18:42:43.000000000 +0000 @@ -153,7 +153,7 @@ import_ownertrust( const char *fname ) break; /* can't continue */ } for(p = line; *p && *p != ':' ; p++ ) - if( !isxdigit(*p) ) + if( !hexdigitp(p) ) break; if( *p != ':' ) { log_error_f(fname, _("error: missing colon\n") ); diff -urpP gnupg-1.2.2/g10/tdbio.c gnupg-1.2.3/g10/tdbio.c --- gnupg-1.2.2/g10/tdbio.c 2003-01-14 09:01:19.000000000 +0000 +++ gnupg-1.2.3/g10/tdbio.c 2003-07-28 18:34:41.000000000 +0000 @@ -332,7 +332,9 @@ tdbio_sync() return 0; } - +#if 0 +/* The transaction code is disabled in the 1.2.x branch, as it is not + yet used. It will be enabled in 1.3.x. */ /**************** * Simple transactions system: @@ -402,7 +404,7 @@ tdbio_cancel_transaction() in_transaction = 0; return 0; } - +#endif /******************************************************** @@ -430,6 +432,7 @@ create_version_record (void) rec.r.ver.marginals = opt.marginals_needed; rec.r.ver.completes = opt.completes_needed; rec.r.ver.cert_depth = opt.max_cert_depth; + rec.r.ver.trust_model= 0; rec.rectype = RECTYPE_VER; rec.recnum = 0; rc = tdbio_write_record( &rec ); @@ -685,10 +688,16 @@ tdbio_write_nextcheck (ulong stamp) log_fatal( _("%s: error reading version record: %s\n"), db_name, g10_errstr(rc) ); - if (vr.r.ver.nextcheck == stamp) + if (vr.r.ver.nextcheck == stamp && vr.r.ver.trust_model == 0) return 0; vr.r.ver.nextcheck = stamp; + /* Force this to the classic trustdb since that is what we are + building. This is to help smooth the 1.2->1.4 switchover, as + otherwise a 1.4 trustdb could be rebuilt as classic on 1.2 + while still claiming to be a non-classic trust model. */ + vr.r.ver.trust_model = 0; + rc = tdbio_write_record( &vr ); if( rc ) log_fatal( _("%s: error writing version record: %s\n"), @@ -1167,10 +1176,8 @@ tdbio_read_record( ulong recnum, TRUSTRE rec->r.ver.marginals = *p++; rec->r.ver.completes = *p++; rec->r.ver.cert_depth = *p++; - /* Warning - one byte of this is used in the devel version. - If you change this, make sure to consult the same code in - devel. */ - p += 4; /* lock flags */ + rec->r.ver.trust_model = *p++; + p += 3; rec->r.ver.created = buftoulong(p); p += 4; rec->r.ver.nextcheck = buftoulong(p); p += 4; p += 4; @@ -1255,10 +1262,8 @@ tdbio_write_record( TRUSTREC *rec ) *p++ = rec->r.ver.marginals; *p++ = rec->r.ver.completes; *p++ = rec->r.ver.cert_depth; - /* Warning - one byte of this is used in the devel version. - If you change this, make sure to consult the same code in - devel. */ - p += 4; /* skip lock flags */ + *p++ = rec->r.ver.trust_model; + p += 3; ulongtobuf(p, rec->r.ver.created); p += 4; ulongtobuf(p, rec->r.ver.nextcheck); p += 4; p += 4; diff -urpP gnupg-1.2.2/g10/tdbio.h gnupg-1.2.3/g10/tdbio.h --- gnupg-1.2.2/g10/tdbio.h 2003-01-07 08:59:23.000000000 +0000 +++ gnupg-1.2.3/g10/tdbio.h 2003-07-28 18:34:41.000000000 +0000 @@ -29,7 +29,7 @@ #define ITEMS_PER_HLST_RECORD ((TRUST_RECORD_LEN-6)/5) #define ITEMS_PER_PREF_RECORD (TRUST_RECORD_LEN-10) #if ITEMS_PER_PREF_RECORD % 2 - #error ITEMS_PER_PREF_RECORD must be even +#error ITEMS_PER_PREF_RECORD must be even #endif #define MAX_LIST_SIGS_DEPTH 20 @@ -54,6 +54,7 @@ struct trust_record { byte marginals; byte completes; byte cert_depth; + byte trust_model; ulong created; /* timestamp of trustdb creation */ ulong nextcheck; /* timestamp of next scheduled check */ ulong reserved; diff -urpP gnupg-1.2.2/g10/textfilter.c gnupg-1.2.3/g10/textfilter.c --- gnupg-1.2.2/g10/textfilter.c 2002-06-29 13:46:34.000000000 +0000 +++ gnupg-1.2.3/g10/textfilter.c 2003-06-07 18:55:21.000000000 +0000 @@ -34,9 +34,9 @@ #include "options.h" #ifdef HAVE_DOSISH_SYSTEM - #define LF "\r\n" +#define LF "\r\n" #else - #define LF "\n" +#define LF "\n" #endif #define MAX_LINELEN 19995 /* a little bit smaller than in armor.c */ @@ -193,7 +193,7 @@ copy_clearsig_text( IOBUF out, IOBUF inp iobuf_put( out, ' ' ); } - #if 0 /*defined(HAVE_DOSISH_SYSTEM)*/ +#if 0 /*defined(HAVE_DOSISH_SYSTEM)*/ /* We don't use this anymore because my interpretation of rfc2440 7.1 * is that there is no conversion needed. If one decides to * clearsign a unix file on a DOS box he will get a mixed line endings. @@ -215,9 +215,9 @@ copy_clearsig_text( IOBUF out, IOBUF inp else iobuf_write( out, buffer, n ); - #else +#else iobuf_write( out, buffer, n ); - #endif +#endif } /* at eof */ @@ -232,4 +232,3 @@ copy_clearsig_text( IOBUF out, IOBUF inp return 0; /* okay */ } - diff -urpP gnupg-1.2.2/g10/trustdb.c gnupg-1.2.3/g10/trustdb.c --- gnupg-1.2.2/g10/trustdb.c 2003-05-01 11:02:18.000000000 +0000 +++ gnupg-1.2.3/g10/trustdb.c 2003-07-28 18:34:41.000000000 +0000 @@ -440,7 +440,6 @@ trust_letter (unsigned int value) } } - /**************** * Recreate the WoT but do not ask for new ownertrusts. Special * feature: In batch mode and without a forced yes, this is only done @@ -494,7 +493,24 @@ revalidation_mark (void) pending_check_trustdb = 1; } - +void +read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck) +{ + TRUSTREC opts; + + init_trustdb(); + + read_record(0,&opts,RECTYPE_VER); + + if(trust_model) + *trust_model=opts.r.ver.trust_model; + if(created) + *created=opts.r.ver.created; + if(nextcheck) + *nextcheck=opts.r.ver.nextcheck; +} + + /*********************************************** *********** Ownertrust et al. **************** ***********************************************/ @@ -745,23 +761,17 @@ clear_validity (PKT_public_key *pk) /* Return true if key is disabled */ int -is_disabled(void *dummy,u32 *keyid) +cache_disabled_value(PKT_public_key *pk) { int rc; TRUSTREC trec; - int disabled=0; /* default to not disabled */ - PKT_public_key *pk=m_alloc_clear(sizeof(PKT_public_key)); + int disabled=0; - init_trustdb (); + if(pk->is_disabled) + return (pk->is_disabled==2); + + init_trustdb(); - rc = get_pubkey(pk, keyid); - if(rc) - { - log_error("error checking disabled status of %08lX: %s\n", - (ulong)keyid[1],g10_errstr(rc)); - goto leave; - } - rc = read_trust_record (pk, &trec); if (rc && rc != -1) { @@ -774,9 +784,15 @@ is_disabled(void *dummy,u32 *keyid) if(trec.r.trust.ownertrust & TRUST_FLAG_DISABLED) disabled=1; + /* Cache it for later so we don't need to look at the trustdb every + time */ + if(disabled) + pk->is_disabled=2; + else + pk->is_disabled=1; + leave: - free_public_key(pk); - return disabled; + return disabled; } /* @@ -885,7 +901,12 @@ get_validity (PKT_public_key *pk, PKT_us } if ( (trec.r.trust.ownertrust & TRUST_FLAG_DISABLED) ) - validity |= TRUST_FLAG_DISABLED; + { + validity |= TRUST_FLAG_DISABLED; + pk->is_disabled=2; + } + else + pk->is_disabled=1; leave: /* set some flags direct from the key */ @@ -1324,10 +1345,14 @@ validate_one_keyblock (KBNODE kb, struct signed (but not self-signed) uid does carry trust, of a sort, even if it is a statement being made by people other than the key owner "through" the uids on the key owner's key. I'm - going with the latter. -dshaw */ + going with the latter. However, if the user ID was + explicitly revoked, or passively allowed to expire, that + should stop validity through the user ID until it is + resigned. -dshaw */ - /* && node->pkt->pkt.user_id->created) */ - if (node->pkt->pkttype == PKT_USER_ID) + if (node->pkt->pkttype == PKT_USER_ID + && !node->pkt->pkt.user_id->is_revoked + && !node->pkt->pkt.user_id->is_expired) { if (uidnode && issigned) { @@ -1341,12 +1366,11 @@ validate_one_keyblock (KBNODE kb, struct } uidnode = node; uid=uidnode->pkt->pkt.user_id; -#if 0 - /* If the selfsig is going to expire... This is disabled as - we do count un-self-signed uids in the web of trust. */ + + /* If the selfsig is going to expire... */ if(uid->expiredate && uid->expiredate<*next_expire) *next_expire = uid->expiredate; -#endif + issigned = 0; get_validity_counts(pk,uid); mark_usable_uid_certs (kb, uidnode, main_kid, klist, diff -urpP gnupg-1.2.2/g10/trustdb.h gnupg-1.2.3/g10/trustdb.h --- gnupg-1.2.2/g10/trustdb.h 2003-01-14 09:01:19.000000000 +0000 +++ gnupg-1.2.3/g10/trustdb.h 2003-07-28 18:34:41.000000000 +0000 @@ -48,7 +48,7 @@ void sync_trustdb( void ); void revalidation_mark (void); -int is_disabled(void *dummy,u32 *keyid); +int cache_disabled_value(PKT_public_key *pk); unsigned int get_validity (PKT_public_key *pk, PKT_user_id *uid); int get_validity_info (PKT_public_key *pk, PKT_user_id *uid); @@ -59,6 +59,8 @@ int enum_cert_paths( void **context, ulo void enum_cert_paths_print( void **context, FILE *fp, int refresh, ulong selected_lid ); +void read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck); + unsigned int get_ownertrust (PKT_public_key *pk); int get_ownertrust_info (PKT_public_key *pk); void update_ownertrust (PKT_public_key *pk, unsigned int new_trust ); diff -urpP gnupg-1.2.2/gnupg.spec gnupg-1.2.3/gnupg.spec --- gnupg-1.2.2/gnupg.spec 2003-05-01 14:39:14.000000000 +0000 +++ gnupg-1.2.3/gnupg.spec 2003-08-21 20:06:09.000000000 +0000 @@ -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.2.2 +%define version 1.2.3 %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. @@ -21,9 +21,17 @@ Group(it): Applicazioni/Crittografia Source: ftp://ftp.gnupg.org/gcrypt/gnupg/%{name}-%{version}.tar.gz URL: http://www.gnupg.org/ Provides: gpg openpgp -BuildRoot: /tmp/rpmbuild_%{name} +Requires(post,preun): /sbin/install-info +BuildRoot: %{_tmppath}/rpmbuild_%{name}-%{version} %changelog +* Wed Jul 30 2003 David Shaw +- Rework much of the spec to use %-macros throughout. +- Fix to work properly with RPM 4.1 (all files in buildroot must be packaged) +- Package and install info files. +- Tweak the English description. +- There is no need to install gpgv and gpgsplit setuid root. + * Sat Nov 30 2002 David Shaw - Add convert-from-106 script @@ -90,13 +98,16 @@ BuildRoot: /tmp/rpmbuild_%{name} - Updates for version 0.4.5 of GnuPG (.mo files) %description + GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and creating digital signatures. GnuPG has advanced key management capabilities and is compliant with the proposed OpenPGP Internet -standard described in RFC2440. Since GnuPG doesn't use any patented -algorithm, it is not compatible with any version of PGP2 (PGP2.x uses -only IDEA, patented worldwide, and RSA, which is patented in the US -until 9/20/00). +standard described in RFC-2440. Since GnuPG doesn't use any patented +algorithms, it is not compatible with some versions of PGP 2 which use +only the patented IDEA algorithm. See +http://www.gnupg.org/why-not-idea.html for information on using IDEA +if the patent does not apply to you and you need to be compatible with +these versions of PGP 2. %description -l it GnuPG (GNU Privacy Guard) è una utility GNU per la cifratura di dati e @@ -139,7 +150,6 @@ patent na terenie Stanów Zjednoczonych w %prep rm -rf $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup @@ -147,39 +157,43 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} if test -n "$LINGUAS"; then unset LINGUAS fi -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --enable-shared +%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} make %install -make install-strip prefix=$RPM_BUILD_ROOT/usr +%makeinstall +%find_lang %{name} +rm %{buildroot}%{_datadir}/%{name}/FAQ +rm %{buildroot}%{_datadir}/%{name}/faq.html +rm %{buildroot}%{_infodir}/dir -%files +%files -f %{name}.lang +%defattr (-,root,root) -%doc %attr (-,root,root) INSTALL -%doc %attr (-,root,root) AUTHORS -%doc %attr (-,root,root) COPYING -%doc %attr (-,root,root) ChangeLog -%doc %attr (-,root,root) NEWS -%doc %attr (-,root,root) README -%doc %attr (-,root,root) THANKS -%doc %attr (-,root,root) TODO -%doc %attr (-,root,root) PROJECTS -%doc %attr (-,root,root) doc/DETAILS -%doc %attr (-,root,root) doc/FAQ -%doc %attr (-,root,root) doc/faq.html -%doc %attr (-,root,root) doc/HACKING -%doc %attr (-,root,root) doc/OpenPGP -%doc %attr (-,root,root) doc/samplekeys.asc +%doc INSTALL AUTHORS COPYING NEWS README THANKS TODO PROJECTS doc/DETAILS +%doc doc/FAQ doc/faq.html doc/HACKING doc/OpenPGP doc/samplekeys.asc %doc %attr (0755,root,root) tools/convert-from-106 - -%attr (-,root,root) /usr/man/man1/gpg*.1* -%attr (-,root,root) /usr/man/man7/gnupg.7* -%attr (4755,root,root) /usr/bin/gpg -%attr (4755,root,root) /usr/bin/gpgv -%attr (4755,root,root) /usr/bin/gpgsplit -%attr (-,root,root) /usr/libexec/%{name} -%attr (-,root,root) /usr/share/locale/*/*/%{name}.mo -%config %attr (-,root,root) /usr/share/%{name}/options.skel +%config %{_datadir}/%{name}/options.skel +%{_mandir}/man1/* +%{_mandir}/man7/* +%{_infodir}/gpg.info* +%{_infodir}/gpgv.info* +%attr (4755,root,root) %{_bindir}/gpg +%attr (0755,root,root) %{_bindir}/gpgv +%attr (0755,root,root) %{_bindir}/gpgsplit +%attr (0755,root,root) %{_libexecdir}/* + +%post +/sbin/install-info %{_infodir}/gpg.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/gpgv.info %{_infodir}/dir 2>/dev/null || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/gpg.info \ + %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/gpgv.info \ + %{_infodir}/dir 2>/dev/null || : +fi %clean rm -rf $RPM_BUILD_ROOT diff -urpP gnupg-1.2.2/include/ChangeLog gnupg-1.2.3/include/ChangeLog --- gnupg-1.2.2/include/ChangeLog 2003-03-06 09:43:52.000000000 +0000 +++ gnupg-1.2.3/include/ChangeLog 2003-07-30 16:04:38.000000000 +0000 @@ -1,3 +1,36 @@ +2003-07-30 Werner Koch + + * util.h: Replaced some __MINGW32__ by _WIN32. + +2003-06-26 David Shaw + + * types.h: Prefer using uint64_t when creating a 64-bit unsigned + type. This avoids a warning on compilers that support but + complain about unsigned long long. + + * util.h (ascii_isspace): New variation on isspace() that is + immune from locale changes. + +2003-06-07 Werner Koch + + * util.h (hexdigitp,spacep,digitp): New. + +2003-05-21 David Shaw + + * cipher.h, i18n.h, iobuf.h, memory.h, mpi.h, types.h, util.h: + Edit all preprocessor instructions to remove whitespace before the + '#'. This is not required by C89, but there are some compilers + out there that don't like it. + +2003-05-09 David Shaw + + * types.h: Add typedef and initializer macro for 64-bit unsigned + type. + +2003-05-02 David Shaw + + * cipher.h: Add constants for compression algorithms. + 2003-02-04 David Shaw * cipher.h: Add constants for new SHAs. diff -urpP gnupg-1.2.2/include/cipher.h gnupg-1.2.3/include/cipher.h --- gnupg-1.2.2/include/cipher.h 2003-03-06 09:43:52.000000000 +0000 +++ gnupg-1.2.3/include/cipher.h 2003-06-07 18:55:22.000000000 +0000 @@ -63,6 +63,10 @@ #define DIGEST_ALGO_SHA384 9 #define DIGEST_ALGO_SHA512 10 +#define COMPRESS_ALGO_NONE 0 +#define COMPRESS_ALGO_ZIP 1 +#define COMPRESS_ALGO_ZLIB 2 + #define is_RSA(a) ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \ || (a)==PUBKEY_ALGO_RSA_S ) #define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL || (a)==PUBKEY_ALGO_ELGAMAL_E) @@ -101,11 +105,11 @@ struct gcry_md_context { typedef struct gcry_md_context *MD_HANDLE; #ifndef EXTERN_UNLESS_MAIN_MODULE - #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) - #define EXTERN_UNLESS_MAIN_MODULE extern - #else - #define EXTERN_UNLESS_MAIN_MODULE - #endif +#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +#define EXTERN_UNLESS_MAIN_MODULE extern +#else +#define EXTERN_UNLESS_MAIN_MODULE +#endif #endif EXTERN_UNLESS_MAIN_MODULE int g10c_debug_mode; EXTERN_UNLESS_MAIN_MODULE int g10_opt_verbose; diff -urpP gnupg-1.2.2/include/i18n.h gnupg-1.2.3/include/i18n.h --- gnupg-1.2.2/include/i18n.h 2002-06-29 13:26:17.000000000 +0000 +++ gnupg-1.2.3/include/i18n.h 2003-06-07 18:55:22.000000000 +0000 @@ -22,32 +22,32 @@ #define G10_I18N_H #ifdef USE_SIMPLE_GETTEXT - int set_gettext_file( const char *filename ); - const char *gettext( const char *msgid ); +int set_gettext_file( const char *filename ); +const char *gettext( const char *msgid ); - #define _(a) gettext (a) - #define N_(a) (a) +#define _(a) gettext (a) +#define N_(a) (a) #else #ifdef HAVE_LOCALE_H - #include /* suggested by Ernst Molitor */ +#include /* suggested by Ernst Molitor */ #endif #ifdef ENABLE_NLS #ifndef __riscos__ - #include +#include #else - #include "libgettext.h" +#include "libgettext.h" #endif /* __riscos__ */ - #define _(a) gettext (a) - #ifdef gettext_noop - #define N_(a) gettext_noop (a) - #else - #define N_(a) (a) - #endif +#define _(a) gettext (a) +#ifdef gettext_noop +#define N_(a) gettext_noop (a) #else - #define _(a) (a) - #define N_(a) (a) +#define N_(a) (a) +#endif +#else +#define _(a) (a) +#define N_(a) (a) #endif #endif /* !USE_SIMPLE_GETTEXT */ diff -urpP gnupg-1.2.2/include/iobuf.h gnupg-1.2.3/include/iobuf.h --- gnupg-1.2.2/include/iobuf.h 2002-06-29 13:26:17.000000000 +0000 +++ gnupg-1.2.3/include/iobuf.h 2003-06-07 18:55:22.000000000 +0000 @@ -72,11 +72,11 @@ struct iobuf_struct { }; #ifndef EXTERN_UNLESS_MAIN_MODULE - #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) - #define EXTERN_UNLESS_MAIN_MODULE extern - #else - #define EXTERN_UNLESS_MAIN_MODULE - #endif +#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +#define EXTERN_UNLESS_MAIN_MODULE extern +#else +#define EXTERN_UNLESS_MAIN_MODULE +#endif #endif EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode; diff -urpP gnupg-1.2.2/include/memory.h gnupg-1.2.3/include/memory.h --- gnupg-1.2.2/include/memory.h 2002-06-29 13:26:17.000000000 +0000 +++ gnupg-1.2.3/include/memory.h 2003-06-07 18:55:22.000000000 +0000 @@ -23,12 +23,12 @@ #ifdef M_DEBUG #ifndef STR - #define STR(v) #v +#define STR(v) #v #endif #ifndef __riscos__ - #define M_DBGINFO(a) __FUNCTION__ "["__FILE__ ":" STR(a) "]" +#define M_DBGINFO(a) __FUNCTION__ "["__FILE__ ":" STR(a) "]" #else /* __riscos__ */ - #define M_DBGINFO(a) "["__FILE__ ":" STR(a) "]" +#define M_DBGINFO(a) "["__FILE__ ":" STR(a) "]" #endif /* __riscos__ */ #define m_alloc(n) m_debug_alloc((n), M_DBGINFO( __LINE__ ) ) #define m_alloc_clear(n) m_debug_alloc_clear((n), M_DBGINFO(__LINE__) ) @@ -77,19 +77,17 @@ void secmem_set_flags( unsigned flags ); unsigned secmem_get_flags(void); - #define DBG_MEMORY memory_debug_mode #define DBG_MEMSTAT memory_stat_debug_mode #ifndef EXTERN_UNLESS_MAIN_MODULE - #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) - #define EXTERN_UNLESS_MAIN_MODULE extern - #else - #define EXTERN_UNLESS_MAIN_MODULE - #endif +#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +#define EXTERN_UNLESS_MAIN_MODULE extern +#else +#define EXTERN_UNLESS_MAIN_MODULE +#endif #endif EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode; EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; - #endif /*G10_MEMORY_H*/ diff -urpP gnupg-1.2.2/include/mpi.h gnupg-1.2.3/include/mpi.h --- gnupg-1.2.2/include/mpi.h 2002-09-11 07:28:42.000000000 +0000 +++ gnupg-1.2.3/include/mpi.h 2003-06-07 18:55:22.000000000 +0000 @@ -49,16 +49,16 @@ typedef unsigned short int mpi_limb_t; typedef signed short int mpi_limb_signed_t; #else - #error BYTES_PER_MPI_LIMB does not match any C type +#error BYTES_PER_MPI_LIMB does not match any C type #endif #define BITS_PER_MPI_LIMB (8*BYTES_PER_MPI_LIMB) #ifndef EXTERN_UNLESS_MAIN_MODULE - #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) - #define EXTERN_UNLESS_MAIN_MODULE extern - #else - #define EXTERN_UNLESS_MAIN_MODULE - #endif +#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +#define EXTERN_UNLESS_MAIN_MODULE extern +#else +#define EXTERN_UNLESS_MAIN_MODULE +#endif #endif #define DBG_MPI mpi_debug_mode @@ -86,25 +86,25 @@ typedef struct gcry_mpi *MPI; /*-- mpiutil.c --*/ #ifdef M_DEBUG - #define mpi_alloc(n) mpi_debug_alloc((n), M_DBGINFO( __LINE__ ) ) - #define mpi_alloc_secure(n) mpi_debug_alloc_secure((n), M_DBGINFO( __LINE__ ) ) - #define mpi_alloc_like(n) mpi_debug_alloc_like((n), M_DBGINFO( __LINE__ ) ) - #define mpi_free(a) mpi_debug_free((a), M_DBGINFO(__LINE__) ) - #define mpi_resize(a,b) mpi_debug_resize((a),(b), M_DBGINFO(__LINE__) ) - #define mpi_copy(a) mpi_debug_copy((a), M_DBGINFO(__LINE__) ) - MPI mpi_debug_alloc( unsigned nlimbs, const char *info ); - MPI mpi_debug_alloc_secure( unsigned nlimbs, const char *info ); - MPI mpi_debug_alloc_like( MPI a, const char *info ); - void mpi_debug_free( MPI a, const char *info ); - void mpi_debug_resize( MPI a, unsigned nlimbs, const char *info ); - MPI mpi_debug_copy( MPI a, const char *info ); +#define mpi_alloc(n) mpi_debug_alloc((n), M_DBGINFO( __LINE__ ) ) +#define mpi_alloc_secure(n) mpi_debug_alloc_secure((n), M_DBGINFO( __LINE__ ) ) +#define mpi_alloc_like(n) mpi_debug_alloc_like((n), M_DBGINFO( __LINE__ ) ) +#define mpi_free(a) mpi_debug_free((a), M_DBGINFO(__LINE__) ) +#define mpi_resize(a,b) mpi_debug_resize((a),(b), M_DBGINFO(__LINE__) ) +#define mpi_copy(a) mpi_debug_copy((a), M_DBGINFO(__LINE__) ) +MPI mpi_debug_alloc( unsigned nlimbs, const char *info ); +MPI mpi_debug_alloc_secure( unsigned nlimbs, const char *info ); +MPI mpi_debug_alloc_like( MPI a, const char *info ); +void mpi_debug_free( MPI a, const char *info ); +void mpi_debug_resize( MPI a, unsigned nlimbs, const char *info ); +MPI mpi_debug_copy( MPI a, const char *info ); #else - MPI mpi_alloc( unsigned nlimbs ); - MPI mpi_alloc_secure( unsigned nlimbs ); - MPI mpi_alloc_like( MPI a ); - void mpi_free( MPI a ); - void mpi_resize( MPI a, unsigned nlimbs ); - MPI mpi_copy( MPI a ); +MPI mpi_alloc( unsigned nlimbs ); +MPI mpi_alloc_secure( unsigned nlimbs ); +MPI mpi_alloc_like( MPI a ); +void mpi_free( MPI a ); +void mpi_resize( MPI a, unsigned nlimbs ); +MPI mpi_copy( MPI a ); #endif #define mpi_is_opaque(a) ((a) && ((a)->flags&4)) MPI mpi_set_opaque( MPI a, void *p, int len ); @@ -121,10 +121,10 @@ void mpi_swap( MPI a, MPI b); /*-- mpicoder.c --*/ int mpi_write( IOBUF out, MPI a ); #ifdef M_DEBUG - #define mpi_read(a,b,c) mpi_debug_read((a),(b),(c), M_DBGINFO( __LINE__ ) ) - MPI mpi_debug_read(IOBUF inp, unsigned *nread, int secure, const char *info); +#define mpi_read(a,b,c) mpi_debug_read((a),(b),(c), M_DBGINFO( __LINE__ ) ) +MPI mpi_debug_read(IOBUF inp, unsigned *nread, int secure, const char *info); #else - MPI mpi_read(IOBUF inp, unsigned *nread, int secure); +MPI mpi_read(IOBUF inp, unsigned *nread, int secure); #endif MPI mpi_read_from_buffer(byte *buffer, unsigned *ret_nread, int secure); int mpi_fromstr(MPI val, const char *str); @@ -193,5 +193,4 @@ void mpi_rshift( MPI x, MPI a, unsigned /*-- mpi-inv.c --*/ void mpi_invm( MPI x, MPI u, MPI v ); - #endif /*G10_MPI_H*/ diff -urpP gnupg-1.2.2/include/types.h gnupg-1.2.3/include/types.h --- gnupg-1.2.2/include/types.h 2002-06-29 13:26:17.000000000 +0000 +++ gnupg-1.2.3/include/types.h 2003-07-30 07:44:43.000000000 +0000 @@ -21,20 +21,24 @@ #ifndef G10_TYPES_H #define G10_TYPES_H +#ifdef HAVE_INTTYPES_H +/* For uint64_t */ +#include +#endif /* The AC_CHECK_SIZEOF() in configure fails for some machines. * we provide some fallback values here */ #if !SIZEOF_UNSIGNED_SHORT - #undef SIZEOF_UNSIGNED_SHORT - #define SIZEOF_UNSIGNED_SHORT 2 +#undef SIZEOF_UNSIGNED_SHORT +#define SIZEOF_UNSIGNED_SHORT 2 #endif #if !SIZEOF_UNSIGNED_INT - #undef SIZEOF_UNSIGNED_INT - #define SIZEOF_UNSIGNED_INT 4 +#undef SIZEOF_UNSIGNED_INT +#define SIZEOF_UNSIGNED_INT 4 #endif #if !SIZEOF_UNSIGNED_LONG - #undef SIZEOF_UNSIGNED_LONG - #define SIZEOF_UNSIGNED_LONG 4 +#undef SIZEOF_UNSIGNED_LONG +#define SIZEOF_UNSIGNED_LONG 4 #endif @@ -42,52 +46,52 @@ #ifndef HAVE_BYTE_TYPEDEF - #undef byte /* maybe there is a macro with this name */ - #ifndef __riscos__ - typedef unsigned char byte; - #else - /* Norcroft treats char = unsigned char as legal assignment - but char* = unsigned char* as illegal assignment - and the same applies to the signed variants as well */ - typedef char byte; - #endif - #define HAVE_BYTE_TYPEDEF +#undef byte /* maybe there is a macro with this name */ +#ifndef __riscos__ +typedef unsigned char byte; +#else +/* Norcroft treats char = unsigned char as legal assignment + but char* = unsigned char* as illegal assignment + and the same applies to the signed variants as well */ +typedef char byte; +#endif +#define HAVE_BYTE_TYPEDEF #endif #ifndef HAVE_USHORT_TYPEDEF - #undef ushort /* maybe there is a macro with this name */ - typedef unsigned short ushort; - #define HAVE_USHORT_TYPEDEF +#undef ushort /* maybe there is a macro with this name */ +typedef unsigned short ushort; +#define HAVE_USHORT_TYPEDEF #endif #ifndef HAVE_ULONG_TYPEDEF - #undef ulong /* maybe there is a macro with this name */ - typedef unsigned long ulong; - #define HAVE_ULONG_TYPEDEF +#undef ulong /* maybe there is a macro with this name */ +typedef unsigned long ulong; +#define HAVE_ULONG_TYPEDEF #endif #ifndef HAVE_U16_TYPEDEF - #undef u16 /* maybe there is a macro with this name */ - #if SIZEOF_UNSIGNED_INT == 2 - typedef unsigned int u16; - #elif SIZEOF_UNSIGNED_SHORT == 2 - typedef unsigned short u16; - #else - #error no typedef for u16 - #endif - #define HAVE_U16_TYPEDEF +#undef u16 /* maybe there is a macro with this name */ +#if SIZEOF_UNSIGNED_INT == 2 +typedef unsigned int u16; +#elif SIZEOF_UNSIGNED_SHORT == 2 +typedef unsigned short u16; +#else +#error no typedef for u16 +#endif +#define HAVE_U16_TYPEDEF #endif #ifndef HAVE_U32_TYPEDEF - #undef u32 /* maybe there is a macro with this name */ - #if SIZEOF_UNSIGNED_INT == 4 - typedef unsigned int u32; - #elif SIZEOF_UNSIGNED_LONG == 4 - typedef unsigned long u32; - #else - #error no typedef for u32 - #endif - #define HAVE_U32_TYPEDEF +#undef u32 /* maybe there is a macro with this name */ +#if SIZEOF_UNSIGNED_INT == 4 +typedef unsigned int u32; +#elif SIZEOF_UNSIGNED_LONG == 4 +typedef unsigned long u32; +#else +#error no typedef for u32 +#endif +#define HAVE_U32_TYPEDEF #endif /**************** @@ -96,17 +100,24 @@ * Solaris and IRIX. */ #ifndef HAVE_U64_TYPEDEF - #undef u64 /* maybe there is a macro with this name */ - #if SIZEOF_UNSIGNED_INT == 8 - typedef unsigned int u64; - #define HAVE_U64_TYPEDEF - #elif SIZEOF_UNSIGNED_LONG == 8 - typedef unsigned long u64; - #define HAVE_U64_TYPEDEF - #elif SIZEOF_UNSIGNED_LONG_LONG == 8 - typedef unsigned long long u64; - #define HAVE_U64_TYPEDEF - #endif +#undef u64 /* maybe there is a macro with this name */ +#if SIZEOF_UINT64_T == 8 +typedef uint64_t u64; +#define U64_C(c) (UINT64_C(c)) +#define HAVE_U64_TYPEDEF +#elif SIZEOF_UNSIGNED_INT == 8 +typedef unsigned int u64; +#define U64_C(c) (c ## U) +#define HAVE_U64_TYPEDEF +#elif SIZEOF_UNSIGNED_LONG == 8 +typedef unsigned long u64; +#define U64_C(c) (c ## UL) +#define HAVE_U64_TYPEDEF +#elif SIZEOF_UNSIGNED_LONG_LONG == 8 +typedef unsigned long long u64; +#define U64_C(c) (c ## ULL) +#define HAVE_U64_TYPEDEF +#endif #endif typedef union { @@ -114,9 +125,9 @@ typedef union { short b; char c[1]; long d; - #ifdef HAVE_U64_TYPEDEF +#ifdef HAVE_U64_TYPEDEF u64 e; - #endif +#endif float f; double g; } PROPERLY_ALIGNED_TYPE; @@ -127,5 +138,4 @@ typedef struct string_list { char d[1]; } *STRLIST; - #endif /*G10_TYPES_H*/ diff -urpP gnupg-1.2.2/include/util.h gnupg-1.2.3/include/util.h --- gnupg-1.2.2/include/util.h 2002-11-09 17:33:56.000000000 +0000 +++ gnupg-1.2.3/include/util.h 2003-07-30 15:31:01.000000000 +0000 @@ -20,8 +20,8 @@ #ifndef G10_UTIL_H #define G10_UTIL_H -#if defined (__MINGW32__) || defined (__CYGWIN32__) -# include +#if defined (_WIN32) || defined (__CYGWIN32__) +#include #endif #include "types.h" @@ -91,9 +91,9 @@ void g10_log_hexdump( const char *text, void g10_log_debug_f( const char *fname, const char *fmt, ... ) __attribute__ ((format (printf,2,3))); #ifndef __riscos__ - #define BUG() g10_log_bug0( __FILE__ , __LINE__, __FUNCTION__ ) +#define BUG() g10_log_bug0( __FILE__ , __LINE__, __FUNCTION__ ) #else - #define BUG() g10_log_bug0( __FILE__ , __LINE__, __func__ ) +#define BUG() g10_log_bug0( __FILE__ , __LINE__, __func__ ) #endif #else void g10_log_bug( const char *fmt, ... ); @@ -106,7 +106,7 @@ void g10_log_hexdump( const char *text, void g10_log_error_f( const char *fname, const char *fmt, ... ); void g10_log_info_f( const char *fname, const char *fmt, ... ); void g10_log_debug_f( const char *fname, const char *fmt, ... ); - #define BUG() g10_log_bug0( __FILE__ , __LINE__ ) +#define BUG() g10_log_bug0( __FILE__ , __LINE__ ) #endif #define log_hexdump g10_log_hexdump @@ -223,13 +223,13 @@ int strcasecmp( const char *, const char int strncasecmp (const char *, const char *b, size_t n); #endif #ifndef HAVE_STRTOUL - #define strtoul(a,b,c) ((unsigned long)strtol((a),(b),(c))) +#define strtoul(a,b,c) ((unsigned long)strtol((a),(b),(c))) #endif #ifndef HAVE_MEMMOVE - #define memmove(d, s, n) bcopy((s), (d), (n)) +#define memmove(d, s, n) bcopy((s), (d), (n)) #endif -#if defined (__MINGW32__) +#if defined (_WIN32) /*-- w32reg.c --*/ char *read_w32_registry_string( const char *root, const char *dir, const char *name ); @@ -242,16 +242,16 @@ int vasprintf ( char **result, const cha /**** other missing stuff ****/ #ifndef HAVE_ATEXIT /* For SunOS */ - #define atexit(a) (on_exit((a),0)) +#define atexit(a) (on_exit((a),0)) #endif #ifndef HAVE_RAISE - #define raise(a) kill(getpid(), (a)) +#define raise(a) kill(getpid(), (a)) #endif /******** some macros ************/ #ifndef STR - #define STR(v) #v +#define STR(v) #v #endif #define STR2(v) STR(v) #define DIM(v) (sizeof(v)/sizeof((v)[0])) @@ -260,6 +260,16 @@ int vasprintf ( char **result, const cha #define wipememory2(_ptr,_set,_len) do { volatile char *_vptr=(volatile char *)(_ptr); size_t _vlen=(_len); while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } } while(0) #define wipememory(_ptr,_len) wipememory2(_ptr,0,_len) +/*-- macros to replace ctype ones and avoid locale problems --*/ +#define spacep(p) (*(p) == ' ' || *(p) == '\t') +#define digitp(p) (*(p) >= '0' && *(p) <= '9') +#define hexdigitp(a) (digitp (a) \ + || (*(a) >= 'A' && *(a) <= 'F') \ + || (*(a) >= 'a' && *(a) <= 'f')) +/* Note this isn't identical to a C locale isspace() without \f and + \v, but works for the purposes used here. */ +#define ascii_isspace(a) ((a)==' ' || (a)=='\n' || (a)=='\r' || (a)=='\t') + /******* RISC OS stuff ***********/ #ifdef __riscos__ /* needed for strcasecmp() */ @@ -285,11 +295,10 @@ void dump_fdlist(void); void list_openfiles(void); #endif #ifndef __RISCOS__C__ - #define getpid riscos_getpid - #define kill(a,b) riscos_kill((a),(b)) - #define access(a,b) riscos_access((a),(b)) +#define getpid riscos_getpid +#define kill(a,b) riscos_kill((a),(b)) +#define access(a,b) riscos_access((a),(b)) #endif /* !__RISCOS__C__ */ #endif /* __riscos__ */ #endif /*G10_UTIL_H*/ - diff -urpP gnupg-1.2.2/keyserver/ChangeLog gnupg-1.2.3/keyserver/ChangeLog --- gnupg-1.2.2/keyserver/ChangeLog 2003-04-08 08:38:00.000000000 +0000 +++ gnupg-1.2.3/keyserver/ChangeLog 2003-07-30 07:44:44.000000000 +0000 @@ -1,3 +1,22 @@ +2003-06-19 David Shaw + + * Makefile.am: Use W32LIBS where appropriate. + +2003-05-29 David Shaw + + * gpgkeys_hkp.c, gpgkeys_ldap.c: Include extern references for + optarg and optind since there is no guarantee that any header file + will include them. Standards? We don't need no stinkin' + standards! + +2003-05-28 David Shaw + + * gpgkeys_hkp.c, gpgkeys_ldap.c: #include if it is + available. + + * Makefile.am: Use @GETOPT@ to pull in libiberty on those + platforms that need it. + 2003-03-23 David Shaw * Makefile.am: gpgkeys_hkp needs @INTLLIBS@ on some platforms. diff -urpP gnupg-1.2.2/keyserver/Makefile.am gnupg-1.2.3/keyserver/Makefile.am --- gnupg-1.2.2/keyserver/Makefile.am 2003-04-08 08:38:00.000000000 +0000 +++ gnupg-1.2.3/keyserver/Makefile.am 2003-07-30 07:44:44.000000000 +0000 @@ -23,12 +23,9 @@ EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hk EXTRA_SCRIPTS = gpgkeys_mailto libexecdir = @libexecdir@/@PACKAGE@ -# We don't need the libs the regular GPG binaries do -LIBS= - libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ +gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@ diff -urpP gnupg-1.2.2/keyserver/Makefile.in gnupg-1.2.3/keyserver/Makefile.in --- gnupg-1.2.2/keyserver/Makefile.in 2003-05-01 14:37:47.000000000 +0000 +++ gnupg-1.2.3/keyserver/Makefile.in 2003-08-21 20:03:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -116,9 +118,7 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ - -# We don't need the libs the regular GPG binaries do -LIBS = +LIBS = @LIBS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -154,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -207,9 +208,10 @@ libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKE libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ +gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@ subdir = keyserver +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gpgkeys_mailto gpgkeys_test @@ -321,7 +323,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -332,7 +334,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ diff -urpP gnupg-1.2.2/keyserver/gpgkeys_hkp.c gnupg-1.2.3/keyserver/gpgkeys_hkp.c --- gnupg-1.2.2/keyserver/gpgkeys_hkp.c 2002-11-06 11:12:46.000000000 +0000 +++ gnupg-1.2.3/keyserver/gpgkeys_hkp.c 2003-07-30 15:33:33.000000000 +0000 @@ -25,11 +25,17 @@ #include #include #include +#ifdef HAVE_GETOPT_H +#include +#endif #define INCLUDED_BY_MAIN_MODULE 1 #include "util.h" #include "http.h" #include "keyserver.h" +extern char *optarg; +extern int optind; + #define GET 0 #define SEND 1 #define SEARCH 2 diff -urpP gnupg-1.2.2/keyserver/gpgkeys_ldap.c gnupg-1.2.3/keyserver/gpgkeys_ldap.c --- gnupg-1.2.2/keyserver/gpgkeys_ldap.c 2002-11-06 11:12:46.000000000 +0000 +++ gnupg-1.2.3/keyserver/gpgkeys_ldap.c 2003-06-07 18:55:22.000000000 +0000 @@ -23,6 +23,9 @@ #include #include #include +#ifdef HAVE_GETOPT_H +#include +#endif #include #include #ifdef NEED_LBER_H @@ -35,6 +38,9 @@ #include "util.h" #endif +extern char *optarg; +extern int optind; + #define GET 0 #define SEND 1 #define SEARCH 2 diff -urpP gnupg-1.2.2/mpi/ChangeLog gnupg-1.2.3/mpi/ChangeLog --- gnupg-1.2.2/mpi/ChangeLog 2003-04-24 11:15:58.000000000 +0000 +++ gnupg-1.2.3/mpi/ChangeLog 2003-06-07 18:55:22.000000000 +0000 @@ -1,3 +1,10 @@ +2003-05-21 David Shaw + + * mpicoder.c, mpi-inline.h, mpi-inv.c, mpiutil.c, mpih-div.c, + mpi-internal.h, mpi-scan.c: Edit all preprocessor instructions to + remove whitespace before the '#'. This is not required by C89, + but there are some compilers out there that don't like it. + 2003-04-23 David Shaw * config.links: Put back proper copyright line. @@ -397,7 +404,6 @@ Mon Feb 16 13:00:27 1998 Werner Koch ( * config.links : Add detection of m68k cpus - Copyright 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is free software; as a special exception the author gives @@ -407,5 +413,3 @@ Mon Feb 16 13:00:27 1998 Werner Koch ( 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. - - diff -urpP gnupg-1.2.2/mpi/Makefile.in gnupg-1.2.3/mpi/Makefile.in --- gnupg-1.2.2/mpi/Makefile.in 2003-05-01 14:37:05.000000000 +0000 +++ gnupg-1.2.3/mpi/Makefile.in 2003-08-21 19:52:24.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -248,6 +251,7 @@ common_asm_objects = mpih-mul1.o \ libmpi_a_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ subdir = mpi +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -329,7 +333,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -340,7 +344,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ diff -urpP gnupg-1.2.2/mpi/mpi-inline.h gnupg-1.2.3/mpi/mpi-inline.h --- gnupg-1.2.2/mpi/mpi-inline.h 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpi-inline.h 2003-06-07 18:55:22.000000000 +0000 @@ -30,7 +30,7 @@ #define G10_MPI_INLINE_H #ifndef G10_MPI_INLINE_DECL - #define G10_MPI_INLINE_DECL extern __inline__ +#define G10_MPI_INLINE_DECL extern __inline__ #endif G10_MPI_INLINE_DECL mpi_limb_t @@ -124,5 +124,4 @@ mpihelp_sub( mpi_ptr_t res_ptr, mpi_ptr_ return cy; } - #endif /*G10_MPI_INLINE_H*/ diff -urpP gnupg-1.2.2/mpi/mpi-internal.h gnupg-1.2.3/mpi/mpi-internal.h --- gnupg-1.2.2/mpi/mpi-internal.h 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpi-internal.h 2003-06-07 18:55:22.000000000 +0000 @@ -39,13 +39,13 @@ * checking a 768 and a 1024 bit ElGamal signature. * (wk 22.12.97) */ #ifndef KARATSUBA_THRESHOLD - #define KARATSUBA_THRESHOLD 16 +#define KARATSUBA_THRESHOLD 16 #endif /* The code can't handle KARATSUBA_THRESHOLD smaller than 2. */ #if KARATSUBA_THRESHOLD < 2 - #undef KARATSUBA_THRESHOLD - #define KARATSUBA_THRESHOLD 2 +#undef KARATSUBA_THRESHOLD +#define KARATSUBA_THRESHOLD 2 #endif @@ -151,8 +151,8 @@ typedef int mpi_size_t; /* (must /*-- mpiutil.c --*/ #ifdef M_DEBUG - #define mpi_alloc_limb_space(n,f) mpi_debug_alloc_limb_space((n),(f), M_DBGINFO( __LINE__ ) ) - #define mpi_free_limb_space(n) mpi_debug_free_limb_space((n), M_DBGINFO( __LINE__ ) ) +#define mpi_alloc_limb_space(n,f) mpi_debug_alloc_limb_space((n),(f), M_DBGINFO( __LINE__ ) ) +#define mpi_free_limb_space(n) mpi_debug_free_limb_space((n), M_DBGINFO( __LINE__ ) ) mpi_ptr_t mpi_debug_alloc_limb_space( unsigned nlimbs, int sec, const char *info ); void mpi_debug_free_limb_space( mpi_ptr_t a, const char *info ); #else @@ -253,7 +253,7 @@ mpi_limb_t mpihelp_rshift( mpi_ptr_t wp, #endif #ifdef __GNUC__ - #include "mpi-inline.h" +#include "mpi-inline.h" #endif #endif /*G10_MPI_INTERNAL_H*/ diff -urpP gnupg-1.2.2/mpi/mpi-inv.c gnupg-1.2.3/mpi/mpi-inv.c --- gnupg-1.2.2/mpi/mpi-inv.c 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpi-inv.c 2003-06-07 18:55:22.000000000 +0000 @@ -32,7 +32,7 @@ void mpi_invm( MPI x, MPI a, MPI n ) { - #if 0 +#if 0 MPI u, v, u1, u2, u3, v1, v2, v3, q, t1, t2, t3; MPI ta, tb, tc; @@ -76,7 +76,7 @@ mpi_invm( MPI x, MPI a, MPI n ) mpi_free(t3); mpi_free(u); mpi_free(v); - #elif 0 +#elif 0 /* Extended Euclid's algorithm (See TAOPC Vol II, 4.5.2, Alg X) * modified according to Michael Penk's solution for Exercice 35 */ @@ -157,7 +157,7 @@ mpi_invm( MPI x, MPI a, MPI n ) mpi_free(t1); mpi_free(t2); mpi_free(t3); - #else +#else /* Extended Euclid's algorithm (See TAOPC Vol II, 4.5.2, Alg X) * modified according to Michael Penk's solution for Exercice 35 * with further enhancement */ @@ -263,8 +263,5 @@ mpi_invm( MPI x, MPI a, MPI n ) mpi_free(u); mpi_free(v); - #endif +#endif } - - - diff -urpP gnupg-1.2.2/mpi/mpi-scan.c gnupg-1.2.3/mpi/mpi-scan.c --- gnupg-1.2.2/mpi/mpi-scan.c 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpi-scan.c 2003-06-07 18:55:22.000000000 +0000 @@ -67,7 +67,7 @@ mpi_putbyte( MPI a, unsigned idx, int xc limb = ap[i]; for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ ) if( n == idx ) { - #if BYTES_PER_MPI_LIMB == 4 +#if BYTES_PER_MPI_LIMB == 4 if( j == 0 ) limb = (limb & 0xffffff00) | c; else if( j == 1 ) @@ -76,7 +76,7 @@ mpi_putbyte( MPI a, unsigned idx, int xc limb = (limb & 0xff00ffff) | (c<<16); else limb = (limb & 0x00ffffff) | (c<<24); - #elif BYTES_PER_MPI_LIMB == 8 +#elif BYTES_PER_MPI_LIMB == 8 if( j == 0 ) limb = (limb & 0xffffffffffffff00) | c; else if( j == 1 ) @@ -93,9 +93,9 @@ mpi_putbyte( MPI a, unsigned idx, int xc limb = (limb & 0xff00ffffffffffff) | (c<<48); else limb = (limb & 0x00ffffffffffffff) | (c<<56); - #else - #error please enhance this function, its ugly - i know. - #endif +#else +#error please enhance this function, its ugly - i know. +#endif if( a->nlimbs <= i ) a->nlimbs = i+1; ap[i] = limb; diff -urpP gnupg-1.2.2/mpi/mpicoder.c gnupg-1.2.3/mpi/mpicoder.c --- gnupg-1.2.2/mpi/mpicoder.c 2002-09-20 07:54:17.000000000 +0000 +++ gnupg-1.2.3/mpi/mpicoder.c 2003-06-07 18:55:22.000000000 +0000 @@ -31,7 +31,7 @@ #include "util.h" #ifdef M_DEBUG - #undef mpi_read +#undef mpi_read #endif #define MAX_EXTERN_MPI_BITS 16384 @@ -92,13 +92,13 @@ mpi_read(IOBUF inp, unsigned *ret_nread, nbytes = (nbits+7) / 8; nlimbs = (nbytes+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB; - #ifdef M_DEBUG +#ifdef M_DEBUG val = secure? mpi_debug_alloc_secure( nlimbs, info ) : mpi_debug_alloc( nlimbs, info ); - #else +#else val = secure? mpi_alloc_secure( nlimbs ) : mpi_alloc( nlimbs ); - #endif +#endif i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB; i %= BYTES_PER_MPI_LIMB; val->nbits = nbits; @@ -314,7 +314,7 @@ mpi_get_keyid( MPI a, u32 *keyid ) } return a->nlimbs? (u32)(a->d[0] & 0xffffffff) : 0; #else - #error Make this function work with other LIMB sizes +#error Make this function work with other LIMB sizes #endif } @@ -402,12 +402,12 @@ mpi_set_buffer( MPI a, const byte *buffe a->sign = sign; for(i=0, p = buffer+nbytes-1; p >= buffer+BYTES_PER_MPI_LIMB; ) { - #if BYTES_PER_MPI_LIMB == 4 +#if BYTES_PER_MPI_LIMB == 4 alimb = (mpi_limb_t)*p-- ; alimb |= (mpi_limb_t)*p-- << 8 ; alimb |= (mpi_limb_t)*p-- << 16 ; alimb |= (mpi_limb_t)*p-- << 24 ; - #elif BYTES_PER_MPI_LIMB == 8 +#elif BYTES_PER_MPI_LIMB == 8 alimb = (mpi_limb_t)*p-- ; alimb |= (mpi_limb_t)*p-- << 8 ; alimb |= (mpi_limb_t)*p-- << 16 ; @@ -416,18 +416,18 @@ mpi_set_buffer( MPI a, const byte *buffe alimb |= (mpi_limb_t)*p-- << 40 ; alimb |= (mpi_limb_t)*p-- << 48 ; alimb |= (mpi_limb_t)*p-- << 56 ; - #else - #error please implement for this limb size. - #endif +#else +#error please implement for this limb size. +#endif a->d[i++] = alimb; } if( p >= buffer ) { - #if BYTES_PER_MPI_LIMB == 4 +#if BYTES_PER_MPI_LIMB == 4 alimb = *p-- ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 8 ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 16 ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 24 ; - #elif BYTES_PER_MPI_LIMB == 8 +#elif BYTES_PER_MPI_LIMB == 8 alimb = (mpi_limb_t)*p-- ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 8 ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 16 ; @@ -436,12 +436,11 @@ mpi_set_buffer( MPI a, const byte *buffe if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 40 ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 48 ; if( p >= buffer ) alimb |= (mpi_limb_t)*p-- << 56 ; - #else - #error please implement for this limb size. - #endif +#else +#error please implement for this limb size. +#endif a->d[i++] = alimb; } a->nlimbs = i; assert( i == nlimbs ); } - diff -urpP gnupg-1.2.2/mpi/mpih-div.c gnupg-1.2.3/mpi/mpih-div.c --- gnupg-1.2.2/mpi/mpih-div.c 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpih-div.c 2003-06-07 18:55:22.000000000 +0000 @@ -34,10 +34,10 @@ #include "longlong.h" #ifndef UMUL_TIME - #define UMUL_TIME 1 +#define UMUL_TIME 1 #endif #ifndef UDIV_TIME - #define UDIV_TIME UMUL_TIME +#define UDIV_TIME UMUL_TIME #endif /* FIXME: We should be using invert_limb (or invert_normalized_limb) @@ -533,5 +533,3 @@ mpihelp_divmod_1( mpi_ptr_t quot_ptr, return r; } } - - diff -urpP gnupg-1.2.2/mpi/mpiutil.c gnupg-1.2.3/mpi/mpiutil.c --- gnupg-1.2.2/mpi/mpiutil.c 2002-06-29 14:14:05.000000000 +0000 +++ gnupg-1.2.3/mpi/mpiutil.c 2003-06-07 18:55:22.000000000 +0000 @@ -31,9 +31,9 @@ #ifdef M_DEBUG - #undef mpi_alloc - #undef mpi_alloc_secure - #undef mpi_free +#undef mpi_alloc +#undef mpi_alloc_secure +#undef mpi_free #endif /**************** @@ -54,13 +54,13 @@ mpi_alloc( unsigned nlimbs ) if( DBG_MEMORY ) log_debug("mpi_alloc(%u)\n", nlimbs*BITS_PER_MPI_LIMB ); - #ifdef M_DEBUG +#ifdef M_DEBUG a = m_debug_alloc( sizeof *a, info ); a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 0, info ) : NULL; - #else +#else a = m_alloc( sizeof *a ); a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 0 ) : NULL; - #endif +#endif a->alloced = nlimbs; a->nlimbs = 0; a->sign = 0; @@ -87,13 +87,13 @@ mpi_alloc_secure( unsigned nlimbs ) if( DBG_MEMORY ) log_debug("mpi_alloc_secure(%u)\n", nlimbs*BITS_PER_MPI_LIMB ); - #ifdef M_DEBUG +#ifdef M_DEBUG a = m_debug_alloc( sizeof *a, info ); a->d = nlimbs? mpi_debug_alloc_limb_space( nlimbs, 1, info ) : NULL; - #else +#else a = m_alloc( sizeof *a ); a->d = nlimbs? mpi_alloc_limb_space( nlimbs, 1 ) : NULL; - #endif +#endif a->alloced = nlimbs; a->flags = 1; a->nlimbs = 0; @@ -121,7 +121,7 @@ mpi_alloc_limb_space( unsigned nlimbs, i if( DBG_MEMORY ) log_debug("mpi_alloc_limb_space(%u)\n", (unsigned)len*8 ); - #if 0 +#if 0 if( !secure ) { if( nlimbs == 5 && unused_limbs_5 ) { /* DSA 160 bits */ p = unused_limbs_5; @@ -139,13 +139,13 @@ mpi_alloc_limb_space( unsigned nlimbs, i return p; } } - #endif +#endif - #ifdef M_DEBUG +#ifdef M_DEBUG p = secure? m_debug_alloc_secure(len, info):m_debug_alloc( len, info ); - #else +#else p = secure? m_alloc_secure( len ):m_alloc( len ); - #endif +#endif return p; } @@ -162,7 +162,7 @@ mpi_free_limb_space( mpi_ptr_t a ) if( DBG_MEMORY ) log_debug("mpi_free_limb_space of size %lu\n", (ulong)m_size(a)*8 ); - #if 0 +#if 0 if( !m_is_secure(a) ) { size_t nlimbs = m_size(a) / 4 ; void *p = a; @@ -183,8 +183,7 @@ mpi_free_limb_space( mpi_ptr_t a ) return; } } - #endif - +#endif m_free(a); } @@ -218,17 +217,17 @@ mpi_resize( MPI a, unsigned nlimbs ) * and rely on a mpi_is_secure function, which would be * a wrapper around m_is_secure */ - #ifdef M_DEBUG +#ifdef M_DEBUG if( a->d ) a->d = m_debug_realloc(a->d, nlimbs * sizeof(mpi_limb_t), info ); else a->d = m_debug_alloc_clear( nlimbs * sizeof(mpi_limb_t), info ); - #else +#else if( a->d ) a->d = m_realloc(a->d, nlimbs * sizeof(mpi_limb_t) ); else a->d = m_alloc_clear( nlimbs * sizeof(mpi_limb_t) ); - #endif +#endif a->alloced = nlimbs; } @@ -255,11 +254,11 @@ mpi_free( MPI a ) if( a->flags & 4 ) m_free( a->d ); else { - #ifdef M_DEBUG +#ifdef M_DEBUG mpi_debug_free_limb_space(a->d, info); - #else +#else mpi_free_limb_space(a->d); - #endif +#endif } if( a->flags & ~7 ) log_bug("invalid flag value in mpi\n"); @@ -280,18 +279,18 @@ mpi_set_secure( MPI a ) assert(!ap); return; } - #ifdef M_DEBUG +#ifdef M_DEBUG bp = mpi_debug_alloc_limb_space( a->nlimbs, 1, "set_secure" ); - #else +#else bp = mpi_alloc_limb_space( a->nlimbs, 1 ); - #endif +#endif MPN_COPY( bp, ap, a->nlimbs ); a->d = bp; - #ifdef M_DEBUG +#ifdef M_DEBUG mpi_debug_free_limb_space(ap, "set_secure"); - #else +#else mpi_free_limb_space(ap); - #endif +#endif } @@ -299,21 +298,21 @@ MPI mpi_set_opaque( MPI a, void *p, int len ) { if( !a ) { - #ifdef M_DEBUG +#ifdef M_DEBUG a = mpi_debug_alloc(0,"alloc_opaque"); - #else +#else a = mpi_alloc(0); - #endif +#endif } if( a->flags & 4 ) m_free( a->d ); else { - #ifdef M_DEBUG +#ifdef M_DEBUG mpi_debug_free_limb_space(a->d, "alloc_opaque"); - #else +#else mpi_free_limb_space(a->d); - #endif +#endif } a->d = p; @@ -357,13 +356,13 @@ mpi_copy( MPI a ) b = mpi_set_opaque( NULL, p, a->nbits ); } else if( a ) { - #ifdef M_DEBUG +#ifdef M_DEBUG b = mpi_is_secure(a)? mpi_debug_alloc_secure( a->nlimbs, info ) : mpi_debug_alloc( a->nlimbs, info ); - #else +#else b = mpi_is_secure(a)? mpi_alloc_secure( a->nlimbs ) : mpi_alloc( a->nlimbs ); - #endif +#endif b->nlimbs = a->nlimbs; b->sign = a->sign; b->flags = a->flags; @@ -398,13 +397,13 @@ mpi_alloc_like( MPI a ) b = mpi_set_opaque( NULL, p, a->nbits ); } else if( a ) { - #ifdef M_DEBUG +#ifdef M_DEBUG b = mpi_is_secure(a)? mpi_debug_alloc_secure( a->nlimbs, info ) : mpi_debug_alloc( a->nlimbs, info ); - #else +#else b = mpi_is_secure(a)? mpi_alloc_secure( a->nlimbs ) : mpi_alloc( a->nlimbs ); - #endif +#endif b->nlimbs = 0; b->sign = 0; b->flags = a->flags; @@ -449,11 +448,11 @@ mpi_set_ui( MPI w, unsigned long u) MPI mpi_alloc_set_ui( unsigned long u) { - #ifdef M_DEBUG +#ifdef M_DEBUG MPI w = mpi_debug_alloc(1,"alloc_set_ui"); - #else +#else MPI w = mpi_alloc(1); - #endif +#endif w->d[0] = u; w->nlimbs = u? 1:0; w->sign = 0; @@ -468,4 +467,3 @@ mpi_swap( MPI a, MPI b) tmp = *a; *a = *b; *b = tmp; } - diff -urpP gnupg-1.2.2/po/ChangeLog gnupg-1.2.3/po/ChangeLog --- gnupg-1.2.2/po/ChangeLog 2003-05-01 09:59:52.000000000 +0000 +++ gnupg-1.2.3/po/ChangeLog 2003-08-21 16:35:14.000000000 +0000 @@ -1,3 +1,16 @@ +2003-08-21 Werner Koch + + * pl.po, hu.po: Updated from upstream. + +2003-07-30 Werner Koch + + * de.po: Fixed fuzzies and translated a few new strings. + +2003-06-19 Werner Koch + + * ca.po, de.po, es.po, et.po, ja.po, ro.po, tr.po, zh_TW.po: + Updated from TP robot. + 2003-05-01 Werner Koch * de.po: Added recent translatable strings and fixed fuzzies. diff -urpP gnupg-1.2.2/po/ca.po gnupg-1.2.3/po/ca.po --- gnupg-1.2.2/po/ca.po 2003-05-01 14:37:54.000000000 +0000 +++ gnupg-1.2.3/po/ca.po 2003-08-21 20:04:50.000000000 +0000 @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-27 19:51+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-14 18:29+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -69,14 +69,14 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "ix" # «xX»? ivb #: util/miscutil.c:336 msgid "qQ" -msgstr "qQ" +msgstr "xX" #: util/errors.c:54 msgid "general error" @@ -305,64 +305,64 @@ msgstr "... açò és un bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "heu trobat un bug... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "no s'ha pogut obrir «%s»: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "no es pot fer stat de «%s»: %s\n" # Descartar, deixar passar... ignorar és un anglicisme. ivb -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "«%s» no és un fitxer regular: es descarta\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "nota: el fitxer random_seed és buit\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "no s'ha pogut llegir «%s»: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "nota: el fitxer random_seed no s'ha actualitzat\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "no s'ha pogut crear «%s»: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "no s'ha pogut escriure «%s»: %s\n" # No em passe! ;) ivb -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "no s'ha pogut tancar «%s»: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -392,6 +392,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "l'algorisme de resum «%s» es de només lectura en aquesta versió\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -401,7 +406,7 @@ msgstr "" "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n" "vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -409,166 +414,166 @@ msgstr "" "@Ordres:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[fitxer]|crea una signatura" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[fitxer]|crea una signatura en text clar" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "crea una signatura separada" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "xifra dades" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[fitxers]|xifra fitxers" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "xifra només amb xifratge simètric" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "només emmagatzema" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "desxifra dades (predeterminat)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[fitxers]|desxifra fitxers" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifica una signatura" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "llista claus" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "llista claus i signatures" # «de les claus» o «de la clau»? ivb -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "comprova les signatures de la claus" # «dactilars» o «digitals»? ivb -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "llista claus i empremtes digitals" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "llista claus secretes" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "genera un nou parell de claus" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "elimina claus de l'anell públic" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "elimina claus de l'anell secret" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "signa una clau" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "signa una clau localment" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "signa una clau irrevocablement" # D'altres formes o no queda clar o és massa literari :P ivb -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "signa una clau de forma local i irrevocable" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "signa o edita una clau" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "genera un certificat de revocació" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exporta claus" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exporta claus a un servidor de claus" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importa claus d'un servidor de claus" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "cerca claus en un servidor de claus" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "actualitza totes les claus des d'un servidor de claus" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importa/fon claus" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "llista només la seqüència de paquets" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exporta els valors de confiança" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importa els valors de confiança" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "actualitza la base de dades de confiança" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "actualització no atesa de la base de dades de confiança" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "arregla una base de dades de confiança corrompuda" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "lleva l'armadura a un fitxer o a stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "crea l'armadura d'un fitxer o d'stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [fitxers]|imprimeix resums de missatges" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -578,155 +583,155 @@ msgstr "" "Opcions:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "crea eixida amb armadura ascii" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOM|xifra per a NOM" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOM|usa NOM com a destinatari predeterminat" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usa la clau predeterminada com a destinatari predeterminat" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "usa aquest id per a signar o desxifrar" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|nivell de compressió N (0 no comprimeix)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usa el mode de text canònic" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "fitxer d'eixida" # Un dels dos és en la llista d'opcions amb --help. Urgh. jm -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "detall" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "una mica més silenciós" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "no usa el terminal en absolut" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "força signatures v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "no força signatures v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "força signatures de clau v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "no força signatures de clau v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "sempre utilitza un MDC per a xifrar" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "mai utilitza un MDC per a xifrar" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "no fa cap canvi" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "pregunta abans de sobreescriure" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "utilitza el gpg-agent" # Mode desatès (SC) ivb -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "mode desatès: no pregunta mai" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "suposa «sí» en la majoria de les preguntes" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "suposa «no» en la majoria de les preguntes" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "afegeix aquest anell a la llista" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "afegeix aquest anell secret a la llista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "mostra en quin anell de claus està una clau llistada" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|usa NOM com a clau secreta predeterminada" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|usa aquest servidor per a cercar claus" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|el joc de caràcters serà NOM" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "llig opcions del fitxer" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|escriu informació d'estat en aquest FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|fitxer|escriu informació d'estat en un fitxer" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|IDCLAU|confia absolutament en aquesta clau" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FITXER|carrega el mòdul d'extensió especificat" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emula el mode descrit en RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "estableix totes les opcions de paquets, xifratge i resum al comportament " "d'OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "estableix totes les opcions de paquets, xifratge i resum al comportament de " @@ -776,7 +781,7 @@ msgstr "no mostra els Photo ID" msgid "Set command line to view Photo IDs" msgstr "fixa l'ordre per a veure Photo ID" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -787,7 +792,7 @@ msgstr "" # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman # en el manual original de PGP. A, B, C... ivb # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -807,15 +812,15 @@ msgstr "" " --list-keys [noms] mostra claus\n" " --fingerprint [noms] mostra empremtes digitals\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Si us plau, informeu sobre els errors a .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -827,7 +832,10 @@ msgstr "" # Suportats? ivb # A Softcatalà diuen molt «implementat». jm -#: g10/g10.c:652 +# Precissament acabem de parlar d'«implementat a la llista del GNOME +# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives +# encara no m'agraden massa... jm +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -835,323 +843,357 @@ msgstr "" "\n" "Algoritmes suportats:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Clau pública: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Xifratge: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Dispersió: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compressió: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "forma d'ús: gpg [opcions] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "les ordres entren en conflicte\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no s'ha trobat cap signe = en la definició de grup «%s»\n" # Indi. ivb -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVÍS: el propietari és insegur en %s «%s»\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVÍS: els permissos són insegurs en %s «%s»\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "fitxer d'opcions «%s»: %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "s'estan llegint opcions de «%s»\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no és un joc de caràcters vàlid\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcions d'importanció no vàlides\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opcions d'importació no vàlides\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d opcions d'exportació no vàlides\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opcions d'exportació no vàlides\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "AVÍS: el programa podria crear un fitxer core!\n" # FIXME: preferència? jm # Ho discutírem en la llista, segur. Deu ser als arxius. ivb -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVÍS: %s té preferència sobre %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no és per a ús normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no és permés amb %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no té sentit amb %s!\n" # clares -> en clar? ivb -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 " "habilitat.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "aquest missatge pot no ser usable per %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no és vàlid\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "l'algorisme de resum seleccionat no és vàlid\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritme de compressió ha d'estar en l'interval %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "les preferències per defecte són invàlides\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "les preferències personals de xifrat són invàlides\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "les preferències personals de digest són invàlides\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "les preferències personals de compressió són invàlides\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "no podeu usar %s mentre esteu en mode %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "no podeu usar %s mentre esteu en mode %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "no podeu usar %s mentre esteu en mode %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "no s'ha pogut obrir %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "La generació de claus ha fallat: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "no s'ha pogut enumerar les claus secretes: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "La generació de claus ha fallat: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: ha fallat search_record: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "no s'ha pogut enumerar les claus secretes: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "l'algoritme de dispersió és invàlid «%s»\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nom_del_fitxer]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Endavant, escriviu el missatge...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "no s'ha pogut obrir «%s»\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1159,19 +1201,19 @@ msgstr "" "un nom de notació només pot tenir caràcters imprimibles o espais i acabar " "amb el signe «=»\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "un valor de notació no pot utilitzar cap caràcter de control\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "la URL de política de certificació donada no és vàlida\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "la URL de política de signatura donada no és vàlida\n" @@ -1316,7 +1358,7 @@ msgstr "" "No hi ha cap valor de confiança assignat a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1373,7 +1415,7 @@ msgstr " o = omet aquesta clau\n" msgid " q = quit\n" msgstr " x = ix\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "La vostra decisió? " @@ -1548,91 +1590,91 @@ msgstr "%s: es descarta: la clau pública msgid "no valid addressees\n" msgstr "no hi ha adreces vàlides\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "la preferència %c%lu no és vàlida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "la preferència %c%lu és duplicada\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "hi ha massa preferències «%c»\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "hi ha un caràcter invàlid en la cadena de preferència\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "s'està escrivint una signatura directa\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "s'està escrivint l'autosignatura\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "s'està escrivint la signatura de comprovació de la clau\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, 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:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, 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:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Seleccioneu quin tipus de clau voleu:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA i ElGamal (predeterminat)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (només signar)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (només xifrar)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (signar i xifrar)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (només signar)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (només xifrar)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (signar i xifrar)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Seleccioneu: " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1642,15 +1684,15 @@ msgstr "" "aquesta clau per a comunicar-vos amb usuaris de PGP. Aquest algorisme també " "és molt lent, i potser no és tan segur com les altres alternatives.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Voleu crear la clau de tota manera? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "La selecció és invàlida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1663,20 +1705,20 @@ msgstr "" " grandària predeterminada: 1024 bits\n" " grandària màxima aconsellada: 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Quina grandària voleu? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA només permet claus entre 512 i 1024 bits\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "la clau és massa petita; 1024 bits és el mínim permés per a claus RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "la clau és massa petita; 768 bits és el mínim permés.\n" @@ -1689,12 +1731,12 @@ msgstr "la clau és massa petita; 768 bit #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "la clau és massa llarga; %d és el màxim permés.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1702,11 +1744,11 @@ msgstr "" "No es recomanen claus més llargues de 2048 bits perquè\n" "els càlculs són VERITABLEMENT llargs!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Segur que voleu aquesta grandària? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1714,17 +1756,17 @@ msgstr "" "D'acord, però sapieu que la radiació del monitor i del teclat també son molt " "vulnerables als atacs!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La grandària sol·licitada és %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "arrodonida fins a %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1740,7 +1782,7 @@ msgstr "" " m = la clau caduca als n mesos\n" " y = la clau caduca als n anys\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1756,32 +1798,32 @@ msgstr "" " m = la signatura caduca als n mesos\n" " y = la signatura caduca als n anys\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Indiqueu la validesa de la clau (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Indiqueu la validesa de la signatura (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "el valor no és vàlid\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s no caduca en absolut\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca el %s\n" # Amb «it» es refereix a les dates? ivb # Això vaig entendre jo. jm -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1789,11 +1831,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "És correcte? (s/n)" -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1809,44 +1851,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nom i cognoms: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Hi ha un caràcter invàlid en el camp *nom*\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "El nom no pot començar amb un dígit\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 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:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Adreça electrònica: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "No és una adreça vàlida\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Comentari: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Esteu usant el joc de caràcters `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1857,29 +1899,29 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n" # xX? ivb # Hmm... sí. jm -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoXx" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Corregiu l'error primer\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1887,16 +1929,16 @@ msgstr "" "Cal una contrasenya per a protegir la clau secreta.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1908,7 +1950,7 @@ msgstr "" "useu aquest programa amb l'opció \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1920,56 +1962,56 @@ msgstr "" "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n" "d'aconseguir prou entropia.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "La parella de claus DSA ha de tenir 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "La generació de claus ha estat cancel·lada.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "s'està escrivint la clau pública a «%s»\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, 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:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, 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:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, 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:2285 +#: g10/keygen.c:2305 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:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "s'ha marcat la clau com a de confiança absoluta.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1977,13 +2019,13 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "La generació de claus ha fallat: %s\n" # FIXME: Use ngettext. jm -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1992,7 +2034,7 @@ msgstr "" "amb el rellotge)\n" # FIXME: use ngettext. jm -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -2000,25 +2042,25 @@ msgstr "" "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n" "amb el rellotge)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Crear realment? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output no funciona per a aquesta ordre\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: no s'ha pogut obrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "error en la creació de la contrasenya: %s\n" @@ -2027,17 +2069,17 @@ msgstr "error en la creació de la contra msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "«%s» ja està comprimida\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVÍS: el fitxer és buit\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n" @@ -2054,7 +2096,7 @@ msgstr "" "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que " "esteu xifrant.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2072,297 +2114,298 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s xifrat per a: «%s»\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "no s'ha trobat la clau «%s»: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "s'ha produït un error en llegir el bloc de claus: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "clau %08lX: no és una clau rfc2440 - es descarta\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "clau %08lX: no està protegida - es descarta\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "AVÍS: no s'ha exportat res\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "" "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[No s'ha trobat l'id d'usuari]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "hi ha una clau secreta per a la clau pública «%s»!\n" +msgstr "" +"no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "es descarta un bloc de tipus %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "fins ara s'han processat %lu claus\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "error en la lectura de «%s»: %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Nombre total processat: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " claus noves descartades: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sense ID: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importades: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " no modificades: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " ID d'usuaris nous: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " subclaus noves: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " signatures noves: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " noves revocacions: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " claus privades llegides: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "claus privades importades: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "claus privades no canviades: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " importades: %lu\n" # FIXME: typo Elgamal vs. ElGamal -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTA: s'ha detectat una clau primària ElGamal - açò pot trigar un temps en " "importar-se\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "clau %08lX: sense ID\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "clau %08lX: corrupció de la subclau HKP reparada\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "clau %08lX: l'ID no és vàlid\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "açò pot ser causat per l'absència d'autosignatura\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "clau %08lX: clau nova - es descarta \n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "no s'ha trobat cap anell escrivible: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "s'està escrivint en «%s»\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error mentre s'escrivia l'anell «%s»: %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "clau %08lX: s'ha importat la clau pública «%s»\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clau %08lX: no correspon a la nostra còpia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "clau %08lX: «%s» %d ID d'usuari nous\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "clau %08lX: «%s» 1 signatura nova\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "clau %08lX: «%s» %d signatures noves\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "clau %08lX: «%s» 1 subclau nova\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "clau %08lX: «%s» %d subclaus noves\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "clau %08lX: «%s» no ha estat modificada\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "no hi ha anell secret predeterminat: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clau %08lX: s'ha importat la clau secreta\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clau %08lX: ja es troba en l'anell privat\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" @@ -2372,22 +2415,22 @@ msgstr "" # O «rebutjara»? ivb # Per tots els canvis d'anglicisme «ignorat» -> «es descarta», # «es rebutja» està bé. jm -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "clau %08lX: no hi ha ID per a la signatura\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" @@ -2395,121 +2438,111 @@ msgstr "" "s»\n" "\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "clau %08lX: l'enllaç de subclau és invàlid\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "clau %08lX: Subclau de revocació no vàlida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "clau %08lX: es descarta l'ID d'usuari '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "clau %08lX: es descarta la subclau\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "clau %08lX: el certificat de revocació és en el lloc equivocat - es " "descarta\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "" "clau %08lX: la signatura de la subclau és en el lloc equivocat - es " "descarta\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "" "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està " "present.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n" @@ -2522,29 +2555,29 @@ msgstr "[revocació]" msgid "[self-signature]" msgstr "[autosignatura]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 signatura errònia\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d signatures errònies\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 signatura no comprovada per falta de clau\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signatures no comprovades per falta de clau\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 signatura no comprovada a causa d'un error\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signatures no comprovades a causa d'errors\n" @@ -2563,22 +2596,29 @@ msgstr "Han estat detectats %d IDs sense msgid "User ID \"%s\" is revoked." msgstr "L'ID d'usuari «%s» està revocat." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Segur que encara voleu signarla? (s/N) " # O no s'ha pogut? ivb # FIXME: comprovar context. jm -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " No es pot signar.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "L'ID d'usuari «%s» està revocat." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "AVÍS: l'ID d'usuari «%s» no està autosignat\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2587,11 +2627,11 @@ msgstr "" "La vostra signatura en «%s»\n" "és una signatura d'estil PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2600,13 +2640,13 @@ msgstr "" "La vostra signatura actual en «%s»\n" "ha caducat.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2615,54 +2655,54 @@ msgstr "" "La vostra signatura en «%s»\n" "és una signatura local.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "«%s» ja estava signada localment amb la clau %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "«%s» ja estava signada amb la clau %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Voleu signarla un altre cop, de tota manera? (s/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "No hi ha res que signar amb la clau %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "La clau ha caducat!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Aquesta clau caducarà el %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Voleu que la vostra signatura caduque alhora? (S/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Açò inutilitzaria la clau en PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2672,31 +2712,35 @@ msgstr "" "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n" "contestar, entreu «0».\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) No vaig a contestar.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (predeterminat)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) No ho he comprovat en absolut.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) He fet algunes comprovacions.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) He fet comprovacions molt acurades.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2704,7 +2748,7 @@ msgstr "" "Esteu segur que voleu signar aquesta clau\n" "amb la vostra clau: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2712,7 +2756,7 @@ msgstr "" "\n" "Açò serà una autosignatura.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2720,7 +2764,7 @@ msgstr "" "\n" "AVÍS: la signatura no es marcarà com a inexportable.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2728,7 +2772,7 @@ msgstr "" "\n" "AVÍS: la signatura no es marcarà com a irrevocable.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2736,7 +2780,7 @@ msgstr "" "\n" "La signatura es marcarà com a inexportable.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2744,7 +2788,7 @@ msgstr "" "\n" "La signatura es marcarà com a irrevocable.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2752,7 +2796,7 @@ msgstr "" "\n" "No he comprovat aquesta clau en absolut.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2760,7 +2804,7 @@ msgstr "" "\n" "He fet algunes comprovacions a aquesta clau.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2768,34 +2812,34 @@ msgstr "" "\n" "He comprovat aquesta clau amb molta cura.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Signar realment? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "Ha fallat el procés de signatura: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Aquesta clau no està protegida.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "La clau està protegida.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "No es pot editar aquesta clau: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2803,7 +2847,7 @@ msgstr "" "Introduïu la nova contrasenya per a la clau secreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2812,139 +2856,139 @@ msgstr "" "\n" # No abusis dels pronoms! (Rowan Atkinson @ Llei i Desordre) ivb -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Esteu segur de voler fer açò? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "s'està posant la signatura al lloc correcte\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "ix del menú" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "desa" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "desa i ix" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "ajuda" # «pantalla» o «ajuda»? ivb # «ajuda», evidentment. jm -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "mostra aquesta ajuda" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "mostra empremta" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "llista" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "llista claus i ID" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb # Yeah, els vaig corregir abans de que enviares la teua correcció. jm -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "tria l'ID d'usuari N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "clau" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "tria la clau secundària N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "comprova" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "llista les signatures" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "signa la clau" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "signa la clau localment" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "signa la clau irrevocablement" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "signa la clau localment i irrevocablement" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "depura" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "afegeix un ID d'usuari" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" @@ -2952,368 +2996,366 @@ msgstr "addphoto" # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids # i no hem unificat en català. Potser li ho diré a Werner. jm. -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "afegeix un photo ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "esborra un ID d'usuari" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "afegeix una clau secundària" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "esborra una clau secundària" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "afegeix una clau de revocació" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "esborra signatures" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "canvia la data de caducitat" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primari" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "marca l'ID d'usuari com a primari" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "canvia entre el llistat de claus secretes i públiques" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "llista les preferències (expert)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "llista les preferències (detallat)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "estableix la llista de preferències" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferències actualitzades" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "canvia la contrasenya" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "canvia la confiança" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoca signatures" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revoca un ID d'usuari" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoca una clau secundària" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "desactiva una clau" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "activa una clau" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" # Igual que dalt. ivb # Idem :) jm -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "mostra el photo ID" # Destès? ivb # Desatès, sí. jm -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "no es pot fet això en mode desatès\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "error en llegir el bloc de claus secretes «%s»: %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "La clau secreta està disponible.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Ordre> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Cal la clau secreta per a fer açò.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Useu l'ordre «toggle» abans.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "La clau està revocada." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Realment voleu signar tots els ID d'usuari? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: Trieu els ID d'usuari que voleu signar\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Heu de seleccionar al menys un ID d'usuari.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "No podeu esborrar l'últim ID d'usuari!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Heu de seleccionar, si més no, una clau.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Realment voleu eliminar les claus seleccionades? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Realment voleu eliminar aquesta clau? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Realment voleu revocar les claus seleccionades? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Realment voleu revocar aquesta clau? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Realment voleu actualitzar les preferències? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Voleu desar els canvis? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Voleu eixir sense desar? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "ha fallat l'actualització: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "ha fallat l'actualització de la clau secreta: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "La clau no ha canviat, per tant no cal actualització.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no és vàlida (proveu «help»)\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Resum: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Funcionalitats: " # Potser %s haja d'anar darrere de «clau». ivb # És cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Aquesta clau pot ser revocada per la clau %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensible)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX creada: %s caduca: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " confiança: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Aquesta clau ha estat desactivada" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! la subclau ha estat revocada: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- s'ha trobat una revocació falsa\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revkey" +msgstr "[revocada]" -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expire" +msgstr "[caducada]" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3321,8 +3363,14 @@ msgstr "" "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:2107 +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 "" + # Photo ID com abans. ivb -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3331,137 +3379,136 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)" -#: g10/keyedit.c:2255 -#, fuzzy +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" -msgstr "Voleu esborrar aquesta signatura desconeguda? (y/N/q)" +msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" # FIXME: use ngettext. jm -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "S'ha esborrat %d signatura.\n" # FIXME: use ngettext. jm -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "S'han esborrat %d signatures.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "No s'hi ha eliminat res.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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 "" -"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador dessignat " -"pot\n" +"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:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" -msgstr "No podeu afegir un revocador dessignat a una clau d'estil PGP 2.x.\n" +msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Introduïu l'ID d'usuari del revocador designat: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n" +msgstr "" +"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" -msgstr "no podeu designar una clau com el seu propi revocador\n" +msgstr "no podeu nominar una clau com el seu propi revocador designat\n" -#: g10/keyedit.c:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "no podeu designar una clau com el seu propi revocador\n" +msgstr "" +"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "no podeu designar una clau com el seu propi revocador\n" +msgstr "" +"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Per favor, elimineu les seleccions de les claus secretes.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Per favor, seleccioneu com a molt una clau secundària.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "S'està canviant la data de caducitat per a una clau secundària.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 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:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "No hi ha cap signatura corresponent en l'anell secret\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Heu de seleccionar exactament un ID.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "No hi ha cap ID amb l'índex %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "No hi ha cap clau secundària amb l'índex %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID d'usuari: «" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3470,7 +3517,7 @@ msgstr "" "»\n" "signat amb la vostra clau %08lX el %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3479,59 +3526,59 @@ msgstr "" "»\n" "signat localment amb la vostra clau %08lX el %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Aquesta signatura va caducar el %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Heu signat els següents ID d'usuari:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " signat per %08lX el %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revocat per %08lX el %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Esteu a punt de revocar aquestes signatures:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " signat per %08lX el %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (no-exportable)" # (s/N)? ivb -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Realment voleu crear els certificats de revocació? (s/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "ho hi ha clau secreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'ID d'usuari «%s» ja està revocat\n" @@ -3540,69 +3587,69 @@ msgstr "l'ID d'usuari «%s» ja està revoc #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Política de signatura crítica: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Política de signatura: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notació de signatura crítica: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notació de signatura: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "no llegible per humans" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Anell" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [caduca: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Empremtes digital de la clau primària:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Empremta digital de la clau primària:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Empremta digital =" @@ -3691,103 +3738,110 @@ msgstr "NOTA: el remitent ha sol·licitat msgid "original file name='%.*s'\n" msgstr "nom del fitxer original='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notació: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Política: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "s'ha eliminat la verificació de signatura\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "no es poden tractar aquestes signatures múltiples\n" # «%.*s» no serà una data? Caldrà «el» al davant. ivb -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "No hi ha ajuda disponible" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Signatura INCORRECTA de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Signatura caducada de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Signatura correcta de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incert]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "Aquesta signatura va caducar el %s.\n" +msgstr "Aquesta signatura va caducar el %s\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "Aquesta signatura va caducar el %s.\n" +msgstr "Aquesta signatura caduca el %s\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s signatura de: «%s»\n" +msgstr "signatura %s, algorisme de resum %s\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primari" +msgstr "binari" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "mode text" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "la versió és desconeguda" +msgstr "desconeguda" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "No s'ha pogut comprovar la signatura: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "no és una signatura separada\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "signatura autònoma de classe 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "signatura de l'estil antic (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n" @@ -3816,71 +3870,76 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "vegeu http://www.gnupg.org/why-not-idea.html per a més informació\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: l'opció «%s» està desaconsellada.\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVÍS: %s és una opció desaconsellada.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "aquest missatge pot no ser usable per %s\n" + +#: g10/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, 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" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent no està disponible en aquesta sessió\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "no es pot establir el pid del client per l'agent\n" # llija/llegisca/llegesca. ivb -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versió %d del protocol de gpg-agent no està suportada\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no s'ha pogut connectar amb «%s»: %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "hi ha un problema de comunicació amb el gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID de la clau principal %08lX)" @@ -3896,7 +3955,7 @@ msgstr " (ID de la clau principal %08lX) # Se't passava l'argument «*». printf(3), hieroglyph(7). ivb # Ah! Prova-ho, no casque alguna cosa :P ivb # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3907,32 +3966,32 @@ msgstr "" "«%2$.*1$s»\n" "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Repetiu la contrasenya\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Introduïu la contrasenya\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "la contrasenya és massa llarga\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "la resposta de l'agent és invàlida\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "s'ha cancel·lat per l'usuari\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3942,20 +4001,20 @@ msgstr "" "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "no es pot demanar la contrasenya en mode desatès\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Introduïu la contrasenya: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " @@ -4051,8 +4110,8 @@ msgid "failed sending to `%s': status=%u msgstr "l'enviament a «%s» ha fallat: status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "aquest servidor de clau no és completament compatible amb HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4093,11 +4152,11 @@ msgstr "" "s'està generant la suma de comprovació desaconsellada de 16-bits per a la " "protecció de la clau secreta\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "AVÍS: conflicte de signatures digest en el missatge\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4105,17 +4164,17 @@ msgid "" msgstr "" "clau %08lX: aquesta és una clau ElGamal que NO és segura per a signatures!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4125,7 +4184,7 @@ msgstr "" "problemes\n" "amb el rellotge)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4135,51 +4194,59 @@ msgstr "" "problemes\n" "amb el rellotge)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n" +msgstr "" +"no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n" +msgstr "" +"no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP " +"2.x)\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no " "expandida.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n" +msgstr "" +"no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" +"no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP " +"2.x)\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4208,12 +4275,12 @@ msgstr "" "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu " "en mode --pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "no s'ha pogut creat %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4228,7 +4295,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "s'utilitzarà xifratge %s\n" @@ -4243,12 +4310,12 @@ msgstr "no es poden tractar línies més l msgid "input line longer than %d characters\n" msgstr "la línia d'entrada és superior a %d caràcters\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -4259,124 +4326,124 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "la transacció de la base de dades de confiança és massa gran\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: no s'ha pogut accedir: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: el directori no existeix!\n" # blocatge? ivb # yep. jm -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: no s'ha pogut crear el blocatge\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: no s'ha pogut crear el blocatge\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: no s'ha pogut crear: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: no s'ha pogut crear un registre de versió: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: s'ha creat una base de dades de confiança invàlida\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: s'ha creat la base de dades de confiança\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: no es pot escriure en la base de dades de confiança\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: la base de dades de confiança és invàlida\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, 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:619 +#: g10/tdbio.c:622 #, 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:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, 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:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de dades de confiança: ha fallat lseek: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, 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:1182 +#: g10/tdbio.c:1189 #, 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:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: la versió de fitxer %d és invàlida\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error en llegir el registre lliure: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error en escriure el registre de directoris: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, 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:1465 +#: g10/tdbio.c:1470 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 --" @@ -4429,42 +4496,40 @@ msgstr "registre de confiança %lu, tipus msgid "trustdb: sync failed: %s\n" msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 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:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "si us plau, feu un --check-trustdb\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "s'està comprovant la base de dades de confiança\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "no s'ha trobat la clau pública %08lX: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "" -"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n" +msgstr "no s'han trobat claus amb confiança absoluta\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4473,7 +4538,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -5052,19 +5117,19 @@ msgstr "Per favor, solucioneu aquest pos msgid "checking keyring `%s'\n" msgstr "s'està comprovant l'anell «%s»\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "fins ara s'han comprovat %lu claus (%lu signature)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%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:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: s'ha creat l'anell\n" @@ -5107,9 +5172,8 @@ msgid "Is this photo correct (y/N/q)? " msgstr "És aquesta foto correcta (s/N/x)? " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "no s'ha pogut fixar l'exec-path a %s\n" +msgstr "no s'ha pogut mostrar el photo ID!\n" # Execució de programes remots, o execució remota de programes? jm #: g10/exec.c:48 @@ -5168,7 +5232,7 @@ msgstr "AVÍS: no s'ha pogut eliminar el msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "mai " @@ -5264,34 +5328,34 @@ msgstr "" "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n" "disponibles a altres!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Seleccioneu la raó de la revocació:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Cancel·la" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Segurament voleu seleccionar %d ací)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Raó de la revocació: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(No es va donar una descripció)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "És açò correcte? " @@ -5336,6 +5400,9 @@ msgstr "error en trobar el registre de c msgid "read error: %s\n" msgstr "error de lectura: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "aquest servidor de clau no és completament compatible amb HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "" #~ "L'ús d'aquest algoritme està desaconsellat - el voleu crear igualment? " @@ -5487,9 +5554,6 @@ msgstr "error de lectura: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "error al llegir clau primària per al LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: ha fallat search_record: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "clau %08lX: la consulta del registre ha fallat\n" @@ -5502,9 +5566,6 @@ msgstr "error de lectura: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "clau %08lX: les claus pública i secreta no coincideixen\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "no s'ha pogut enumerar les claus secretes: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "clau %08lX.%lu: Enllaç de subclau correcta\n" diff -urpP gnupg-1.2.2/po/cs.po gnupg-1.2.3/po/cs.po --- gnupg-1.2.2/po/cs.po 2003-05-01 14:37:56.000000000 +0000 +++ gnupg-1.2.3/po/cs.po 2003-08-21 20:04:52.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-24 17:50+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -44,7 +44,7 @@ msgstr "ne" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "ukonèit" @@ -271,62 +271,62 @@ msgstr "... toto je chyba v programu (%s msgid "you found a bug ... (%s:%d)\n" msgstr "nalezena chyba v programu ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "nebyl detekován ¾ádný modul pro získání entropie\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "nemohu otevøít `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "nemohu pou¾ít pøíkaz stat na `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' není normální soubor - ignoruji\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "poznámka: soubor random_seed je prázdný\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "VAROVÁNÍ: neplatná velikost random_seed - soubor nepou¾it\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "nemohu èíst `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "poznámka: soubor random_seed není aktualizován\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "nemohu vytvoøit `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "nemohu zapisovat do `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "nemohu zavøít `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "VAROVÁNÍ: pou¾itý generátor náhodných èísel není bezpeèný!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -356,6 +356,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "hashovací algoritmus `%s' je v tomto release read-only\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -365,7 +370,7 @@ msgstr "" "Prosím èekejte, je nutné získat dostatek entropie. Aby jste se nenudili,\n" "mù¾ete na poèítaèi dìlat nìco jiného, zvý¹íte tak kvalitu entropie.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -373,169 +378,169 @@ msgstr "" "@Pøíkazy:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[soubor]|vytvoøit podpis" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[soubor]|vytvoøit podpis v èitelném dokumentu" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "vytvoøit podpis oddìlený od dokumentu" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "¹ifrovat data" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[soubor]|¹ifrovat soubor" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "¹ifrování pouze se symetrickou ¹ifrou" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "pouze ulo¾ení" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "de¹ifrovat data (implicitnì)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[soubor]|de¹ifrovat soubor" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifikovat podpis" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "vypsat seznam klíèù" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "vypsat seznam klíèù a podpisù" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "zkontrolovat podpisy klíèù" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "vypsat seznam klíèù a fingerprintù" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "vypsat seznam tajných klíèù" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "vytvoøit nový pár klíèù" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "odstranit klíè ze souboru veøejných klíèù" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "odstranit klíè ze souboru tajných klíèù" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "podepsat klíè" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "podepsat klíè lokálnì" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "podepsat klíè bez mo¾nosti revokace podpisu" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "" "podepsat klíè lokálnì a bez mo¾nosti\n" " revokace podpisu" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "podepsat nebo modifikovat klíè" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "vytvoøit revokaèní certifikát" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportovat klíèe" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportovat klíèe na server klíèù" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importovat klíèe ze serveru klíèù" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "vyhledat klíèe na serveru klíèù" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "aktualizovat v¹echny klíèe ze serveru klíèù" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importovat/slouèit klíèe" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "vypsat pouze poøadí paketù" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "" "exportovat hodnoty dùvìryhodnosti\n" " vlastníka klíèe" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "" "importovat hodnoty dùvìryhodnosti\n" " vlastníka klíèe" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "aktualizovat databázi dùvìry" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "neinteraktivní aktualizace databáze dùvìry" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "opravit naru¹enou databázi dùvìry" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Dekódovat ASCII soubor nebo std. vstup" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Zakódovat soubor nebo std. vstup do ASCII" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [soubory]|vypi¹ hash" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -545,163 +550,163 @@ msgstr "" "Mo¾nosti:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "vytvoø výstup zakódovaný pomocí ASCII" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|JMÉNO|¹ifrovat pro JMÉNO" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|JMÉNO|pou¾ít JMÉNO jako implicitního adresáta" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "" "pou¾ít implicitní klíè jako implicitního\n" " adresáta" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "pou¾ít tento id u¾ivatele pro podepsání\n" " nebo de¹ifrování" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|nastavit úrovìò komprimace N (0 - ¾ádná\n" " komprimace)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "pou¾ít kanonický textový mód" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "pou¾ít jako výstupní soubor" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "s dodateènými informacemi" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "být o trochu víc tichý" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "vùbec nepou¾ívat terminál" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "vynutit podpisy verze 3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "nevynucovat podpisy verze 3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "vynutit podpisy verze 4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "nevynucovat podpisy verze 4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "pro ¹ifrování v¾dy pou¾ít MDC" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "pro ¹ifrování nikdy nepou¾ít MDC" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "neprovádìt ¾ádné zmìny" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "vy¾ádat potvrzení pøed pøepsáním" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "pou¾ijte gpg-agenta" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "dávkový re¾im: nikdy se na nic neptat" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "automaticky odpovìdìt ANO na vìt¹inu otázek" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "automaticky odpovìdìt NE na vìt¹inu otázek" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "" "pøidat tento soubor klíèù do seznamu\n" " pou¾ívaných souborù klíèù" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "pøidat tento soubor tajných klíèù do seznamu" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "uka¾ ve kterém souboru klíèù je vypsaný klíè" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|JMÉNO|pou¾ij JMÉNO jako implicitní tajný klíè" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "" "|POÈÍTAÈ|pou¾ij tento server klíèù pro vyhledávání\n" " klíèù" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|JMÉNO|nastav znakovou sadu terminálu na JMÉNO" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "èíst nastavení ze souboru" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|zapsat informace o stavu do tohoto FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[SOUBOR]|zapi¹ informaci o stavu do SOUBORu" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KLÍÈ|úplnì dùvìøovat tomuto klíèi" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|SOUBOR|nahrát roz¹iøující modul SOUBOR" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emulovat mód popsaný v RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "nastav v¹echny vlastnosti paketù, ¹ifer\n" " a hashù jako v OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "nastav v¹echny vlastnosti paketù, ¹ifer\n" @@ -751,7 +756,7 @@ msgstr "" "Nastavit pøíkazový øádek k prohlí¾ení\n" " fotografického ID" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -759,7 +764,7 @@ msgstr "" "@\n" "(Pou¾ijte manuálové stránky pro kompletní seznam v¹ech pøíkazù a mo¾ností)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -777,17 +782,17 @@ msgstr "" " --list-keys [jména] vypsat klíèe\n" " --fingerprint [jména] vypsat fingerprinty \n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Chyby oznamte, prosím, na adresu .\n" "Pøipomínky k pøekladu .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -797,7 +802,7 @@ msgstr "" "podepsat, ovìøit, ¹ifrovat nebo de¹ifrovat\n" "implicitní operace závisí na vstupních datech\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -805,321 +810,355 @@ msgstr "" "\n" "Podporované algoritmy:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Veøejný klíè: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "©ifra: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Komprese: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "u¾ití: gpg [mo¾nosti]" -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "konfliktní pøíkazy\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = podpis nalezen v definici skupiny \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROVÁNÍ: vlastnictví adresáøe %s nastaveno nebezpeènì \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "VAROVÁNÍ: pøístupová práva adresáøe %s nejsou nastavena bezpeènì \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitní soubor s mo¾nostmi `%s ignorován'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "soubor s mo¾nostmi `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "ètu mo¾nosti z `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "¹ifra \"%s\" nebyla nahrána, proto¾e pøístupová práva nejsou nastavena " "bezpeènì\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s není platná znaková sada\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "nelze pou¾ít URI serveru klíèù - chyba analýzy URI\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parametr pro import\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "neplatný parametr pro import\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parametr pro export\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "neplatný parametr pro export\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVÁNÍ: %s pøepí¹e %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "Není dovoleno pou¾ívat %s s %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedává s %s smysl!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné " "jako text\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, 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/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "kompresní algoritmus musí být v rozmezí %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "neplatná implicitní úroveò kontroly; musí být 0, 1, 2 nebo 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "neplatné defaultní pøedvolby\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro kompresi\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "pou¾ití %s není v módu %s dovoleno\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "pou¾ití %s není v módu %s dovoleno\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "pou¾ití %s není v módu %s dovoleno\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat databázi dùvìry: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVÁNÍ: specifikován adresát (-r) bez pou¾ití ¹ifrování s veøejným klíèem\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [jméno souboru]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [jméno souboru]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [jméno souboru]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [jméno souboru]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jméno souboru]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jméno souboru]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [jméno souboru]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [jméno souboru]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id u¾ivatele" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ivatele" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ivatele" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ivatele" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ivatele [pøíkazy]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "nelze otevøít %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "aktualizace tajného klíèe selhala: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódování z ASCII formátu selhalo: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódování do ASCII formátu selhalo: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[jméno souboru]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Zaènìte psát svou zprávu ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nelze otevøít `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1127,19 +1166,19 @@ msgstr "" "symbolické jméno smí obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka " "a musí konèit znakem '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "jméno u¾ivatele musí obsahovat znakt '@' \n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pro certifikaèní politiku je neplatné\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pro podepisovací politiku je neplatné\n" @@ -1280,7 +1319,7 @@ msgstr "" "K není pøiøazena ¾ádná hodnota dùvìry:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1338,7 +1377,7 @@ msgstr " s = pøeskoèit tento klíè\n" msgid " q = quit\n" msgstr " u = ukonèit\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Va¹e rozhodnutí? " @@ -1514,91 +1553,91 @@ msgstr "%s: pøeskoèeno: veøejný klíè je msgid "no valid addressees\n" msgstr "¾ádné platné adresy\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "pøedvolba %c%lu není platná\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "duplicita pøedvolby %c%lu\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "pøíli¹ mnoho `%c' pøedvoleb\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "neplatný znak v øetìzci s pøedvolbami\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "zapisuji podpis klíèe jím samým (direct signature)\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "zapisuji podpis klíèe sebou samým\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "zapisuji \"key-binding\" podpis\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná délka klíèe; pou¾iji %u bitù\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "délka klíèe zaokrouhlena na %u bitù\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Prosím, vyberte druh klíèe, který chcete:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA a ElGamal (implicitní)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (pouze pro podpis)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (pouze pro ¹ifrování)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (pro ¹ifrování a podpis)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (pouze pro podpis)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (pouze pro ¹ifrování)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (pro ¹ifrování a podpis)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Vá¹ výbìr? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1608,15 +1647,15 @@ msgstr "" "pøi komunikaci s u¾ivateli PGP. Zvolený algoritmus je velmi pomalý a není \n" "tak bezpeèný jako jiné nabízené algoritmy.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Pøesto vytvoøit? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Neplatný výbìr.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1629,21 +1668,21 @@ msgstr "" " implicitní velikost klíèe je 1024 bitù\n" " nejvy¹¹í navrhovaná velikost klíèe je 2048 bitù\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Jakou velikost klíèe si pøejete? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "Klíè DSA musí mít velikost od 512 do 1024 bitù.\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "velikost klíèe je pøíli¹ malá; minimální dovolená velikost pro RSA je 1024 " "bitù.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" "velikost klíèe je pøíli¹ malá; minimální dovolená velikost je 768 bitù.\n" @@ -1656,12 +1695,12 @@ msgstr "" #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "velikost klíèe je pøíli¹ velká; maximální dovolená hodnota je %d.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1669,11 +1708,11 @@ msgstr "" "Velikosti klíèe vìt¹í jak 2048 bitù se nedoporuèují, proto¾e\n" "výpoèty pak trvají VELMI dlouho!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Opravdu chcete vytvoøit klíè této délky? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1681,17 +1720,17 @@ msgstr "" "Dobøe, ale nezapomeòte, ¾e informace mohou být vyzrazeny z poèítaèe také " "elektromagnetickým vyzaøováním monitoru nebo klávesnice!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná délka klíèe je %u bitù.\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokrouhleno na %u bitù\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1707,7 +1746,7 @@ msgstr "" " 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:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1723,30 +1762,30 @@ msgstr "" " m = doba platnosti podpisu skonèí za n mìsícù\n" " y = doba platnosti podpisu skonèí za n let\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Klíè je platný pro? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Podpis je platný pro? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "platnost %s neskonèí\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "platnost %s skonèí %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1754,11 +1793,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Je to správnì (a/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1774,44 +1813,44 @@ msgstr "" " \"Magda Prochazkova (student) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Jméno a pøíjmení: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Neplatný znak ve jménì\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Jméno nemù¾e zaèínat èíslicí\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Jméno musí být dlouhé alespoò 5 znakù\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Komentáø: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentáøi\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾íváte znakovou sadu `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1822,29 +1861,29 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Do pole jméno nebo komentáø nepi¹te, prosím, e-mailovou adresu.\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "jJkKeEPpUu" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Nejdøív, prosím, opravte chybu\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1852,16 +1891,16 @@ msgstr "" "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "heslo není zopakováno správnì; zkuste to znovu" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1873,7 +1912,7 @@ msgstr "" "tohoto programu s parametrem \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1886,53 +1925,53 @@ msgstr "" "pou¾ívat disky); díky tomu má generátor lep¹í ¹anci získat dostatek " "entropie.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Pár klíèù DSA bude dlouhý 1024 bitù.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Vytváøení klíèe bylo zru¹eno.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisuji veøejný klíè do `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor veøejných klíèù (pubring): %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor tajných klíèù (secring): %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, 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:2285 +#: g10/keygen.c:2305 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:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "klíè oznaèen jako absolutnì dùvìryhodný.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1940,12 +1979,12 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1953,7 +1992,7 @@ msgstr "" "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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1961,25 +2000,25 @@ msgstr "" "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:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Opravdu vytvoøit? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output pro tento pøíkaz není platný\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: nemohu otevøít: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "chyba pøi vytváøení hesla: %s\n" @@ -1988,17 +2027,17 @@ msgstr "chyba pøi vytváøení hesla: %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "v módu S2K nelze pou¾ít symetrický ESK paket\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' je ji¾ zkomprimován\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: VAROVÁNÍ: soubor je prázdný\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete ¹ifrovat pouze RSA klíèem o délce 2048 bitù a ménì\n" @@ -2013,7 +2052,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "algoritmus IDEA nelze pou¾ít pro v¹echny klíèe, pro které ¹ifrujete.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "vy¾ádaná symetrická ¹ifra %s (%d) nevyhovuje pøedvolbám pøíjemce\n" @@ -2028,432 +2067,422 @@ msgstr "vy¾ádaný kompresní algoritmus %s msgid "you may not use %s while in %s mode\n" msgstr "pou¾ití %s není v módu %s dovoleno\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s za¹ifrovaný pro: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "klíè `%s' nenalezen: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "chyba pøi ètení bloku klíèe: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "klíè %08lX: není ve formátu RFC 2440 - pøeskoèeno\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "klíè %08lX: není chránìný - pøeskoèeno\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "klíè %08lX: PGP 2.x klíè - pøeskoèeno\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "pøíli¹ mnoho polo¾ek v bufferu veøejných klíèù - vypnuto\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User ID not found]" # c-format -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Neplatný klíè %08lX zmìnìn na platný pomocí --always-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "existuje tajný klíè pro tento veøejný klíè \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "pou¾ívám sekundární klíè %08lX místo primárního klíèe %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "klíè %08lX: tajný klíè bez klíèe veøejného - pøeskoèeno\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d byl pøeskoèen\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu klíèe byly doposud zpracovány\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pøi ètení `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Celkový poèet zpracovaných klíèù: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " pøeskoèeny nové klíèe: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identifikátorù (user ID): %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importováno: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " beze zmìn: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nové id u¾ivatelù (user ID): %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nové podklíèe: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nové podpisy: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nové revokace klíèù: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " pøeètené tajné klíèe: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " importované tajné klíèe: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "tajné klíèe nezmìnìny: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " neimportováno: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "POZNÁMKA: detekován primární klíè Elgamal - import mù¾e chvilku trvat\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "klíè %08lX: chybí identifikátor u¾ivatele\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "klíè %08lX: HKP po¹kození podklíèe opraveno\n" # c-format -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "klíè %08lX: pøijat id u¾ivatele '%s',který není podepsán jím samým\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "klíè %08lX: chybí platný identifikátor u¾ivatele\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "klíè %08lX: veøejný klíè nenalezen: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "klíè %08lX: nový klíè - pøeskoèen\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor klíèù (keyring): %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "zapisuji do '%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "chyba pøi zápisu souboru klíèù (keyring) `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "klíè %08lX: veøejný klíè \"%s\" importován\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "klíè %08lX: neodpovídá na¹í kopii\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "klíè %08lX: nemohu najít originální blok klíèe: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "klíè %08lX: nemohu èíst originální blok klíèe: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "klíè %08lX: \"%s\" 1 nový identifikátor u¾ivatele\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "klíè %08lX: \"%s\" %d nových identifikátorù u¾ivatele\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "klíè %08lX: \"%s\" 1 nový podpis\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "klíè %08lX: \"%s\" %d nových podpisù\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "klíè %08lX: \"%s\" 1 nový podklíè\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "klíè %08lX: \"%s\" %d nových podklíèù\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "klíè %08lX: \"%s\" beze zmìn\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "klíè %08lX: tajný klíè s neplatnou ¹ifrou %d - pøeskoèeno\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "není nastaven implicitní soubor tajných klíèù %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "klíè %08lX: tajný klíè importován\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "klíè %08lX: je ji¾ v souboru tajných klíèù\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "klíè %08lX: nenalezen tajný klíè: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "klíè %08lX: chybí veøejný klíè - nemohu aplikovat revokaèní certifikát\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - zamítnuto\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "klíè %08lX: \"%s\" revokaèní certifikát importován\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "klíè %08lX: neexistuje id u¾ivatele pro podpis\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "klíè %08lX: nepodporovaný algoritmus veøejného klíèe u u¾ivatelského id \"%s" "\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "" "klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "klíè %08lX: nepodporovaný algoritmus veøejného klíèe\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "klíè %08lX: neplatná vazba podklíèe\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "klíè %08lX: smazána vícenásobná vazba podklíèe\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "klíè %08lX: neexistuje podklíè pro revokaci klíèe\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "klíè %08lX: neplatný revokaèní podklíè\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "klíè %08lX: smazána vícenásobná revokace podklíèe\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "klíè %08lX: identifikátor u¾ivatele pøeskoèen '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "klíè %08lX: podklíè pøeskoèen\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "klíè %08lX: podpis není exportovatelný (tøída %02x) - pøeskoèeno\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "klíè %08lX: revokaèní certifikát na ¹patném místì - pøeskoèeno \n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - pøeskoèen\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "klíè %08lX: podpis podklíèe na ¹patném místì - pøeskoèeno \n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "klíè %08lX: neoèekávaná podpisová tøída (0x%02X) - pøeskoèeno\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "klíè %08lX: objeven duplikovaný identifikátor u¾ivatele - slouèen\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "VAROVÁNÍ: klíè %08lX mù¾e být revokován: zkou¹ím získat revokaèníklíè %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "VAROVÁNÍ: klíè %08lX mù¾e být revokován: revokaèní klíè %08lX nenalezen.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "klíè %08lX: \"%s\" pøidán revokaèní certifikát\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "klíè %08lX: podpis klíèe jím samým (direct key signature)\n" @@ -2466,29 +2495,29 @@ msgstr "[revokace]" msgid "[self-signature]" msgstr "[podpis klíèe jím samým]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 ¹patný podpis\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d ¹patných podpisù\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 podpis neovìøen, proto¾e chybí klíè\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d podpisù neovìøených, proto¾e chybí klíè\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 podpis neovìøen, proto¾e vznikla chyba\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d podpisù neovìøených, proto¾e vznikly chyby\n" @@ -2507,20 +2536,27 @@ msgstr "objeveno %d identifikátorù u¾iva msgid "User ID \"%s\" is revoked." msgstr "U¾ivatelské ID \"%s\" je revokováno." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Jste si jistý(á), ¾e stále chcete podepsat tento klíè? (a/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Nelze podepsat.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "U¾ivatelské ID \"%s\" je revokováno." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "VAROVÁNÍ: ID u¾ivatele \"%s\" není podepsáno jím samým\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2529,11 +2565,11 @@ msgstr "" "Podpis klíèe \"%s\" jím samým je\n" "podpis formátu PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Pøejete si jej zmìnit na formát OpenPGP? (a/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2543,14 +2579,14 @@ msgstr "" "vypr¹ela.\n" "\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" "Chcete vytvoøit nový podpis a nradit jím ten, jeho¾ platnost vypr¹ela? (a/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2560,54 +2596,54 @@ msgstr "" "je pouze lokální.\n" "\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" je ji¾ lokálnì podepsán klíèem %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" je ji¾ podepsán klíèem %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Chcete klíè pøesto znova podepsat? (a/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nic k podepsání klíèem %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Platnost klíèe vypr¹ela!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Platnost klíèe vypr¹í %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Chcete, aby platnost Va¹eho podpisu vypr¹ela ve stejnou dobu? (A/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "Nemù¾ete udìlat OpenPGP podpis klíèe typu PGP 2.x, kdy¾ jste v --pgp2 módu.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "To by zpùsobilo nepou¾itelnost klíèe v PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2617,31 +2653,35 @@ msgstr "" "patøí vý¹e uvedené osobì.\n" "Pokud neznáte odpovìï, zadejte \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Neodpovím.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (implicitnì)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Nijak jsem to nekontroloval(a).%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Èásteènì jsem to ovìøil(a).%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Velmi peèlivì jsem to ovìøil(a).%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2649,7 +2689,7 @@ msgstr "" "Jste si jistý(á), ¾e chcete podepsat tento klíè\n" "svým klíèem: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2657,7 +2697,7 @@ msgstr "" "\n" "Jedná se o podpis klíèe jím samým\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2665,7 +2705,7 @@ msgstr "" "\n" "VAROVÁNÍ: podpis nebude oznaèen jako neexportovatelný.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2673,7 +2713,7 @@ msgstr "" "\n" "VAROVÁNÍ: podpis nebude oznaèen jako neodvolatelný (non-revocable).\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2681,7 +2721,7 @@ msgstr "" "\n" "Podpis bude oznaèen jako neexportovatelný.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2689,7 +2729,7 @@ msgstr "" "\n" "Podpis bude oznaèen jako neodvolatelný (non-revocable).\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2697,7 +2737,7 @@ msgstr "" "\n" "Nijak jsem tento klíè neovìøil.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2705,7 +2745,7 @@ msgstr "" "\n" "Èásteènì jsem ovìøil tento klíè.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2713,34 +2753,34 @@ msgstr "" "\n" "Velmi peèlivì jsem ovìøil tento klíè.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Skuteènì podepsat? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "podepsání selhalo: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Tento klíè není chránìný.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Tajné èásti primárního klíèe nejsou dostupné.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Klíè je chránìný.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Není mo¾né editovat tento klíè: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2748,7 +2788,7 @@ msgstr "" "Vlo¾te nové heslo (passphrase) pro tento tajný klíè.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2756,493 +2796,493 @@ msgstr "" "Nechcete heslo - to *není* dobrý nápad!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Opravdu to chcete udìlat? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "pøesunuji podpis klíèe na správné místo\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "ukonèit toto menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "u" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "ulo¾it" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "ulo¾it a ukonèit" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "ukázat tuto pomoc" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "vypsat fingerprint" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "vypsat seznam klíèù a id u¾ivatelù" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "vyberte identifikátor u¾ivatele N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "vyberte sekundární klíè N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "vypsat seznam podpisù" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "podepsat klíè" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "podepsat klíè lokálnì" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "podepsat klíè lokálnì a bez mo¾nosti odvolat podpis (non-revocably)" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "pøidat identifikátor u¾ivatele" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "pøidat fotografický ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "smazat identifikátor u¾ivatele" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "pøidat sekundární klíè" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "smazat sekundární klíè" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "pøidat revokaèní klíè" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "smazat podpisy" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "zmìnit dobu platnosti" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "oznaèit u¾ivatelské ID jako primární" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "vypsat seznam pøedvoleb (pro experty)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "vypsat seznam pøedvoleb (podrobnì)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "nastavit seznam pøedvoleb" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "aktualizovat pøedvolby" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "zmìnit heslo" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "zmìnit dùvìryhodnost vlastníka klíèe" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revokovat podpisy" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "odvolat platnost id u¾ivatele" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revokovat sekundární klíè" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "nastavit klíè jako neplatný (disable)" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "nastavit klíè jako platný (enable)" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "ukázat fotografický ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "nelze provést v dávkovém módu\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "chyba pøi ètení bloku tajného klíèe `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Tajný klíè je dostupný.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Pøíkaz> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Pro provedení této operace je potøeba tajný klíè.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Klíè revokován." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Opravdu podepsat v¹echny id u¾ivatele? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento pøíkaz není v módù %s dovolený.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Musíte vybrat alespoò jeden id u¾ivatele.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Opravdu odstranit tento id u¾ivatele? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Musíte vybrat alespoò jeden klíè.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Opravdu chcete smazat vybrané klíèe? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Opravdu chcete smazat tento klíè? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Opravdu odstranit tento id u¾ivatele? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Opravdu chcete revokovat vybrané klíèe? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Opravdu chcete revokovat tento klíè? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Opravdu aktualizovat pøedvolby pro vybraný id u¾ivatele? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Opravdu aktualizovat pøedvolby? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Ulo¾it zmìny? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Ukonèit bez ulo¾ení? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "aktualizace selhala: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizace tajného klíèe selhala: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 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:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný pøíkaz (zkuste \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Hash: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Vlastnosti: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Tento klíè mù¾e být revokován klíèem %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "(citlivá informace)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX vytvoøen: %s platnost skonèí: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "dùvìra: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Tento klíè byl oznaèen za neplatný (disabled)" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! podklíè byl revokován: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- nalezena padìlaná revokace\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problém ovìøení revokace: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3250,7 +3290,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3259,45 +3305,45 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Smazat tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Smazat tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Smazat tento neznámý podpis? (a/N/u)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Smazán %d podpis.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Smazáno %d podpisù.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nic nebylo smazáno.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3306,84 +3352,84 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "klíè nelze povìøit revokací jím samým\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "klíè nelze povìøit revokací jím samým\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 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:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Mìním dobu platnosti sekundárního klíèe.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Mìním dobu platnosti primárního klíèe.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "V souboru tajných klíèù chybí odpovídající podpis\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundární klíè s indexem %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "id u¾ivatele: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3392,7 +3438,7 @@ msgstr "" "\"\n" "podepsáno Va¹ím klíèem %08lX v %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3401,56 +3447,56 @@ msgstr "" "\"\n" "lokálnì podepsáno Va¹ím klíèem %08lX v %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Podepsal(a) jste následující identifikátory u¾ivatele:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " podepsáno %08lX v %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revokováno %08lX v %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte se revokovat tyto podpisy:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " podepsáno %08lX v %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (neexportovatelné)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "neexistuje tajný klíè\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n" @@ -3459,69 +3505,69 @@ msgstr "U¾ivatelské ID \"%s\" je ji¾ rev #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Zobrazuji %s fotografický ID o velikosti %ld pro klíè 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kritická podepisovací politika: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Podepisovací politika: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Kritická podepisovací notace: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Podepisovací notace: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "není v pøímo èitelném formátu" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "soubor klíèù (keyring)" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [platnost skonèí: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Primární fingerprint klíèe:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Primární fingerprint klíèe:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Fingerprint klíèe =" @@ -3609,105 +3655,114 @@ msgstr "POZNÁMKA: odesílatel po¾adoval ( msgid "original file name='%.*s'\n" msgstr "pùvodní jméno souboru='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "samostatný revokaèní certifikát - pou¾ijte \"gpg --import\", chcete-li jej " "u¾ít\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notace: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Politika: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verifikace podpisu potlaèena\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "neumím pracovat s tìmito násobnými podpisy\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" "Podpis vytvoøen %.*s pomocí %s klíèe s identifikátorem u¾ivatele %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Pomoc není k dispozici" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "©PATNÝ podpis od \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Podpis s vypr¹enou platností od \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Dobrý podpis od \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[nejistý] " -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s podpis od: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "neznámá verze" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Nemohu ovìøit podpis: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "toto není podpis oddìlený od dokumentu\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "samostatný podpis tøídy 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starého typu (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "nalezen neplatný koøenový paket v proc_tree()\n" @@ -3736,75 +3791,80 @@ msgid "" msgstr "" "více informací naleznete v dokumentu http://www.gnupg.cz/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: pou¾ití parametru \"%s\" se nedoporuèuje\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, 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:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "pou¾ijte místo nìj \"%s%s\" \n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, 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/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent není v tomto sezení dostupný\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "nemohu nastavit PID klienta pro gpg-agenta\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "nelze získat server read file descriptor pro agenta r\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "nezle získat server write file descriptor pro agenta\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verze %d není podporován\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemohu se pøipojit k `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentem - pou¾ívání agenta vypnuto\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavní ID klíèe %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3815,32 +3875,32 @@ msgstr "" "\"%.*s\"\n" "Klíè o délce %u bitù, typ %s, ID %08lX, vytvoøený %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Opakovat heslo\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Vlo¾it heslo\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "heslo je pøíli¹ dlouhé\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "neplatná reakce od agenta\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "zru¹eno u¾ivatelem\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentem: agent vrací 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3850,20 +3910,20 @@ msgstr "" "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n" "u¾ivatele: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "délka %u bitù, typ %s, klíè %08lX, vytvoøený %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -3957,8 +4017,8 @@ msgid "failed sending to `%s': status=%u msgstr "chyba odeslání na `%s': (status=%u)\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "tento keyserver není plnì kompatibilní s HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3998,11 +4058,11 @@ msgstr "" "generuji _nevhodný_ 16-ti bitový kontrolní souèet pro ochranu soukromého " "klíèe\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávì\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4011,17 +4071,17 @@ msgstr "" "klíè %08lX: toto je klíè algoritmu ElGamal vygenerovaný v PGP - podpisy jím " "vytvoøené NEJSOU bezpeèné!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "veøejný klíè %08lX je o %lu sekund novìj¹í ne¾ podpis\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "veøejný klíè %08lX je o %lu sekund novìj¹í ne¾ podpis\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4030,7 +4090,7 @@ msgstr "" "klíè %08lX byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4039,50 +4099,55 @@ msgstr "" "klíè %08lX byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "POZNÁMKA: podpisovému klíèi %08lX skonèila platnost %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "pøedpokládám ¹patný podpis klíèem %08lX, proto¾e je nastaven neznámý " "kritický bit\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "klíè %08lX: neexistuje podklíè pro revokaci podklíèe\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "VAROVÁNÍ: nelze %%-expandovat notaci (pøíli¹ dlouhé). Pou¾ity " "neexpandované.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4111,12 +4176,12 @@ msgstr "" "v módu --pgp2 mù¾ete vytvoøit pouze oddìlený podpis (detach-sign)s klíèi " "formátu PGP-2.x\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s: nemohu vytvoøit: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "vy¾ádaný hashovací algoritmus %s (%d) nevyhovuje pøedvolbám pøíjemce\n" @@ -4130,7 +4195,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "v módu --pgp2 mù¾ete vytváøet jen èitelné podpisy s klíèi formátu PGP-2.x\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "bude pou¾ito ¹ifrování %s\n" @@ -4145,12 +4210,12 @@ msgstr "nemohu pracovat s øádky del¹ími msgid "input line longer than %d characters\n" msgstr "vstupní øádek je del¹í ne¾ %d znakù\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4159,122 +4224,122 @@ msgstr "záznam v databázi dùvìry %lu: zá msgid "trustdb transaction too large\n" msgstr "transakce s databází dùvìry je pøíli¹ dlouhá\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: nemohu pøistoupit k: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: adresáø neexistuje!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: nemohu vytvoøit zámek\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: nemohu zamknout\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: nemohu vytvoøit: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: nepodaøilo se vytvoøit záznam verze: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: vytvoøena neplatná databáze dùvìry\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: databáze dùvìry vytvoøena\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "POZNÁMKA: do trustedb nezle zapisovat\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: neplatná databáze dùvìry\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nepodaøilo se vytvoøit hashovací tabulku: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: chyba pøi aktualizaci záznamu verze: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: chyba pøi ètení záznamu verze: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "databáze dùvìry: procedura lseek() selhala: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: není soubor databáze dùvìry\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: záznam verze s èíslem %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: neplatná verze souboru %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, 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:1380 +#: g10/tdbio.c:1385 #, 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:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: vynulování záznamu selhalo: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: pøidání záznamu selhalo: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 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" @@ -4324,39 +4389,39 @@ msgstr "záznam dùvìry %lu, typ %d: zápis msgid "trustdb: sync failed: %s\n" msgstr "databáze dùvìry: synchronizace selhala %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "není nutné kontrolovat databázi dùvìry\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹í kontrola databáze dùvìry v %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "kontroluji databázi dùvìry\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "veøejný klíè %08lX nebyl nalezen: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %08lX nebyl nalezen\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %08lX nebyl nalezen\n" @@ -4364,7 +4429,7 @@ msgstr "veøejný klíè k absolutnì dùvìryh #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "kontrola v hloubce %d podepsáno=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4919,17 +4984,17 @@ msgstr "Prosím, opravte tento mo¾ný bezp msgid "checking keyring `%s'\n" msgstr "kontroluji soubor klíèù (keyring) `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu klíèù ji¾ zkontrolováno (%lu podpisù)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu klíèù zkontrolován (%lu podpisù)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: soubor klíèù (keyring) vytvoøen\n" @@ -5031,7 +5096,7 @@ msgstr "VAROVÁNÍ: nelze smazat doèasný s msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROVÁNÍ: nelze smazat doèasný adresáø `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "nikdy " @@ -5127,33 +5192,33 @@ msgstr "" "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:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Prosím vyberte dùvod revokace:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Zru¹it" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Pravdìpodobnì zda chcete vybrat %d)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Dùvod revokace: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Nebyl zadán ®ádný popis)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Je dùvod revokace vybrán správnì? " @@ -5197,3 +5262,6 @@ msgstr "chyba pøi hledání záznamu dùvìry #, c-format msgid "read error: %s\n" msgstr "chyba pøi ètení: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "tento keyserver není plnì kompatibilní s HKP\n" diff -urpP gnupg-1.2.2/po/da.po gnupg-1.2.3/po/da.po --- gnupg-1.2.2/po/da.po 2003-05-01 14:37:58.000000000 +0000 +++ gnupg-1.2.3/po/da.po 2003-08-21 20:04:54.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2000-03-07 22:51+01:00\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -48,7 +48,7 @@ msgstr "n" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "afslut" @@ -278,62 +278,62 @@ msgstr "... dette er en fejl (%s:%d:%s)\ msgid "you found a bug ... (%s:%d)\n" msgstr "du fandt en fejl ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, fuzzy, c-format msgid "can't stat `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" -#: cipher/random.c:409 +#: cipher/random.c:415 #, fuzzy, c-format msgid "can't read `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "kan ikke oprette %s: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, fuzzy, c-format msgid "can't write `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, fuzzy, c-format msgid "can't close `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "ADVARSEL: bruger usikker tilfældig-nummer-generator!!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -363,6 +363,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -370,7 +375,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -378,170 +383,170 @@ msgstr "" "@Kommandoer:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[filer]|opret en signatur" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[filer]|opret rentekst signatur" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "opret en separat signatur" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "kryptér data" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "kryptér kun med symmetriske cifre" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "gem kun" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "afkryptér data (standard)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "godkend en signatur" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "vis nøgler" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "vis nøgler og signaturer" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "tjek nøglesignaturer" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "vis nøgle og fingeraftryk" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "vis hemmelige nøgler" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "generér et nyt nøglepar" -#: g10/g10.c:327 +#: g10/g10.c:325 #, fuzzy msgid "remove keys from the public keyring" msgstr "fjern nøgle fra den offentlige nøglering" -#: g10/g10.c:329 +#: g10/g10.c:327 #, fuzzy msgid "remove keys from the secret keyring" msgstr "fjern nøgle fra den hemmelige nøglering" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "signér en nøgle" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "signér en nøgle lokalt" -#: g10/g10.c:332 +#: g10/g10.c:330 #, fuzzy msgid "sign a key non-revocably" msgstr "signér en nøgle lokalt" -#: g10/g10.c:333 +#: g10/g10.c:331 #, fuzzy msgid "sign a key locally and non-revocably" msgstr "signér en nøgle lokalt" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "signér eller redigér en nøgle" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "Generér en annullérbar certifikat" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "eksportér nøgler" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "eksportér nøgler til en nøgletjener" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importér nøgler fra en nøgleserver" -#: g10/g10.c:341 +#: g10/g10.c:339 #, fuzzy msgid "search for keys on a key server" msgstr "eksportér nøgler til en nøgletjener" -#: g10/g10.c:343 +#: g10/g10.c:341 #, fuzzy msgid "update all keys from a keyserver" msgstr "importér nøgler fra en nøgleserver" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importér/fusionér nøgler" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "vis kun pakkesekvensen" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "eksportér ejertillidsværdierne" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importér ejertillidsværdierne" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "opdatér tillidsdatabasen" -#: g10/g10.c:357 +#: g10/g10.c:355 #, fuzzy msgid "unattended trust database update" msgstr "opdatér tillidsdatabasen" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "reparér en ødelagt tillidsdatabase" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "De-beskydt en fil el. stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Beskydt en fil el. stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [filer]|print meddelelsesresumé" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -551,156 +556,156 @@ msgstr "" "Indstillinger:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "opret ascii beskyttet uddata" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAME|kryptér for NAME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAME|brug NAME som standard modtager" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "brug standard nøglen som standard modtager" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "brug denne bruger-id til at signere eller dekryptere" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|sæt kompresningsniveau N (0 = slået fra)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "brug kanonisk tekstmodus" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "brug som uddatafil" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "meddelsom" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "vær mere stille" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "brug overhovedet ikke terminalen" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "tving v3 signaturer" -#: g10/g10.c:398 +#: g10/g10.c:396 #, fuzzy msgid "do not force v3 signatures" msgstr "tving v3 signaturer" -#: g10/g10.c:399 +#: g10/g10.c:397 #, fuzzy msgid "force v4 key signatures" msgstr "tving v3 signaturer" -#: g10/g10.c:400 +#: g10/g10.c:398 #, fuzzy msgid "do not force v4 key signatures" msgstr "tving v3 signaturer" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "brug altid en MDC for kryptering" -#: g10/g10.c:403 +#: g10/g10.c:401 #, fuzzy msgid "never use a MDC for encryption" msgstr "brug altid en MDC for kryptering" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "lav ingen ændringer" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "kørselsmodus: spørg aldrig" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "forvent ja til de fleste sprøgsmål" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "forvent nej til de fleste sprøgsmål" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "tilføj denne nøglering til nøgleringslisten" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "tilføj denne hemmeligenøglering til listen" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|brug NAME som standard hemmelignøgle" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|brug denne nøgletjener til at slå nøgler op" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|sæt terminal karaktersæt til NAME" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "læs indstillinger fra fil" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|skriv statusinfo til denne FD" -#: g10/g10.c:428 +#: g10/g10.c:426 #, fuzzy msgid "|[file]|write status info to file" msgstr "|FD|skriv statusinfo til denne FD" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FILE|indlæs udvidelsesmodul FILE" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emulér modusen beskrevet i RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard" -#: g10/g10.c:444 +#: g10/g10.c:448 #, fuzzy msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard" @@ -745,13 +750,13 @@ msgstr "" msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -771,16 +776,16 @@ msgstr "" " --list-keys [navne] vis nøgler\n" " --fingerprint [navne] vis fingeraftryk\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Rapportér venligst fejl til .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Brug: gpg [flag] [filer] (-h for hjælp)" # Skal alt dette oversættes eller er det flagene? -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -790,7 +795,7 @@ msgstr "" "sign, check, encrypt eller decrypt\n" "standard operation afhænger af inddata\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -798,348 +803,382 @@ msgstr "" "\n" "Understøttede algoritmer:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 #, fuzzy msgid "Compression: " msgstr "Kommentar: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "brug: gpg [flag] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "konfliktende kommandoer\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "alternativfil`%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 #, fuzzy msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 #, fuzzy msgid "invalid default preferences\n" msgstr "vis præferencer" -#: g10/g10.c:1948 +#: g10/g10.c:1927 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis præferencer" -#: g10/g10.c:1952 +#: g10/g10.c:1931 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis præferencer" -#: g10/g10.c:1956 +#: g10/g10.c:1935 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis præferencer" +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" + # er det klogt at oversætte TrustDB? -#: g10/g10.c:2042 +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "kan ikke åbne %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [nøglering]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "påklædning af beskyttelse fejlede: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "påklædning af beskyttelse fejlede: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "påklædning af beskyttelse fejlede: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "signering fejlede: %s\n" + +#: g10/g10.c:2365 +#, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[filnavn]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Gå til sagen og skriv meddelelsen ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan ikke åbne `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:2824 +#: g10/g10.c:2876 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" @@ -1282,7 +1321,7 @@ msgstr "" "Ingen tillidsværdi tildelt til %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1336,7 +1375,7 @@ msgstr "" msgid " q = quit\n" msgstr " q = afslut\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Dit valg? " @@ -1507,109 +1546,109 @@ msgstr "%s: udelod: offentlignøgle er sl msgid "no valid addressees\n" msgstr "ingen gyldige adresser\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, fuzzy, c-format msgid "too many `%c' preferences\n" msgstr "vis præferencer" -#: g10/keygen.c:273 +#: g10/keygen.c:278 #, fuzzy msgid "invalid character in preference string\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 #, fuzzy msgid "writing direct signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "rundet op til %u bit\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 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:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA og ElGamal (standard)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (signér kun)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (signér og kryptér)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, fuzzy, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) DSA (signér kun)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, fuzzy, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) ElGamal (signér og kryptér)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Dit valg? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 #, fuzzy msgid "Create anyway? " msgstr "Brug denne nøgle alligevel? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Ugyldigt valg.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1618,19 +1657,19 @@ msgid "" " highest suggested keysize is 2048 bits\n" msgstr "" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Hvilken nøglestørrelse ønsker du? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" @@ -1642,38 +1681,38 @@ msgstr "" #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" msgstr "" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "rundet op til %u bit\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1683,7 +1722,7 @@ msgid "" " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1693,42 +1732,42 @@ msgid "" " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 #, fuzzy msgid "Signature is valid for? (0) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "ugyldig værdi\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, fuzzy, c-format msgid "%s does not expire at all\n" msgstr "Nøglen udløber aldrig\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, fuzzy, c-format msgid "%s expires at %s\n" msgstr "Nøgle udløber d. %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Er dette korrekt (j/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1738,44 +1777,44 @@ msgid "" "\n" msgstr "" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Rigtige navn: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Navn må ikke starte med et tal\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Navn skal være mindst 5 bogstaver langt\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Epostadresse: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Ikke en gyldig epostadresse\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Ugyldigt tegn i kommentar\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du bruger '%s' tegnsættet.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1786,28 +1825,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 #, 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1815,17 +1854,17 @@ msgstr "" "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1833,7 +1872,7 @@ msgid "" "\n" msgstr "" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1841,94 +1880,94 @@ msgid "" "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA nøglepar vil have 1024 bit.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Nøgleoprettelse annulleret.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Vil du virkelig oprette?" -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kan ikke åbne: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "fejl ved oprettelse af kodesætning: %s\n" @@ -1937,17 +1976,17 @@ msgstr "fejl ved oprettelse af kodesætni msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ADVARSEL: tom fil\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" @@ -1961,7 +2000,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -1976,423 +2015,413 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "" -#: g10/encode.c:753 +#: g10/encode.c:748 #, fuzzy, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s krypteret for: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, fuzzy, c-format msgid "key `%s' not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, fuzzy, c-format msgid "error reading keyblock: %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/export.c:238 +#: g10/export.c:205 #, fuzzy, c-format msgid "key %08lX: not protected - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/export.c:246 +#: g10/export.c:213 #, fuzzy, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ADVARSEL: intet blev eksporteret\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 #, fuzzy msgid "[User id not found]" msgstr "[bruger ikke fundet]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "sprang over blok af typen %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu nøgler behandlet indtil nu\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Totalt antal behandlede: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, fuzzy, c-format msgid " skipped new keys: %lu\n" msgstr " nye undernøgler: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importerede: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " uændrede: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nye bruger-id'er: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nye undernøgler: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nye signaturer: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nye nøgletilbagekald: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " hemmelige nøgler læst: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "hemmelige nøgler import: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "hemmelige nøgler uændre: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importerede: %lu" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:634 +#: g10/import.c:587 #, fuzzy, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:649 +#: g10/import.c:602 #, fuzzy, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, fuzzy, c-format msgid "key %08lX: new key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:683 +#: g10/import.c:634 #, fuzzy, c-format msgid "no writable keyring found: %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "skriver til `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, fuzzy, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "nøgle %08lX: stemmer ikke med vores kopi\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "nøgle %08lX: kan ikke lokalisere original nøgleblok: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "nøgle %08lX: kan ikke læse original nøgleblok: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:788 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:791 +#: g10/import.c:742 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:794 +#: g10/import.c:745 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:797 +#: g10/import.c:748 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:800 +#: g10/import.c:751 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:819 +#: g10/import.c:770 #, fuzzy, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:881 +#: g10/import.c:832 #, fuzzy, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:896 +#: g10/import.c:847 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "ingen standard offentlig nøglering\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" -#: g10/import.c:1021 +#: g10/import.c:972 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "Generér en annullérbar certifikat" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "" -#: g10/import.c:1097 +#: g10/import.c:1050 #, fuzzy, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, fuzzy, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "" -#: g10/import.c:1155 +#: g10/import.c:1113 #, fuzzy, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" -#: g10/import.c:1299 +#: g10/import.c:1262 #, fuzzy, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, fuzzy, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -#: g10/import.c:1535 +#: g10/import.c:1500 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %08lX: direct key signature added\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" @@ -2405,29 +2434,29 @@ msgstr "" msgid "[self-signature]" msgstr "[selv-signatur]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 dårlig signature\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d dårlige signaturer\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "" @@ -2446,935 +2475,952 @@ msgstr "" msgid "User ID \"%s\" is revoked." msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "" #: g10/keyedit.c:382 #, fuzzy, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +msgid "User ID \"%s\" is expired." +msgstr "Nøglen er beskyttet.\n" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 #, fuzzy msgid "This key has expired!" msgstr "Bemærk: Denne nøgle er forældet!\n" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, fuzzy, c-format msgid "This key is due to expire on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 #, fuzzy msgid " (default)" msgstr "(standard er 1)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr "" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr "" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr "" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 #, fuzzy msgid "" "\n" "This will be a self-signature.\n" msgstr "skriver selvsignatur\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" msgstr "" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" msgstr "" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" msgstr "" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" msgstr "" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 #, fuzzy msgid "Secret parts of primary key are not available.\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Kan ikke redigere denne nøgle: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "afslut denne menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "a" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "gem" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "gem og afslut" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "hjælp" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "vis denne hjælp" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "vis fingeraftryk" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "vis" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "vis nøgler og bruger-id'er" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "nøgle" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "vælg sekundær nøgle N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "tjek" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "vis signaturer" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "signér" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "signér nøglen" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsignér" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "signér nøglen lokalt" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "nrsign" msgstr "signér" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "sign the key non-revocably" msgstr "signér nøglen lokalt" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "nrlsign" msgstr "signér" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "sign the key locally and non-revocably" msgstr "signér nøglen lokalt" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "aflus" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "tilføj-bid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 #, fuzzy msgid "add a photo ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "sletbid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "slet bruger id" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "tilføj nøgle" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "sletnøgle" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "slet sekundær nøgle" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "addrevoker" msgstr "tilføj nøgle" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "add a revocation key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "sletsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "slet signaturer" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "udløb" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "ændr udløbsdatoen" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "skift" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "skift imellem hemmelig og offentlig nøgle visning" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "s" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "præf" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 #, fuzzy msgid "list preferences (expert)" msgstr "vis præferencer" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "showpref" msgstr "vispræf" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "list preferences (verbose)" msgstr "vis præferencer" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "setpref" msgstr "præf" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "set preference list" msgstr "vis præferencer" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updpref" msgstr "præf" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updated preferences" msgstr "vis præferencer" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "kodeord" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "ændr kodesætningen" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "betro" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revuid" msgstr "sletbid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revoke a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "slåfra" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "slå nøgle fra" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "slåtil" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "slå nøgle til" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, fuzzy, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "" -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 #, fuzzy msgid "Key is revoked." msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "" -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "" -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "" -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "" -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 #, fuzzy msgid "Really revoke this user ID? " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "" -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Gem ændringer? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Afslut uden at gemme? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, fuzzy, c-format msgid "This key may be revoked by %s key " msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! undernøgle er blevet annulleret! %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 #, fuzzy msgid "rev- faked revocation found\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "tilføj nøgle" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "udløb" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 #, 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:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettede %d signatur.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Indtast nøglens størrelse" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, 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:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen sekundær nøgle med indeks %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "bruger-id: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" "locally signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 #, 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:3052 +#: g10/keyedit.c:3128 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Generér en annullérbar certifikat" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr "" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr "" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Nøglen er beskyttet.\n" @@ -3383,74 +3429,74 @@ msgstr "Nøglen er beskyttet.\n" #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 #, fuzzy msgid "Critical signature policy: " msgstr "%s signatur fra: %s\n" -#: g10/keylist.c:93 +#: g10/keylist.c:114 #, fuzzy msgid "Signature policy: " msgstr "%s signatur fra: %s\n" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "" -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "" -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Nøgle udløber d. %s\n" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 #, fuzzy msgid "Primary key fingerprint:" msgstr "vis nøgle og fingeraftryk" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 #, fuzzy msgid " Primary key fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 #, fuzzy msgid " Key fingerprint =" msgstr " Fingeraftryk:" @@ -3536,103 +3582,112 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "" -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Politik: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 #, fuzzy msgid "can't handle these multiple signatures\n" msgstr "opret en separat signatur" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Ingen hjælp tilgængelig" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "DÅRLIG signatur fra \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 #, fuzzy msgid "Expired signature from \"" msgstr "God signatur fra \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "God signatur fra \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signatur fra: %s\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 msgid "binary" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "ukendt version" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan ikke tjekke signatur: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 #, fuzzy msgid "not a detached signature\n" msgstr "opret en separat signatur" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "gammeldags (PGP 2.x) signatur\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -3658,75 +3713,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "" -#: g10/misc.c:509 +#: g10/misc.c:533 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "valgte cifferalgoritme %d er ugyldig\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (hovednøgle-ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3734,54 +3794,54 @@ msgid "" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 #, fuzzy msgid "Repeat passphrase\n" msgstr "Gentag kodesætning: " -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 #, fuzzy msgid "Enter passphrase\n" msgstr "Indtast kodesætning: " -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -3874,7 +3934,7 @@ msgid "failed sending to `%s': status=%u msgstr "" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" +msgid "this keyserver does not support --search-keys\n" msgstr "" #: g10/hkp.c:519 @@ -3915,78 +3975,83 @@ msgstr "" msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " "signatures!\n" msgstr "" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, fuzzy, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, fuzzy, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " "problem)\n" msgstr "" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " "problem)\n" msgstr "" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, fuzzy, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4011,12 +4076,12 @@ msgstr "ADVARSEL: '%s' er en tom fil\n" msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "kan ikke oprette %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4029,7 +4094,7 @@ msgstr "signerer:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "" @@ -4044,12 +4109,12 @@ msgstr "" msgid "input line longer than %d characters\n" msgstr "" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -4058,122 +4123,122 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, fuzzy, c-format msgid "%s: can't make lock\n" msgstr "%s: kan ikke åbne: %s\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" @@ -4222,39 +4287,39 @@ msgstr "" msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 #, fuzzy msgid "checking the trustdb\n" msgstr "|[NAMES]|tjek tillidsdatabasen" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, fuzzy, c-format msgid "public key %08lX not found: %s\n" msgstr "offentlig nøgle ikke fundet" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4262,7 +4327,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4700,17 +4765,17 @@ msgstr "" msgid "checking keyring `%s'\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, fuzzy, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu nøgler behandlet indtil nu\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, fuzzy, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "vis nøgler og signaturer" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "" @@ -4806,7 +4871,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -4898,34 +4963,34 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Brug denne nøgle alligevel? " diff -urpP gnupg-1.2.2/po/de.po gnupg-1.2.3/po/de.po --- gnupg-1.2.2/po/de.po 2003-05-01 14:38:00.000000000 +0000 +++ gnupg-1.2.3/po/de.po 2003-08-21 20:04:57.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-05-01 11:58+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-07-30 14:48+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ msgstr "nein" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "quit" @@ -274,63 +274,63 @@ msgstr "... dies ist ein Bug (Programmfe msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "Kein Modul zum sammeln von Entropie vorhanden\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "Status von '%s' ist nicht feststellbar: %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "Hinweis: 'random_seed'-Datei ist leer\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "WARNUNG: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "'%s' ist unlesbar: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "'%s' kann nicht erzeugt werden: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "kann '%s' nicht schreiben: %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "kann '%s' nicht schliessen: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -362,6 +362,14 @@ msgid "digest algorithm `%s' is read-onl msgstr "Hashmethode `%s' ist in diesem Release read-only\n" # translated by wk +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" +"WARNUNG: Hashmethode `%s' ist nicht Teil von OpenPGP. Benutzung auf eigenes " +"Risiko!\n" + +# translated by wk #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -371,7 +379,7 @@ msgstr "" "Zufalls wird gesammelt. Bitte arebiten Sie an etwas anderem, da\n" "so die Qualität der Zufallszahlen erhöht werden kann.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -379,163 +387,163 @@ msgstr "" "@Befehle:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "Daten verschlüsseln" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[Dateien]|Dateien verschlüsseln" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlüsseln" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[Dateien]|Dateien entschlüsseln" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "Signatur prüfen" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "Liste der Schlüssel" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "Liste der Schlüssel und ihrer Signaturen" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "Signaturen der Schlüssel prüfen" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\"" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "Liste der geheimen Schlüssel" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "Schlüssel signieren" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "Schlüssel nur für diesen Rechner signieren" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "Schlüssel nicht widerrufbar signieren" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "Schlüssel nur für diesen Rechner und nicht-widerrufbar signieren" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "Unterschreiben oder bearbeiten eines Schl." -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "Schlüssel zu einem Schlü.server exportieren" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "Schlüssel von einem Schlü.server importieren" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "Schlüssel auf einem Schlü.server suchen" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "alle Schlüssel per Schlü.server aktualisieren" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "Lediglich Struktur der Datenpakete anzeigen" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\"-Werte" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\"-Werte" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "unbeaufsichtigtes Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschädigten \"Trust\"-Datenb." -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-Hülle befreien" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-Hülle einpacken" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -545,155 +553,155 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAME|Verschlüsseln für NAME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAME|NAME als voreingestellten Empfänger benutzen" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "" "Den Standardschlüssel als voreingestellten\n" "Empfänger benutzen" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0=keine)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "das Terminal gar nicht benutzen" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "v3 Signaturen nicht erzwingen" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "v4 Signaturen erzwingen" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "v4 Signaturen nicht erzwingen" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "Beim Verschlüsseln niemals ein Siegel (MDC) verwenden" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "Keine wirklichen Änderungen durchführen" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "vor Überschreiben nachfragen" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "den GPG-Agent verwenden" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "Als öffentlichen Schlüsselbund mitbenutzen" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "Als geheimen Schlüsselbund mitbenutzen" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|Schlüssel bei diesem Server nachschlagen" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[Datei]|Statusinfo in Datei schreiben" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "alle Paket-, Verschlüsselungs- und\n" "Hashoptionen auf OpenPGP-Verhalten einstellen" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "alle Paket-, Verschlüsselungs- und\n" @@ -739,7 +747,7 @@ msgstr "Foto-IDs nicht anzeigen" msgid "Set command line to view Photo IDs" msgstr "Kommandozeilentext für den Foto-Betrachter setzen" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -748,7 +756,7 @@ msgstr "" "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und " "Optionen)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -768,17 +776,17 @@ msgstr "" " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Berichte über Programmfehler bitte in englisch an .\n" "Sinn- oder Schreibfehler in den deutschen Texten bitte an .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -788,7 +796,7 @@ msgstr "" "Signieren, prüfen, verschlüsseln, entschlüsseln.\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -796,326 +804,363 @@ msgstr "" "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Öff.Schlüssel: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Verschlü.: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Komprimierung: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis (%s) \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "Verschlüsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht " "geladen\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften " "machen\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und " "verschlüsseln\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes " "verwenden.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-" "Verschlüsselung\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "ungültiger \"default-check-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "ungültige Standard Voreinstellungen\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "ungültige private Verschlüsselungsvoreinstellungen\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "ungültige private Hashvoreinstellungen\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "ungültige private Komprimierungsvoreinstellungen\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" +"Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht " +"erlaubt.\n" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" +"Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key User-ID" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key User-ID" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, c-format +msgid "keyserver send failed: %s\n" +msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" + +#: g10/g10.c:2341 +#, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" + +#: g10/g10.c:2343 +#, c-format +msgid "key export failed: %s\n" +msgstr "Schlüsselexport fehlgeschlagen: %s\n" + +#: g10/g10.c:2355 +#, c-format +msgid "keyserver search failed: %s\n" +msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n" + +#: g10/g10.c:2365 +#, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1123,19 +1168,19 @@ msgstr "" "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" @@ -1274,7 +1319,7 @@ msgstr "" "Es ist kein \"trust value\" zugewiesen für:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1333,7 +1378,7 @@ msgstr " s = diesen Schlüssel überSpring msgid " q = quit\n" msgstr " q = verlassen\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Ihre Auswahl? " @@ -1517,91 +1562,91 @@ msgstr "%s: übersprungen: öffentlicher S msgid "no valid addressees\n" msgstr "Keine gültigen Adressaten\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "Voreinstellung %c%lu ist nicht gültig\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "Voreinstellung %c%lu ist doppelt\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "zu viele `%c' Voreinstellungen\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Ungültiges Feld in der Voreinstellungszeichenkette\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "Die \"Direct Key Signature\" wird geschrieben\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "Die Eigenbeglaubigung wird geschrieben\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "Schreiben der \"key-binding\" Signatur\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Schlüssellänge auf %u Bit aufgerundet\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 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:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA und ElGamal (voreingestellt)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (nur signieren/beglaubigen)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (nur verschlüsseln)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (nur signieren/beglaubigen)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur verschlüsseln)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (signieren/beglaubigen und verschlüsseln)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Ihre Auswahl? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1612,15 +1657,15 @@ msgstr "" "nicht zur Verständigung mit PGP-Anwendern benutzen. Ausserdem ist dieses\n" "Verfahren sehr langsam, und es könnte nicht so sicher wie die anderen sein.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Trotzdem erstellen? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Ungültige Auswahl.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1633,19 +1678,19 @@ msgstr "" " standard Schlüssellänge ist 1024 Bit\n" " größte sinnvolle Schlüssellänge ist 2048 Bit\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Welche Schlüssellänge wünschen Sie? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n" @@ -1657,12 +1702,12 @@ msgstr "zu kurz; 768 ist die kleinste mö #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "Schüsselgröße zu hoch; %d ist der Maximalwert.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1670,11 +1715,11 @@ msgstr "" "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n" "Berechnungen dann WIRKLICH lange brauchen!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1682,17 +1727,17 @@ msgstr "" "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten " "abstrahlen und diese leicht mitgelesen werden können.\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "aufgerundet auf %u Bit\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1708,7 +1753,7 @@ msgstr "" " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1724,30 +1769,30 @@ msgstr "" " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Wie lange bleibt der Schlüssel gültig? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Wie lange bleibt die Beglaubigung gültig? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "Ungültiger Wert.\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s verfällt nie.\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s verfällt am %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1755,11 +1800,11 @@ msgstr "" "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n" "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Ist dies richtig? (j/n) " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1775,44 +1820,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ungültiges Zeichen im Namen\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Der Name muß min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-Mail-Adresse: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Diese E-Mail-Adresse ist ungültig\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Ungültiges Zeichen im Kommentar.\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Sie benutzen den Zeichensatz `%s'\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1823,27 +1868,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkEeFfBb" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Bitte beseitigen Sie zuerst den Fehler\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1851,16 +1896,16 @@ msgstr "" "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1873,7 +1918,7 @@ msgstr "" "aufrufen.\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1884,53 +1929,53 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Das DSA-Schlüsselpaar wird 1024 Bit haben.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Schlüsselerzeugung abgebrochen.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "Schlüssel ist als uneingeschränkt vertrauenswürdig gekennzeichnet.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1939,12 +1984,12 @@ msgstr "" "werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n" "Zweitschlüssel für diesem Zweck erzeugen.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1952,7 +1997,7 @@ msgstr "" "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht überein)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1960,25 +2005,25 @@ msgstr "" "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht überein)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Wirklich erzeugen? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output funktioniert nicht bei diesem Kommando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kann nicht geöffnet werden: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "Fehler beim Erzeugen der Passphrase: %s\n" @@ -1989,17 +2034,17 @@ msgstr "" "Aufgrund des S2K-Modus kann ein symmetrisches ESK Packet nicht benutzt " "werden\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' ist bereits komprimiert\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: WARNUNG: Leere Datei\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus kann nur für RSA-Schlüssel mit maximal 2048 Bit " @@ -2017,7 +2062,7 @@ msgstr "" "Die IDEA-Verschlüsselung kann nicht mit allen Zielschlüsseln verwendet " "werden.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2036,449 +2081,439 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s verschlüsselt für: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "Schlüssel `%s' nicht gefunden: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schüssel - übersprungen\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "Schlüssel %08lX: PGP 2.x-artiger Schlüssel - übersprungen\n" # translated by wk #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "WARNUNG: Der geheime Schlüssel %08lX hat keine einfache SK Prüfsumme\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User-ID nicht gefunden]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ungültiger Schlüssel %08lX, gültig gemacht per --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "Kein privater Schlüssel zum öffentlichen Schlüssel %08lX - übergangen\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" "Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - " "übersprungen\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "überspringe den Block vom Typ %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu Schlüssel bislang bearbeitet\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignorierte neue Schlüssel: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ohne User-ID: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " unverändert: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " neue User-IDs: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " neue Unterschlüssel: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " neue Signaturen: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " neue Schlüsselwiderrufe: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene geheime Schlüssel: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " geheime Schlüssel importiert: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " unveränderte geh.Schl.: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " nicht importiert: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "HINWEIS: Elgamal-Hauptschlüssel gefunden - der Import könnte einige Zeit " "dauern\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "Schlüssel %08lX: Keine User-ID\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "Schlüssel %08lX: HKP Unterschlüsseldefekt repariert\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID `%s' übernommen\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel \"%s\" importiert\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %" "s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "Schlüssel %08lX: \"%s\" 1 neue User-ID\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "Schlüssel %08lX: \"%s\" 1 neue Signatur\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "Schlüssel %08lX: \"%s\" 1 neuer Unterschlüssel\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "Schlüssel %08lX: \"%s\" %d neue Unterschlüssel\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "Schlüssel %08lX: \"%s\" Nicht geändert\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" "Schlüssel %08lX: geheimer Schlüssel mit ungültiger Verschlüsselung %d - " "übersprungen\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann " "nicht angebracht werden\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat importiert\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s" "\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "" "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselanbindungs-" "Beglaubigung\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung entfernt\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "" "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselwiderruf-" "Beglaubigung\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "Schlüssel %08lX: Ungültiger Unterschlüsselwiderruf\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "" "Schlüssel %08lX: Mehrfacher Unterschlüssel-Widerruf-Beglaubigung entfernt\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "Schlüssel %08lX: User-ID übergangen '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "" "Schlüssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - übergangen\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: hole Widerrufschlüssel %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: Widerrufschlüssel %08lX ist " "nicht vorhanden\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat hinzugefügt\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "Schlüssel %08lX: \"direct-key\"-Signaturen hinzugefügt\n" @@ -2491,29 +2526,29 @@ msgstr "[Widerruf]" msgid "[self-signature]" msgstr "[Eigenbeglaubigung]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 falsche Beglaubigung\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d falsche Beglaubigungen\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n" @@ -2532,20 +2567,27 @@ msgstr "%d User-IDs ohne gültige Eigenbe msgid "User ID \"%s\" is revoked." msgstr "User-ID \"%s\" ist widerrufen." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Beglaubigen ist nicht möglich.\n" #: g10/keyedit.c:382 #, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" -msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt.\n" +msgid "User ID \"%s\" is expired." +msgstr "User-ID \"%s\" ist abgelaufen." + +#: g10/keyedit.c:402 +#, c-format +msgid "User ID \"%s\" is not self-signed." +msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt." -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2554,11 +2596,11 @@ msgstr "" "Die Eigenbeglaubigung von \"%s\"\n" "ist eine PGP 2.x artige Signatur.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2567,7 +2609,7 @@ msgstr "" "Ihre derzeitige Beglaubigung von \"%s\"\n" "ist abgelaufen.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? " @@ -2575,7 +2617,7 @@ msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2584,44 +2626,44 @@ msgstr "" "Die derzeitige Beglaubigung von \"%s\"\n" "ist nur für diesen Rechner gültig.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" wurde bereits durch Schlüssel %08lX lokal beglaubigt\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" wurde bereits durch Schlüssel %08lX beglaubigt\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Dieser Schlüssel ist verfallen!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Dieser Schlüssel wird %s verfallen.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2629,11 +2671,11 @@ msgstr "" "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben " "werden\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Dies würde den Schlüssel für PGP 2.x unbrauchbar machen\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2643,31 +2685,36 @@ msgstr "" "wollen, wirklich der o.g. Person gehört?\n" "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Ich antworte nicht.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Ich habe es überhaupt nicht überprüft.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Ich habe es flüchtig überprüft.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Ich habe es sehr sorgfältig überprüft.%s\n" -#: g10/keyedit.c:635 +# translated by wk +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "Ihre Auswahl? ('?' für weitere Informationen): " + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2675,7 +2722,7 @@ msgstr "" "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n" "Schlüssel beglaubigen wollen: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2683,7 +2730,7 @@ msgstr "" "\n" "Dies wird eine Eigenbeglaubigung sein.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2692,7 +2739,7 @@ msgstr "" "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert " "werden.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2700,7 +2747,7 @@ msgstr "" "\n" "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2708,7 +2755,7 @@ msgstr "" "\n" "Die Unterschrift wird als nicht exportfähig markiert werden.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2716,7 +2763,7 @@ msgstr "" "\n" "Die Unterschrift wird als nicht exportfähig markiert werden.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2724,7 +2771,7 @@ msgstr "" "\n" "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2732,7 +2779,7 @@ msgstr "" "\n" "Ich habe diesen Schlüssel flüchtig überprüft.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2740,34 +2787,34 @@ msgstr "" "\n" "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Dieser Schlüssel ist nicht geschützt.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Schlüssel ist geschützt.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2775,7 +2822,7 @@ msgstr "" "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2783,492 +2830,492 @@ msgstr "" "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Möchten Sie dies wirklich tun? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "Menü verlassen" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "speichern und Menü verlassen" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "Liste der Schlüssel" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "Schlüssel und User-IDs auflisten" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "User-ID N auswählen" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "Zweitschlüssel N auswählen" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "Den Schlüssel signieren" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "Den Schlüssel nur für diesen Rechner beglaubigen" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "Den Schlüssel nicht-widerrufbar beglaubigen" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "Eine User-ID hinzufügen" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "Eine Foto-ID hinzufügen" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "User-ID entfernen" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "Einen Zweitschlüssel hinzufügen" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "Einen Zweitschlüssel entfernen" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "Einen Widerrufschlüssel hinzufügen" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "Signatur entfernen" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "Ändern des Verfallsdatums" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "User-ID als Haupt-User-ID kennzeichnen" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "Liste der Voreinstellungen (für Experten)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "Liste der Voreinstellungen (ausführlich)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "Liste der Voreinstellungen einstellen" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "geänderte Voreinstellungen" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "Die Passphrase ändern" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "Den \"Owner trust\" ändern" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "Eine User-ID widerrufen" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "Einen Zweitschlüssel widerrufen" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "Schlüssel abschalten" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "Schlüssel anschalten" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "Foto-ID anzeigen" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Geheimer Schlüssel ist vorhanden.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Befehl> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime Schlüssel benötigt.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Schlüssel wurde widerrufen." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Die letzte User-ID kann nicht gelöscht werden!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Diese User-ID wirklich widerrufen? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Die Voreinstellungen wirklich ändern? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Änderungen speichern? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Beenden ohne zu speichern? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "Änderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 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:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Eigenschaften: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "(empfindlich)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX erstellt: %s verfällt: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! Unterschlüssel wurde widerrufen: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 msgid "[revoked] " msgstr "[widerrufen]" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 msgid "[expired] " msgstr "[verfallen]" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3276,7 +3323,16 @@ msgstr "" "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n" "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n" -#: g10/keyedit.c:2095 +# translated by wk +#: g10/keyedit.c:2107 +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. Dieses Kommando kann\n" +"dazu führen, daß eine andere User-ID as primär angesehen wird.\n" + +#: g10/keyedit.c:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3286,45 +3342,45 @@ msgstr "" "könnte\n" " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Sie können einem PGP2-artigen Schlüüsel keine Foto-ID hinzufügen.\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3334,17 +3390,17 @@ msgstr "" " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n" " des Schlüssels führen.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Sie können einem PGP2-artigen Schlüüsel keine vorgesehenen Widerrufer " "hinzufügen.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Geben sie die User-ID des designierten Widerrufers ein: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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 " @@ -3353,71 +3409,71 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 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:2452 +#: g10/keyedit.c:2523 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 " "deklarieren? (j/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Bitte genau eine User-ID auswählen.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "User-ID: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3426,7 +3482,7 @@ msgstr "" "\"\n" "unterschrieben mit Ihrem Schlüssel %08lX um %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3435,56 +3491,56 @@ msgstr "" "\"\n" "lokal unterschrieben mit Ihrem Schlüssel %08lX um %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " beglaubigt durch %08lX um %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " widerrufen durch %08lX um %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " beglaubigt durch %08lX am %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" @@ -3493,70 +3549,70 @@ msgstr "User-ID \"%s\" ist bereits wider #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Anzeigen einer %s Photo ID (%ld Byte) für Schlüssel %08lX (User-ID %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Krititische Beglaubigungsrichtlinie: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Beglaubigungsrichtlinie: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Krititische Beglaubigungs-\"Notation\": " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Beglaubigungs-\"Notation\": " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "nicht als Klartext darstellbar" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Schlüsselbund" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [verfällt: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Haupt-Fingerabdruck =" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr "Unter-Fingerabdruck =" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Haupt-Fingerabdruck =" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Unter-Fingerabdruck =" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Schl.-Fingerabdruck =" @@ -3644,102 +3700,110 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "Ursprünglicher Dateiname='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "\"Notation\": " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Richtlinie: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "Unterschriften-Überprüfung unterdrückt\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +msgid "Key available at: " +msgstr "Schlüssel erhältlich bei: " + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "FALSCHE Unterschrift von \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Verfallene Unterschrift von \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Korrekte Unterschrift von \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[ungewiß] " -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, c-format msgid "Signature expired %s\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, c-format msgid "Signature expires %s\n" msgstr "Diese Unterschrift verfällt am %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s Unterschrift, Hashmethode \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 msgid "binary" msgstr "Binäre" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "Textmodus" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "unknown" msgstr "unbekannt" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht geprüft werden: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "keine abgetrennte Unterschrift\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "Einzelne Unterschrift der Klasse 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "ungültiges root-Paket in proc_tree() entdeckt\n" @@ -3765,76 +3829,81 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "Für weitere Info siehe http://www.gnupg.org/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: mißbilligte Option \"%s\".\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "Client-PID für den Agent kann nicht gesetzt werden\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "Server-Lese-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "Server-Schreib-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (Hauptschlüssel-ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3845,32 +3914,32 @@ msgstr "" "Benutzer: \"\"%.*s\"\n" "%u-bit %s Schlüssel, ID %08lX, erzeugt %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Geben Sie die Passphrase nochmal ein\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Geben Sie die Passphrase ein\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "Passphrase ist zu lang\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3880,20 +3949,20 @@ msgstr "" "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -3986,8 +4055,8 @@ msgid "failed sending to `%s': status=%u msgstr "Senden an `%s' erfolglos (status=%u)\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "Dieser Schlüsselserver ist nicht vollständig HKP kompatibel\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "Dieser Schlüsselserver unterstützt --search-keys nicht\n" #: g10/hkp.c:519 #, c-format @@ -4029,11 +4098,11 @@ msgstr "" "Die mißbilligte 16-bit Prüfsumme wird zum Schutz des geheimen Schlüssels " "benutzt\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4042,20 +4111,20 @@ msgstr "" "Schlüssel %08lX: Dieser durch PGP erzeugte ElGamal-Schlüssel ist für " "Signaturen NICHT sicher genug!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "" "Öffentlicher Schlüssel %08lX ist um %lu Sekunde jünger als die Unterschrift\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "" "Öffentlicher Schlüssel %08lX ist um %lu Sekunden jünger als die " "Unterschrift\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4064,7 +4133,7 @@ msgstr "" "Der Schlüssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht überein)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4073,58 +4142,65 @@ msgstr "" "Der Schlüssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise " "oder Uhren stimmen nicht überein)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "Hinweis: Signaturschlüssel %08lX ist am %s verfallen.\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "Vermutlich eine FALSCHE Unterschrift von Schlüssel %08lX, wegen unbekanntem " "\"critical bit\"\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselwiderruf-" "Beglaubigung\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "" +"Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselanbindungs-" +"Beglaubigung\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "Notationen können in einen v3 (PGP 2.x-artigen) Schlüssel nicht eingetragen " "werden\n" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht " "eingetragen werden\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende " "\"unerweiterte\".\n" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht " "eingetragen werden\n" # translated by wk -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" "Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht gespeichert " "werden\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4153,12 +4229,12 @@ msgstr "" "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte " "Unterschrift erzeugt werden\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4174,7 +4250,7 @@ msgstr "" "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen " "Schlüssel machen\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s Verschlüsselung wird verwendet\n" @@ -4189,12 +4265,12 @@ msgstr "Textzeilen länger als %d Zeichen msgid "input line longer than %d characters\n" msgstr "Eingabezeile ist länger als %d Zeichen\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n" @@ -4203,122 +4279,122 @@ msgstr "trustdb Satz %lu: write fehlgesc msgid "trustdb transaction too large\n" msgstr "trustdb Transaktion zu groß\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: kann nicht zugegriffen werden: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: Verzeichnis existiert nicht!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: Sperre kann nicht erzeugt werden\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: Sperre kann nicht erzeugt werden\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kann nicht erzeugt werden: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: ungültige trust-db erzeugt\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: trust-db erzeugt\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ungültige 'Trust'-Datenbank\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: hashtable kann nicht erzeugt werden: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek fehlgeschlagen: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: keine trustdb Datei\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: version record with recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: invalid file version %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: konnte einen Satz nicht Nullen: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: konnte Satz nicht anhängen: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" @@ -4372,39 +4448,39 @@ msgstr "Vertrauenssatz %lu, Typ %d: Schr msgid "trustdb: sync failed: %s\n" msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "Bitte ein --check-trustdb durchführen\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "\"Trust-DB\" wird überprüft\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n" # translated by wk -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, 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:1619 +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" msgstr "kein uneingeschränkt vertrauenswürdiger Schlüssel %08lX gefunden\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4413,7 +4489,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "überprüfen, Tiefe %d, gültig=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -5000,17 +5076,17 @@ msgstr "Bitte diesen potentiellen Sicher msgid "checking keyring `%s'\n" msgstr "Prüfen des Schlüsselbundes `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu Schlüssel bislang geprüft (%lu Beglaubigungen)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu Schlüssel geprüft (%lu Beglaubigungen)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: Schlüsselbund erstellt\n" @@ -5114,7 +5190,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "niemals " @@ -5212,34 +5288,34 @@ msgstr "" "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n" "machen.\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Grund für den Widerruf:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Abbruch" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Grund für Widerruf: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Keine Beschreibung angegeben)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Ist das richtig? " @@ -5284,6 +5360,9 @@ msgstr "Fehler beim Suchen des \"Trust r msgid "read error: %s\n" msgstr "Lesefehler: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "Dieser Schlüsselserver ist nicht vollständig HKP kompatibel\n" + #~ msgid "ERROR: " #~ msgstr "FEHLER: " @@ -5604,9 +5683,6 @@ msgstr "Lesefehler: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "Fehler beim Lesen den Hauptschlüssels der LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record fehlgeschlagen: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "Schlüssel %08lX: Satzabfrage fehlgeschlagen\n" @@ -5621,9 +5697,6 @@ msgstr "Lesefehler: %s\n" #~ "Schlüssel %08lX: geheimer und öffentlicher Schlüssel passen nicht " #~ "zusammen.\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "enum_secret_keys fehlgeschlagen: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "Schlüssel %08lX.%lu: Korrekte Unterschlüssel-Anbindung\n" diff -urpP gnupg-1.2.2/po/el.po gnupg-1.2.3/po/el.po --- gnupg-1.2.2/po/el.po 2003-05-01 14:38:03.000000000 +0000 +++ gnupg-1.2.3/po/el.po 2003-08-21 20:05:01.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-25 18:03+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -45,7 +45,7 @@ msgstr "ü÷é" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "ôåñìáôéóìüò" @@ -272,64 +272,64 @@ msgstr "... áõôü åßíáé bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "âñÞêáôå Ýíá bug ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "äåí åíôïðßóôçêå Üñèñùìá óõëëïãÞò åíôñïðßáò\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "áäõíáìßá ëÞøçò ðëçñïöïñéþí ãéá ôï `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' äåí åßíáé êáíïíéêü áñ÷åßï - áãíïÞèçêå\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "óçìåßùóç: ôï áñ÷åßï random_seed åßíáé Üäåéï\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç Ýãêõñï ìÝãåèïò áñ÷åßïõ random_seed - äåí\n" "÷ñçóéìïðïéåßôå\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "áäõíáìßá áíÜãíùóçò ôïõ `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "óçìåßùóç: äåí Ý÷åé áíáíåùèåß ôï áñ÷åßï random_seed\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ôïõ `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "áäõíáìßá êëåéóßìáôïò ôïõ `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ÷ñÞóç ìç áóöáëïýò ãåííÞôñéáò ôõ÷áßùí áñéèìþí!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -360,6 +360,11 @@ msgid "digest algorithm `%s' is read-onl msgstr "" "ï áëãüñéèìïò ðåñßëçøçò `%s' åßíáé óå áõôÞ ôçí Ýêäïóç ãéá áíÜãíùóç ìüíï\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -369,7 +374,7 @@ msgstr "" "Ðñáêáë ðåñéìÝíåôå, ç åíôñïðßá óõãêåíôñþíåôáé. ÊÜíôå ìéá Üëëç åñãáóßá\n" "ãéá íá ìçí âáñåèåßôå, ãéáôß áõôü èá âåëôéþóåé ôçí ðïéüôçôá ôçò åíôñïðßá.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -377,163 +382,163 @@ msgstr "" "@ÅíôïëÝò:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò õðïãñáöÞò" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò ìç êñõðôïãñáöçìÝíçò õðïãñáöÞò" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "êñõðôïãñÜöçóç äåäïìÝíùí" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[áñ÷åßá]|êñõðôïãñÜöçóç áñ÷åßùí" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "êñõðôïãñÜöçóç ìå ÷ñÞóç ìüíï óõììåôñéêþí áëãïñßèìùí" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "áðïèÞêåõóç ìüíï" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "áðïêñõðôïãñÜöçóç äåäïìÝíùí (ðñïêáèïñéóìÝíï)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[áñ÷åßá]|áðïêñõðôïãñÜöçóç áñ÷åßùí" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "åðáëÞèåõóç ìéáò õðïãñáöÞò" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé õðïãñáöþí" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "Ýëåã÷ïò õðïãñáöÞò êëåéäéïý" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé áðïôõðùìÜôùí (fingerprints)" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "áðåéêüíéóç ôçò ëßóôáò ìõóôéêþí êëåéäéþí" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç äçìüóéá êëåéäïèÞêç" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç ìõóôéêÞ êëåéäïèÞêç" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "õðïãñáöÞ åíüò êëåéäéïý" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "õðïãñáöÞ åíüò êëåéäéïý ìç-áíáêáëÝóéìá" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "õðïãñáöÞ Þ åðåîåñãáóßá åíüò êëåéäéïý" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "åîáãùãÞ êëåéäéþí" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "áíáíÝùóç üëùí ôùí êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "åéóáãùãÞ/óõã÷þíåõóç êëåéäéþí" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "áðåéêüíéóç ìüíï ôçò áêïëïõèßáò ðáêÝôùí" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "åîáãùãÞ ôùí ôéìþí åìðéóôïóýíçò" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "åéóáãùãÞ ôùí ôéìþí åìðéóôïóýíçò" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "áíáíÝùóç ôçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "áíáíÝùóç ôçò ðáñáìåëåéìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "äéüñèùóç ìéáò öèáñìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Áöáßñåóç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "ÐñïóèÞêç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|áëãüñ [áñ÷åßá]| áðåéêüíéóç ðåñéëÞøåùí ôùí ìçíõìÜôùí" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -543,152 +548,152 @@ msgstr "" "ÅðéëïãÝò:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|ÏÍÏÌÁ|êñõðôïãñÜöçóç ãéá ÏÍÏÌÁ" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|ÏÍÏÌÁ|÷ñÞóç ôïõ ÏÍÏÌÁôïò ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "÷ñÞóç ôïõ ðñïêáèïñéóìÝíïõ êëåéäéïý ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "÷ñÞóç áõôÞò ôçò ôáõôüôçôáò (user id) ãéá õðïãñáöÞ Þ áðïêñõðôïãñÜöçóç" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|êáèïñéóìüò åðéðÝäïõ óõìðßåóçò N (0 áðåíåñãïðïéåß)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "÷ñÞóç êáíïíéêÞò êáôÜóôáóçò êåéìÝíïõ" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "÷ñÞóç ùò áñ÷åßïõ åîüäïõ" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "áíáëõôéêÜ" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "Þóõ÷ç Ýîïäïò" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "ìç ÷ñÞóç ôåñìáôéêïý" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "÷ñÞóç ðÜíôïôå MDC ãéá êñõðôïãñÜöçóç" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "ðïôÝ ÷ñÞóç MDC ãéá êñõðôïãñÜöçóç" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "íá ìç ãßíåé êáììßá áëëáãÞ" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "åñþôçóç ðñéí ôçí åðéêÜëõøç" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "÷ñÞóç ôïõ gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "êáôÜóôáóç batch: íá ìç ãßíïíôáé åñùôÞóåéò" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "áðÜíôçóç íáé óôéò ðåñéóóüôåñåò åñùôÞóåéò" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "áðÜíôçóç ü÷é óôéò ðåñéóóüôåñåò åñùôÞóåéò" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "ðñïóèÞêç áõôïý ôïõ êëåéäéïý óôç ëßóôá ôùí êëåéäïèçêþí" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "ðñïóèÞêç áõôÞò ôçò ìõóôéêÞò êëåéäïèÞêçò óôç ëßóôá" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "áðåéêüíéóç ôçò êëåéäïèÞêçò óôçí ïðïßá áíáöÝñåôå ôï êëåéäß" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|ÏÍÏÌÁ|÷ñÞóç ÏÍÏÌÁôïò óáí ðñïêáèïñéóìÝíï ìõóôéêü êëåéäß" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ÄÉÁÊÏÌÉÓÔÇÓ|÷ñÞóç áõôïý ôïõ äéáêïìéóôÞ êëåéäéþí ãéá áíáæÞôçóç" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|ÏÍÏÌÁ|êáèïñéóìüò ôïõ óåô ÷áñáêôÞñùí ôåñìáôéêïý óå ÏÍÏÌÁ" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "áíÜãíùóç åðéëïãþí áðü áñ÷åßï" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[áñ÷åßï]|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï áñ÷åßï" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|áðüëõôç åìðéóôïóýíç óå áõôü ôï êëåéäß" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|ÁÑ×ÅÉÏ|öüñôùìá ôïõ áñèñþìáôïò åðÝêôáóçò ÁÑ×ÅÉÏ" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "åîïìïßùóç ôçò êáôÜóôáóçò ðïõ ðåñéãñÜöåôáé óôï RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "óõìðåñéöïñÜ üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé êáé ðåñßëçøç óå OPENPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "ïñéóìüò üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé,ðåñßëçøç óå PGP 2.x óõìðåñéöïñÜ" @@ -734,7 +739,7 @@ msgstr "Ìç áðåéêüíéóç ôùí Photo ID" msgid "Set command line to view Photo IDs" msgstr "Ïñéóìüò ôçò ãñáììÞò åíôïëþí ãéá áðåéêüíéóç ôùí Photo ID" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -742,7 +747,7 @@ msgstr "" "@\n" "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -762,15 +767,15 @@ msgstr "" " --list-keys [ïíüìáôá] áðåéêüíéóç êëåéäéþí\n" " --fingerprint [ïíüìáôá] áðåéêüíéóç áðïôõðùìÜôùí (fingerprints)\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï \n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -780,7 +785,7 @@ msgstr "" "õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n" "ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -788,326 +793,360 @@ msgstr "" "\n" "Õðïóôçñéæüìåíïé áëãüñéèìïé:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "ÄçìïóÊëåéäß:" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Êñõðôáëãüñéèìïò: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Óõìðßåóç: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "÷ñÞóç: gpg [åðéëïãÝò] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "äåí âñÝèçêå ôï óýìâïëï = óôïí ïñéóìü ôçò ïìÜäáò \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßá óôï %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßáåóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò åóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "ÓÇÌÅÉÙÓÇ: áãíïÞèçêå ôï ðáëéü áñ÷åßï ðñïêáèïñéóìÝíùí åðéëïãþí `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "áñ÷åßï åðéëïãþí `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n" "áíáóöáëåßò Üäåéåò\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 " "êáôÜóôáóç\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "áõôü ôï ìÞíõìá ßóùò äåí ìðïñåß íá ÷ñçóéìïðïéçèåß áðü %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "" "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n" "äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ï áëãüñéèìïò óõìðßåóçò ðñÝðåé íá åßíáé ìåôáîý %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "ìç Ýãêõñï default-check-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n" "äçìïóßïõ êëåéäéïý\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [åíôïëÝò]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "áäõíáìßá ðñüóâáóçò ôïõ %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ìç Ýãêõñïò áëãüñéèìïò hash `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[üíïìá áñ÷åßïõ]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1115,19 +1154,19 @@ msgstr "" "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ " "êáé íá ëÞãåé ìå Ýíá '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "ôï üíïìá óçìåßùóçò ÷ñÞóôç ðñÝðåé íá ðåñéÝ÷åé ôï '@' ÷áñáêôÞñá\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" @@ -1268,7 +1307,7 @@ msgstr "" "Äåí äüèçêå áîßá åìðéóôïóýíçò óôï:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ãíùóôü óáí \"" @@ -1326,7 +1365,7 @@ msgstr " s = ðáñÜëåéøç áõôïý ôïõ êëåéäéï msgid " q = quit\n" msgstr " q = ôåñìáôéóìüò\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Ç áðüöáóç óáò; " @@ -1506,91 +1545,91 @@ msgstr "%s: ðáñáëåßöèçêå: ôï äçìüóéï êëå msgid "no valid addressees\n" msgstr "êáììßá Ýãêõñç äéåýèõíóç\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "ç ðñïåðéëïãÞ %c%lu äåí åßíáé Ýãêõñç\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "ç ðñïåðéëïãÞ %c%lu áíôéãñÜöôçêå\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "ðÜñá ðïëëÝò `%c' ðñïåðéëïãÝò\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "åããñáöÞ Üìåóçò õðïãñáöÞò\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "åããñáöÞ éäéï-õðïãñáöÞò\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "åããñáöÞ õðïãñáöÞò \"äÝóéìïõ\" êëåéäéïý\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ìç Ýãêõñï ìÝãåèïò êëåéäéïý, ÷ñÞóç %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "óôñïããõëïðïßçóç ôïõ ìÝãåèïò êëåéäéïý Ýùò %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA êáé ElGamal (ðñïêáèïñéóìÝíï)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (ãéá õðïãñáöÞ ìüíï)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (õðïãñáöÞ êáé êñõðôïãñÜöçóç)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (ãéá õðïãñáöÞ ìüíï)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (õðïãñáöÞ êáé êñõðôïãñÜöçóç)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Ç åðéëïãÞ óáò; " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1601,15 +1640,15 @@ msgstr "" "áëãüñéèìïò åðßóçò åßíáé ðïëõ áñãüò, êáé ìðïñåß íá ìçí åßíáé ôüóï áóöáëÞò\n" "üóï Üëëåò åðéëïãÝò.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Äçìéïõñãßá; " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Ìç Ýãêõñç åðéëïãÞ.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1622,20 +1661,20 @@ msgstr "" " ðñïêáèïñéóìÝíï ìÝãåèïò êëåéäéïý åßíáé 1024 bits\n" " ìÝãéóôï ðñïôåéíüìåíï ìÝãåèïò êëåéäéïý åßíáé 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "Ï DSA åðéôñÝðåé ìüíï ìÝãåèïò êëåéäéïý áðü 512 Ýùò 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 1024 åßíáé ç åëÜ÷éóôç ôéìÞ ãéá RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 768 åßíáé ç åëÜ÷éóôç åðéôñåðüìåíç " @@ -1649,14 +1688,14 @@ msgstr "" #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "" "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìåãÜëï, %d åßíáé ç ìÝãéóôç ôéìÞ ðïõ " "åðéôñÝðåôáé.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1664,11 +1703,11 @@ msgstr "" "ÌåãÝèç êëåéäéþí ìåãáëýôåñá ôïõ 2048 äåí óõíéóôþíôáé ãéáôß\n" "ïé õðïëïãéóìïß åßíáé ÷ñïíïâüñïé!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Óßãïõñá èÝëåôå áõôü ôï ìÝãåèïò êëåéäéïý; " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1676,17 +1715,17 @@ msgstr "" "ÅíôÜîåé, áëëÜ íá Ý÷åôå õð'üøç üôé ç ïèüíç êáé ôï ðëçêôñïëüãéï åßíáé\n" "åðßóçò ðïëý ôñùôÜ óå åðéèÝóåéò!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ôï ìÝãåèïò êëåéäéïý ðïõ æçôÞèçêå åßíáé %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "óôñïããõëïðïéÞèçêå Ýùò ôá %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1702,7 +1741,7 @@ msgstr "" " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1718,30 +1757,30 @@ msgstr "" " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Ôï êëåéäß åßíáé Ýãêõñï ãéá; (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Ç õðïãñáöÞ Ýéíáé Ýãêõñç ãéá; (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "ìç Ýãêõñç ôéìÞ\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "ôï %s äåí ëÞãåé ðïôÝ\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "ôï %s ëÞãåé óôéò %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1749,11 +1788,11 @@ msgstr "" "Ôï óýóôçìá óáò äåí ìðïñåß íá áðåéêïíßóåé çìåñïìçíßåò ðÝñá ôïõ 2038.\n" "¼ìùò, èá ÷åéñßæïíôáé óùóôÜ Ýùò ôï 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Åßíáé áõôü óùóôü (y/n); " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1769,44 +1808,44 @@ msgstr "" " \"Nikolaoy Nikos (toy Ioanni) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Áëçèéíü ¼íïìá: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï üíïìá\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Ôï üíïìá äåí åðéôñÝðåôáé íá îåêéíÜ ìå áñéèìçôéêü øçößï\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Ôï üíïìá ðñÝðåé íá Ý÷åé ôïõëÜ÷éóôïí 5 ÷áñáêôÞñåò\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Äéåýèõíóç Email: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Ìç Ýãêõñç äéåýèõíóç Email\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Ó÷üëéï: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï ó÷üëéï\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "×ñçóéìïðïéåßôå ôï `%s' óåô ÷áñáêôÞñùí.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1817,27 +1856,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ðáñáêáëþ ìçí ôïðïèåôåßôå ôçí äéåýèõíóç email óôï üíïìá Þ óôï ó÷üëéï\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (O)åíôÜîåé/(Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Ðáñáêáëþ, äéïñèþóôå ðñþôá ôï óöÜëìá\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1845,16 +1884,16 @@ msgstr "" "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1866,7 +1905,7 @@ msgstr "" "üðïôå èÝëåôå, ìå ôçí åðéëïãÞ \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1878,53 +1917,53 @@ msgstr "" "ôïõò äßóêïõò) êáôá ôç äéÜñêåéá õðïëïãéóìïý ðñþôùí áñéèìþí. Áõôü äßíåé\n" "óôç ãåííÞôñéá ôõ÷áßùí áñéèìþí ìéá åõêáéñßá íá ìáæÝøåé áñêåôÞ åíôñïðßá.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áíáâëÞèçêå.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "åããñáöÞ ôïõ äçìïóßïõ êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç äçìüóéá êëåéäïèÞêç: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç ìõóôéêÞ êëåéäïèÞêç: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò äçìüóéáò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "ôï äçìüóéï êáé ôï ìõóôéêü êëåéäß äçìéïõñãÞèçêáí êáé õðïãñÜöçêáí.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "óçìåßùóç êëåéäéïý óáí áðüëõôçò åìðéóôïóýíçò.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1934,12 +1973,12 @@ msgstr "" "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ \"--edit-key\" ãéá íá äçìéïõñãçèåß\n" "Ýíá äåõôåñåýïí êëåéäß ãéá áõôü ôï ëüãï.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1947,7 +1986,7 @@ msgstr "" "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1955,27 +1994,27 @@ msgstr "" "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "ÓÇÌÅÉÙÓÇ: ç äçìéïõñãßá õðïêëåéäéþí ãéá êëåéäéÜ v3 äåí åßíáé óýìöùíï\n" "ìå ôï OpenPGP\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Óßãïõñá íá äçìéïõñãçèåß; " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: áäõíáìßá ðñüóâáóçò ôïõ: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n" @@ -1984,17 +2023,17 @@ msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "áäõíáìßá ÷ñÞóçò åíüò óõììåôñéêïý ðáêÝôïõ ESK ëüãù ôçò êáôÜóôáóçò S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' Þäç óõìðéÝóôçêå\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Üäåéï áñ÷åßï\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "êñõðôïãñÜöçóç ìå êëåéäßá RSA áðü 2048 bit Þ ðéï ëßãï ìüíï óå êáôÜóôáóç --" @@ -2012,7 +2051,7 @@ msgstr "" "áäõíáìßá ÷ñÞóçò ôïõ êñõðôáëãüñéèìïõ IDEA ãéá üëá ôá êëåéäßá ìå ôá " "ïðïßáêñõðôïãñáöåßôå.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2031,435 +2070,425 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s êñõðôïãñáöÞèçêå ãéá: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "êëåéäß %08lX: äåí åßíáé Ýíá rfc2440 êëåéäß - ðáñáëåßöèçêå\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "êëåéäß %08lX: äåí åßíáé ðñïóôáôåõìÝíï - ðáñáëåßöèçêå\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "êëåéäß %08lX: êëåéäß ôýðïõ PGP 2.x - ðáñáëåßöèçêå\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "ðÜñá ðïëëÝò êáôá÷ùñÞóåéò óôç pk cache - áðåíåñãïðïéÞèçêå\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User id äåí âñÝèçêå]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "õðÜñ÷åé Ýíá ìõóôéêü êëåéäß ãéá ôï äçìüóéï êëåéäß \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ÷ùñßò äçìüóéï - ðáñáëåßöèçêå\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "ðáñÜëåéøç ôìÞìáôïò ôïõ ôýðïõ %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu êëåéäéÜ Ý÷ïõí ìÝ÷ñé ôþñá åðåîåñãáóôåß\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Óõíïëéêüò áñéèìüò ðïõ åðåîåñãÜóôçêáí: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " íÝá êëåéäéÜ ðïõ ðáñáëåßöèçêáí: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ÷ùñßò user ID: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " åéóá÷èÝíôá: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " áìåôÜâëçôá: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " íÝá user ID: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " íÝá õðïêëåéäéÜ: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " íÝåò õðïãñáöÝò: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " íÝåò áíáêëÞóåéò êëåéäéþí: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " áíáãíùóìÝíá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " åéóá÷èÝíôá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " áìåôÜâëçôá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " ìç åéóá÷èÝíôá: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "ÓÇÌÅÉÙÓÇ: åíôïðéóìüò ðñùôåýïíôïò êëåéäéïý Elgamal - ßóùò ðÜñåé ëßãï ÷ñüíï\n" " ãéá ôçí åéóáãùãÞ ôïõ\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé áõôü ôï user ID\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "êëåéäß %08lX: åðéäéüñèùóç öèáñìÝíïõ õðïêëåéäéïý HKP\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "êëåéäß %08lX: äåêôü ìç éäéï-õðïãåãñáììÝíï user ID '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "êëåéäß %08lX: äåí Ý÷åé Ýãêõñá user ID\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ðïõ äå âñÝèçêå: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "êëåéäß %08lX: íÝï êëåéäß - ðáñáëåßöèçêå\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "äåí âñåèçêå åããñÜøéìç êëåéäïèÞêç: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "åããñáöÞ óôï `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "êëåéäß %08lX: ôï äçìüóéï êëåéäß \"%s\" Ý÷åé åéóá÷èåß\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "êëåéäß %08lX: äåí ôáéñéÜæåé ìå ôï áíôßãñáöï ìáò\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "êëåéäß %08lX: áäõíáìßá åíôïðéóìïý ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "êëåéäß %08lX: áäõíáìßá áíÜãíùóçò ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝï user ID\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝá user ID\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝá õðïãñáöÞ\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝåò õðïãñáöÝò\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝï õðïêëåéäß\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝá õðïêëåéäéÜ\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "êëåéäß %08lX: \"%s\" áìåôÜâëçôï\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ìå Üêõñï êñõðôáëã. %d - ðáñáëåßöèçêå\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "äåí õðÜñ÷åé ðñïêáèïñéóìÝíç êëåéäïèÞêç: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß åéóÞ÷èçêå\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "êëåéäß %08lX: Þäç óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "êëåéäß %08lX: äå âñÝèçêå ôï ìõóôéêü êëåéäß: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "êëåéäß %08lX: ü÷é äçìüóéï êëåéäß - áäõíáìßá åöáñìïãÞò ðéóôïðïéçôéêïý " "áíÜêëçóçò\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - áðüññéøç\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "êëåéäß %08lX: \"%s\" ðéóôïðïéçôéêü áíÜêëçóçò åéóÞ÷èçêå\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé user ID ãéá ôçí õðïãñáöÞ\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý óôï user id \"%" "s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç êëåéäéïý\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "êëåéäß %08lX: áöáéñÝèçêå ç äÝóìåõóç ðïëëáðëïý õðïêëåéäéïý\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôçí áíÜêëçóç êëåéäéïý\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç áíÜêëçóç õðïêëåéäéïý\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "êëåéäß %08lX: áöáéñÝèçêå ç áíÜêëçóç ðïëëáðëïý õðïêëåéäéïý\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "êëåéäß %08lX: ðáñáëåßöèçêå user ID '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "êëåéäß %08lX: ðáñáëåßöèçêå õðïêëåéäß\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "êëåéäß %08lX: ìç åîáãüìåíç õðïãñáöÞ (êëÜóç %02x) - ðáñáëåßöèçêå\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "êëåéäß %08lX: ôï ðéóôïðïéçôéêü áíÜêëçóçò óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - ðáñáëåßöèçêå\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "" "êëåéäß %08lX: ç õðïãñáöÞ ôïõ õðïêëåéäéïý óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "êëåéäß %08lX: ìç áíáìåíþìåíç êëÜóç õðïãñáöÞò (0x%02x) - ðáñáëåßöèçêå\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "êëåéäß %08lX: åíôïðßóôçêå äéðëü user ID - åíþèçêáí\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: êëåéäß %08lX ìðïñåß íá áíáêëçèåß: ëÞøç êëåéäéïý áíÜêëçóçò %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: êëåéäß %08lX ìðïñåß íá áíáêëçèåß: ôï êëåéäß áíÜêëçóçò %08lX\n" "äåí åßíáé ðáñþí.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "êëåéäß %08lX: \"%s\" ðéóôïðïéçôéêü áíÜêëçóçò ðñïóôÝèçêå\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "êëåéäß %08lX: Üìåóç õðïãñáöÞ êëåéäéïý ðñïóôÝèçêå\n" @@ -2472,29 +2501,29 @@ msgstr "[áíÜêëçóç]" msgid "[self-signature]" msgstr "[éäéï-õðïãñáöÞ]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 êáêÞ õðïãñáöÞ\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d êáêÝò õðïãñáöÝò\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 õðïãñáöÞ äåí åëÝã÷èçêå ëüãù ÷áìÝíïõ êëåéäéïý\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù ÷áìÝíùí êëåéäéþí\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 õðïãñáöÞ äåí åëÝã÷èçêå ëüãï åíüò óöÜëìáôïò\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù óöáëìÜôùí\n" @@ -2513,20 +2542,27 @@ msgstr "%d user ID áíé÷íåýèçêáí ÷ùñßò Ýã msgid "User ID \"%s\" is revoked." msgstr "Ôï user ID \"%s\" áíáêáëåßôå." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Áäõíáìßá õðïãñáöÞò.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Ôï user ID \"%s\" áíáêáëåßôå." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï user ID \"%s\" äåí Ý÷åé éäéï-õðïãñáöåß.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2535,11 +2571,11 @@ msgstr "" "Ç éäéï-õðïãñáöÞ óôï \"%s\"\n" "åßíáé ìéá õðïãñáöÞ ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá OpenPGP éäéï-õðïãñáöÞ; (y/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2548,14 +2584,14 @@ msgstr "" "Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n" "Ý÷åé ëÞîåé.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" "ÈÝëåôå íá ïñßóåôå ìéá íÝá õðïãñáöÞ ðñïò áíôéêáôÜóôáóç ôçò ëçãìÝíçò; (y/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2564,43 +2600,43 @@ msgstr "" "Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n" "åßíáé ìéá ôïðéêÞ õðïãñáöÞ.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá ðëÞñç åîáãþãéìç õðïãñáöÞ; (y/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï îáíáõðïãñÜøåôå; (y/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Ôßðïôá ãéá íá õðïãñáöåß ìå ôï êëåéäß %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Áõôü ôï êëåéäß Ý÷åé ëÞîåé!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Áõôü ôï êëåéäß ðñüêåéôå íá ëÞîåé óôéò %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "ÈÝëåôå ç õðïãáöÞóáò íá ëÞîåé ôáõôü÷ñïíá; (Y/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2608,11 +2644,11 @@ msgstr "" "Ìðïñåßôå íá ÷ñçóéìüðïéÞóåôå ìéá OpenPGP õðïãñáöÞ óå Ýíá PGP 2.x ìüíï óå " "êáôÜóôáóç --pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Áõôü èá êÜíåé ôï êëåéäß Ü÷ñçóôï ìå ôï PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2622,31 +2658,35 @@ msgstr "" "áíÞêåé ðñÜãìáôé óôï ðñïáíöåñèÝí Üôïìï; ÅÜí äåí îÝñåôå ôé íá áðáíôÞóåôå " "ðáôÞóôå\"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Äåí áðáíôþ.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (ðñïêáèïñéóìÝíï)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Äåí Ý÷ù åëÝãîåé êáèüëïõ.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) ¸÷ù êÜíåé ôïí óõíÞèç Ýëåã÷ï.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) ¸÷ù êÜíåé åêôåôáìÝíï Ýëåã÷ï.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2654,7 +2694,7 @@ msgstr "" "Óßãïõñá èÝëåôå íá õðïãñÜøåôå áõôü ôï êëåéäß\n" "ìå ôï êëåéäß óáò: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2662,7 +2702,7 @@ msgstr "" "\n" "ÁõôÞ èá åßíáé ìéá éäéï-õðïãñáöÞ.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2670,7 +2710,7 @@ msgstr "" "\n" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ç õðïãñáöÞ äå èá óçìåéùèåß óáí ìç-åîáãþãéìç.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2679,7 +2719,7 @@ msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Ç õðïãñáöÞ äå èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n" "\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2687,7 +2727,7 @@ msgstr "" "\n" "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-åîáãþãéìç.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2696,7 +2736,7 @@ msgstr "" "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n" "\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2704,7 +2744,7 @@ msgstr "" "\n" "Äåí Ý÷ù åëÝãîåé êáèüëïõ áõôü ôï êëåéäß.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2712,7 +2752,7 @@ msgstr "" "\n" "¸÷ù êÜíåé óõíçèéóìÝíï Ýëåã÷ï óå áõôü ôï êëåéäß.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2720,34 +2760,34 @@ msgstr "" "\n" "¸÷ù åëÝãîåé ðïëý ðñïóåêôéêÜ áõôü ôï êëåéäß.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Óßãïõñá íá õðïãñáöåß; " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "ç õðïãñáöÞ áðÝôõ÷å: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Áõôü ôï êëåéäß äåí ðñïóôáôåýåôáé.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Ôï êëåéäß ðñïóôáôåýåôáé.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Áäýíáôç ç åðåîåñãáóßá áõôïý ôïõ êëåéäéïý:%s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2755,500 +2795,500 @@ msgstr "" "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "Äåí èÝëåôå öñÜóç êëåéäß - áõôü åßíáé ìÜëëïí *êáêÞ* éäÝá!\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Óßãïõñá èÝëåôå íá êÜíåôå áõôü; " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "áðïèÞêåõóç êáé Ýîïäïò" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "åðéëïãÞ user ID N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "áðåéêüíéóç õðïãñáöþí" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "õðïãñáöÞ ôïõ êëåéäéïý" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "ðñïóèÞêç åíüò user ID" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "ðñïóèÞêç åíüò photo ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "äéáãñáöÞ åíüò user ID" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "ðñïóèÞêç åíüò êëåéäéïý áíÜêëçóçò" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "äéáãñáöÞ õðïãñáöþí" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "ðñùôåýùí" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "áíáùåùìÝíåò åðéëïãÝò" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "áíÜêëçóç õðïãñáöþí" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "áíÜêëçóç åíüò user ID" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "áðåíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "åíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "áðåéêüíéóç photo ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "ÅíôïëÞ> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Ôï êëåéäß áíáêëÞèçêå." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï user ID; " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Ìç Ýãêõñç åíôïëÞ (äïêéìÜóôå \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Ðåñßëçøç: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Äõíáôüôçôå: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (åõáßóèçôï)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX äçìéïõñãßá: %s ëÞîç: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! ôï êëåéäß áíáêëÞèçêå: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- âñÝèçêå ðáñáðïéçìÝíç áíÜêëçóç\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3256,7 +3296,13 @@ msgstr "" "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n" "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3265,45 +3311,45 @@ msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n" " ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3313,16 +3359,16 @@ msgstr "" " êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n" " íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" @@ -3330,72 +3376,72 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "user ID: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3404,7 +3450,7 @@ msgstr "" "\"\n" "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3413,56 +3459,56 @@ msgstr "" "\"\n" "õðïãñÜöèçêå ôïðéêÜ ìå ôï êëåéäß óáò %08lX óôéò %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " áíáêëÞèçêå áðü %08lX óôéò %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "êáíÝíá ìõóôéêü êëåéäß\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" @@ -3471,69 +3517,69 @@ msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêë #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "ÐïëéôéêÞ êñßóéìçò õðïãñáöÞò: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "ÐïëéôéêÞ õðïãñáöÞò: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: âñÝèçêáí ìç Ýãêõñá äåäïìÝíá óçìåßùóçò\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Óçìåßùóç êñßóéìçò õðïãñáöÞò: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Óçìåßùóç õðïãñáöÞò: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "ìç áíáãíþóéìï" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "ÊëåéäïèÞêç" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [ëÞãåé: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Áðïôýðùìá êëåéäéïý =" @@ -3619,102 +3665,111 @@ msgstr "ÓÇÌÅÉÙÓÇ: ï áðïóôïëÝáò æÞôçóå \" msgid "original file name='%.*s'\n" msgstr "áñ÷éêü üíïìá áñ÷åßïõ='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "áíåîÜñôçôç áíÜêëçóç - ÷ñçóéìïðïéåßóôå \"gpg --import\" ãéá åöáñìïãÞ\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Óçìåßùóç: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "ÐïëéôéêÞ: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "êáôáóôïëÞ áíÜêëçóçò õðïãñáöÞò\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "áäõíáìßá ÷åéñéóìïý áõôþí ôùí ðïëëáðëþí õðïãñáöþí\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "ÕðïãñáöÞ %.*s ìå ÷ñÞóç ôïõ êëåéäéïý%s ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "ÊÁÊÇ õðïãñáöÞ áðü \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "ËçãìÝíç õðïãñáöÞ áðü \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "ÊáëÞ õðïãñáöÞ áðü \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[áâÝâáéï]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s õðïãñáöÞ áðü: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "ðñùôåýùí" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "Üãíùóôç Ýêäïóç" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "äåí åßíáé áðïêïììÝíç õðïãñáöÞ\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åíôïðéóìüò ðïëëáðëþí õðïãñáöþí. Ìüíï ç ðñþôç èá åëåã÷èåß.\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "áíåîÜñôçôç õðïãñáöÞ êëÜóçò 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "õðïãñáöÞ ðáëéïý óôõë (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "ìç Ýãêõñï ñéæéêü(root) ðáêÝôï áíé÷íåýôçêå óôï proc_tree()\n" @@ -3744,75 +3799,80 @@ msgstr "" "äåßôå ôï http://www.gnupg.org/why-not-idea.html ãéá ðåñéóóüôåñåò " "ðëçñïöïñßåò\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ìç óõíåéóôþìåíç åðéëïãÞ \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: \"%s\" åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "ðáñáêáëþ ÷ñçóéìïðïéÞóôå ôï \"%s%s\" êáëýôåñá\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "áõôü ôï ìÞíõìá ßóùò äåí ìðïñåß íá ÷ñçóéìïðïéçèåß áðü %s\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "áäõíáìßá ÷åéñéóìïý ôïõ áëãüñéèìïõ äçìïóßïõ êëåéäéïý %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "áäõíáìßá ïñéóìïý ôïõ pid ôïõ ðåëÜôç óéá ôï agent\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "áäõíáìßá áíÜãíùóçò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "áäõíáìßá åããñáöÞò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (êýñéï êëåéäß, ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3824,32 +3884,32 @@ msgstr "" "\"%.*s\"\n" "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "ÅðáíáëÜâåôå ôç öñÜóç\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "ç öñÜóç êëåéäß åßíáé ðïëý ìåãÜëç\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3859,20 +3919,20 @@ msgstr "" "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n" "ãéá ôï ÷ñÞóôç: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " @@ -3964,8 +4024,8 @@ msgid "failed sending to `%s': status=%u msgstr "áðïôõ÷ßá óôçí áðïóôïëÞ ðñïò ôï `%s': êáôÜóôáóç=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "áõôüò ï äéáêïìéóôÞò êëåéäéþí äåí åßíáé ðëÞñùò HKP óõìâáôüò\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4005,11 +4065,11 @@ msgstr "" "äçìéïõñãßá ôïõ ìç óõíåéóôüìåíïõ 16-bit checksum ãéá ôç ðñïóôáóßá ôïõ\n" "ìõóôéêïý êëåéäéïý\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: óýãêñïõóç õðïãñáöÞò ðåñßëçøçò óôï ìÞíõìá\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4018,19 +4078,19 @@ msgstr "" "êëåéäß %08lX: áõôü åßíáé Ýíá ðáñáãþìåíï áðü PGP ElGamal êëåéäß ôï ïðïßï\n" " ÄÅÍ åßíáé áóöáëåò ãéá õðïãñáöÝò!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "" "ôï äçìüóéï êëåéäß %08lX åßíáé %lu äåõôåñüëåðôï íåüôåñï áðü ôçí õðïãñáöÞ\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "" "ôï äçìüóéï êëåéäß %08lX åßíáé %lu äåõôåñüëåðôá íåüôåñï áðü ôçí õðïãñáöÞ\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4039,7 +4099,7 @@ msgstr "" "ôï êëåéäß %08lX äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4048,51 +4108,56 @@ msgstr "" "ôï êëåéäß %08lX äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß õðïãñáöÞò %08lX Ýëçîå óôéò %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "õðüèåóç êáêÞò õðïãñáöÞò áðü êëåéäß %08lX ëüãù Üãíùóôïõ êñßóéìïõ bit\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "êëåéäß %08lX: êáíÝíá õðïêëåéäß ãéá ôï ðáêÝôï áíÜêëçóçò õðïêëåéäéïý\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç êëåéäéïý\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá óôçí %%-áíÜðôõîç óçìåßùóçò (ðïëõ ìåãÜëç).\n" " ×ñÞóç ìç áíåðôõãìÝíïõ.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4121,12 +4186,12 @@ msgstr "" "ìðïñåßôå íá õðïãñÜøåôå-áðïêïììÝíá ìå êëåéäéÜ ôýðïõ PGP 2.x ìüíï óå\n" "--pgp2 êáôÜóôáóç\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4142,7 +4207,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "ìðïñåßôå íá õðïãñÜøåôå êáèáñÜ ìå êëåéäéÜ ôýðïõ PGP 2.x óå êáôÜóôáóç --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s êñõðôïãñÜöçóç èá ÷ñçóéìïðïéçèåß\n" @@ -4157,12 +4222,12 @@ msgstr "áäõíáìßá ÷åéñéóìïý ãñáììþí êåéìÝ msgid "input line longer than %d characters\n" msgstr "ãñáììÞ åéóüäïõ ìåãáëýôåñç áðü %d ÷áñáêôÞñåò\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: áðïôõ÷ßá lseek: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: áðïôõ÷ßá write (n=%d): %s\n" @@ -4171,122 +4236,122 @@ msgstr "trustdb rec %lu: áðïôõ÷ßá write msgid "trustdb transaction too large\n" msgstr "ðïëý ìåãÜëç óõíáëëáãÞ trustdb\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: áäõíáìßá ðñüóâáóçò: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: ï öÜêåëïò äåí õðÜñ÷åé!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: áäõíáìßá äçìéïõñãßáò êëåéäþìáôïò (lock)\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: áäõíáìßá äçìéïõñãßáò êëåéäþìáôïò (lock)\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: áäõíáìßá äçìéïõñãßáò: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: áðïôõ÷ßá äçìéïõñãßáò ìéáò åããñáöÞò Ýêäïóçò: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: äçìéïõñãÞèçêå ìç Ýãêõñç trustdb\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: äçìéïõñãÞèçêå ç trustdb\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "ÓÇÌÅÉÙÓÇ: ç trustdb äåí åßíáé åããñÜøéìç\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ìç Ýãêõñç trustdb\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: áäõíáìßá äçìéïõñãßáò hashtable: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: óöÜëìá óôçí åíçìÝñùóç ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: óöÜëìá óôçí åããñáöÞ ôçò åããñáöÞò Ýêäïóçò: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: áðÝôõ÷å lseek: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read áðÝôõ÷å (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: äåí åßíáé trustdb áñ÷åßï\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: åããñáöÞ Ýêäïóçò ìå recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ìç Ýãêõñç Ýêäïóç áñ÷åßïõ %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò free : %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: óöÜëìá óôçí åããñáöÞ ôçò åããñáöÞò dir : %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: áðïôõ÷ßá óôïí ìçäåíéóìü ìéáò åããñáöÞò: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: áðïôõ÷ßá óôçí ðñïóèÞêç ìéáò åããñáöÞò: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n" @@ -4337,40 +4402,40 @@ msgstr "åããñáöÞ trust %lu, ôýðïò %d: wri msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync áðÝôõ÷å: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "Ýëåã÷ïò ôçò trustdb\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "" "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4379,7 +4444,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "Ýëåã÷ïò óå âÜèïò %d õðïãñáöèçêå=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4945,17 +5010,17 @@ msgstr "Ðáñáêáëþ äéïñèþóôå áõôÞ ôçí ðéèá msgid "checking keyring `%s'\n" msgstr "Ýëåã÷ïò êëåéäïèÞêçò `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu êëåéäéÜ Ý÷ïõí ìÝ÷ñé ôþñá åëåã÷èåß (%lu õðïãñáöÝò)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: êëåéäïèÞêç äçìéïõñãÞèçêå\n" @@ -5056,7 +5121,7 @@ msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò ðñïóùñéíïý öáêÝëïõ `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "ðïôÝ " @@ -5152,33 +5217,33 @@ msgstr "" "ðñïóï÷Þ ôï óýóôçìá åêôýðùóçò óôï ìç÷áíçìÜ óáò ìðïñåß íá áðïèçêåýóåé ôçí\n" "åêôýðùóç êáé íá ôçí êÜíåé äéáèÝóéìç óå Üëëïõò!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôçí áéôßá ãéá ôçí áíÜêëçóç:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Áêýñùóç" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Ðéèáíþí íá èÝëåôå íá åðéëÝîåôå ôï %d åäþ)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "ÐëçêôñïëïãÞóôå ìéá ðñïáéñåôéêÞ ðåñéãñáöÞ· ôÝëïò ìå ìéá Üäåéá ãñáììÞ:\n" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Áéôßá ãéá áíÜêëçóç: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Äåí äþèçêå ðåñéãñáöÞ)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Åßíáé áõôü åíôÜîåé; " @@ -5222,3 +5287,6 @@ msgstr "óöÜëìá óôçí åýñåóç ôçò åããñáöÞò #, c-format msgid "read error: %s\n" msgstr "óöÜëìá áíÜãíùóçò: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "áõôüò ï äéáêïìéóôÞò êëåéäéþí äåí åßíáé ðëÞñùò HKP óõìâáôüò\n" diff -urpP gnupg-1.2.2/po/eo.po gnupg-1.2.3/po/eo.po --- gnupg-1.2.2/po/eo.po 2003-05-01 14:38:02.000000000 +0000 +++ gnupg-1.2.3/po/eo.po 2003-08-21 20:04:59.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -46,7 +46,7 @@ msgstr "ne" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "fini" @@ -273,63 +273,63 @@ msgstr "... æi tio estas cimo (%s:%d:%s) msgid "you found a bug ... (%s:%d)\n" msgstr "vi trovis cimon ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "ne povas malfermi '%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "ne povas stat-i '%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "'%s' ne estas normala dosiero - ignorita\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "noto: dosiero random_seed estas malplena\n" -#: cipher/random.c:401 +#: cipher/random.c:407 #, fuzzy msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "ne povas legi '%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "noto: dosiero random_seed ne aktualigita\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "ne povas krei '%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "ne povas skribi '%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "ne povas fermi '%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVERTO: uzas malsekuran stokastilon!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -359,6 +359,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -366,7 +371,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -374,163 +379,163 @@ msgstr "" "@Komandoj:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[dosiero]|fari subskribon" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[dosiero]|fari klartekstan subskribon" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "fari apartan subskribon" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "æifri datenojn" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[dosieroj]|æifri dosierojn" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "æifri nur kun simetria æifro" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "nur skribi" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "malæifri datenojn (implicita elekto)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[dosieroj]|malæifri dosierojn" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "kontroli subskribon" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "listigi þlosilojn" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "listigi þlosilojn kaj subskribojn" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "kontroli þlosilsubskribojn" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "listigi þlosilojn kaj fingroþpurojn" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "listigi sekretajn þlosilojn" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "krei novan þlosilparon" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "forigi þlosilojn de la publika þlosilaro" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "forigi þlosilojn de la sekreta þlosilaro" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "subskribi þlosilon" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "subskribi þlosilon loke" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "subskribi þlosilon nerevokeble" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "subskribi þlosilon loke kaj nerevokeble" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "subskribi aý redakti þlosilon" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "krei revokatestilon" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "eksporti þlosilojn" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "eksporti þlosilojn al þlosilservilo" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importi þlosilojn de þlosilservilo" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "seræi þlosilojn æe þlosilservilo" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "aktualigi æiujn þlosilojn de þlosilservilo" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importi/kunfandi þlosilojn" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "listigi nur la sinsekvon de paketoj" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "eksporti la posedantofido-valorojn" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importi posedantofido-valorojn" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "aktualigi la fido-datenaron" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "senintervena aktualigo de fido-datenaro" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "ripari fuþitan fido-datenaron" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "elkirasigi dosieron aý la normalan enigon" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "enkirasigi dosieron aý la normalan enigon" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -540,151 +545,151 @@ msgstr "" "Opcioj:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "krei eligon en askia kiraso" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOMO|æifri por NOMO" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "uzi la implicitan þlosilon kiel implicitan ricevonton" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "uzi æi tiun uzantidentigilon por subskribi aý malæifri" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|difini densig-nivelon N (0=nenia)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "uzi tekstan reøimon" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "uzi dosieron por eligo" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "detala eligo" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "iom malpli da informoj" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "tute ne uzi la terminalon" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "devigi v3-subskribojn" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "ne devigi v3-subskribojn" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "devigi v4-subskribojn" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "ne devigi v4-þlosilsubskribojn" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "æiam uzi sigelon (MDC) por æifrado" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "neniam uzi MDC por æifrado" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "fari neniajn þanøojn" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "uzi gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "neinteraga reøimo: neniam demandi" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "supozi \"jes\" æe la plej multaj demandoj" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "supozi \"ne\" æe la plej multaj demandoj" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "aldoni æi tiun þlosilaron al la listo de þlosilaroj" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "aldoni æi tiun sekretan þlosilaron al la listo" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "montri, en kiu þlosilaro estas listigita þlosilo" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVILO|uzi æi tiun þlosilservilon por seræi þlosilojn" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "legi la opciojn el dosiero" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[dosiero]|skribi statusinformojn al dosiero" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|fidi æi tiun þlosilon absolute" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "imiti la reøimon priskribitan en RFC 1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "þalti æiujn paket-, æifrad- kaj kompendi-opciojn al OpenPGP-konduto" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "þalti æiujn paket-, æifrad- kaj kompendi-opciojn al PGP-2.x-konduto" @@ -728,7 +733,7 @@ msgstr "Ne montri Foto-Identigilojn" msgid "Set command line to view Photo IDs" msgstr "Agordi komandlinion por montri Foto-Identigilojn" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -736,7 +741,7 @@ msgstr "" "@\n" "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -756,15 +761,15 @@ msgstr "" " --list-keys [nomoj] montri þlosilojn\n" " --fingerprint [nomoj] montri fingroþpurojn\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Bonvolu raporti cimojn al .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -774,7 +779,7 @@ msgstr "" "subskribi, kontroli, æifri aý malæifri\n" "implicita operacio dependas de la enigataj datenoj\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -782,323 +787,357 @@ msgstr "" "\n" "Realigitaj metodoj:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 #, fuzzy msgid "Compression: " msgstr "Komento: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uzado: gpg [opcioj] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "malkongruaj komandoj\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, fuzzy, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, fuzzy, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "opcio-dosiero '%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 #, fuzzy msgid "invalid export options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "ne eblas samtempe subskribi kaj æifri kun --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, 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/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "la densig-metodo devas esti inter %d kaj %d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth devas esti inter 1 kaj 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "Tiu komando ne eblas en la reøimo %s.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "Tiu komando ne eblas en la reøimo %s.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "Tiu komando ne eblas en la reøimo %s.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key uzantidentigilo" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key uzantidentigilo" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "ne povas malfermi %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Kreado de þlosiloj malsukcesis: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Kreado de þlosiloj malsukcesis: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record malsukcesis: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[dosiero]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Ektajpu vian mesaøon ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "ne povas malfermi '%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1107,20 +1146,20 @@ msgstr "" "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn " "kaj fini per '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "la donita gvidlinia URL por atestado ne validas\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" @@ -1264,7 +1303,7 @@ msgstr "" "Nenia fidovaloro atribuita al:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alinome \"" @@ -1322,7 +1361,7 @@ msgstr " s = supersalti æi tiun þlosilon msgid " q = quit\n" msgstr " f = fini\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Via decido? " @@ -1499,109 +1538,109 @@ msgstr "%s: ignorita: publika þlosilo es msgid "no valid addressees\n" msgstr "mankas validaj adresitoj\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "prefero %c%lu ne estas valida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "prefero %c%lu ripetita\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "tro da '%c'-preferoj\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 #, fuzzy msgid "invalid character in preference string\n" msgstr "nevalida signo en signoæeno\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 #, fuzzy msgid "writing direct signature\n" msgstr "skribas mem-subskribon\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "skribas mem-subskribon\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "skribas þlosilbindan subskribon\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "þlosilgrando nevalida; uzas %u bitojn\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "þlosilgrando rondigita øis %u bitoj\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (nur subskribi)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (nur æifri)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (subskribi kaj æifri)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (nur subskribi)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (subskribi kaj æifri)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Via elekto? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 #, fuzzy msgid "Create anyway? " msgstr "Æu tamen uzi æi tiun þlosilon? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Nevalida elekto.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1614,19 +1653,19 @@ msgstr "" " implicita þlosilgrando estas 1024 bitoj\n" " plej granda rekomendata þlosilgrando estas 2048 bitoj\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Kiun þlosilgrandon vi deziras? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n" @@ -1638,12 +1677,12 @@ msgstr "þlosilgrando tro malgranda; 768 #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1651,11 +1690,11 @@ msgstr "" "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n" "æar la komputado daýras TRE longe!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1663,17 +1702,17 @@ msgstr "" "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre " "facile kaptebla!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Petita þlosilgrando estas %u bitoj\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "rondigita øis %u bitoj\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1689,7 +1728,7 @@ msgstr "" " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1705,30 +1744,30 @@ msgstr "" " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Þlosilo validu ...? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Þlosilo validu por ...? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "nevalida valoro\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s neniam eksvalidiøos\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s eksvalidiøos je %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1736,11 +1775,11 @@ msgstr "" "Via sistemo ne povas montri datojn post 2038.\n" "Tamen, øi estos øuste traktata øis 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Æu tio estas øusta (j/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1755,44 +1794,44 @@ msgstr "" " \"Heinrich Heine (la poeto) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Vera nomo: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Nevalida signo en nomo\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Nomo ne povas komenciøi per cifero\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Nomo devas havi almenaý 5 signojn\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Retadreso: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Nevalida retadreso\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Komento: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Nevalida signo en komento\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vi uzas la signaron '%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1803,27 +1842,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Bonvolu ne meti la retadreson en la veran nomon aý la komenton\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkAaBbFf" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Bonvolu korekti la eraron unue\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1831,16 +1870,16 @@ msgstr "" "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1852,7 +1891,7 @@ msgstr "" "uzante æi tiun programon kun la opcio \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1864,53 +1903,53 @@ msgstr "" "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n" "akiri sufiæe da entropio.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA-þlosilparo havos 1024 bitojn.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Kreado de þlosiloj nuligita.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "neniu skribebla publika þlosilaro trovita: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "neniu skribebla sekreta þlosilaro trovita: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "eraro dum skribado de publika þlosilaro '%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "þlosilo markita kiel absolute fidata.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1918,12 +1957,12 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1931,7 +1970,7 @@ msgstr "" "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1939,25 +1978,25 @@ msgstr "" "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Æu vere krei? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output ne funkcias por æi tiu komando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: ne povas malfermi: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "eraro dum kreado de pasfrazo: %s\n" @@ -1966,17 +2005,17 @@ msgstr "eraro dum kreado de pasfrazo: %s msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "'%s' jam densigita\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVERTO: malplena dosiero\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "eblas æifri nur per RSA-þlosiloj de maksimume 2048 bitoj kun --pgp2\n" @@ -1990,7 +2029,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "ne povas uzi la æifron IDEA por æiuj þlosiloj, al kiuj vi æifras.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2005,423 +2044,413 @@ msgstr "NOTO: æifrad-metodo %d ne trovit msgid "you may not use %s while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, fuzzy, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s-æifrita por: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "eraro dum legado de þlosilbloko: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "þlosilo %08lX: ne estas RFC-2440-þlosilo - ignorita\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "þlosilo %08lX: ne protektita - ignorita\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "þlosilo %08lX: PGP-2.x-stila þlosilo - ignorita\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "AVERTO: nenio estis eksportita\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "tro da registroj en pk-staplo - malþaltas\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Uzantidentigilo ne trovita]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, fuzzy, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "estas sekreta þlosilo por la publika þlosilo \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "ignoras blokon de speco %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu þlosiloj jam traktitaj\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "eraro dum legado de '%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr " Nombro traktita entute: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignoritaj novaj þlosiloj: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sen uzantidentigilo: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importitaj: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " neþanøitaj: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " novaj uzantidentigiloj: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " novaj subþlosiloj: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " novaj subskriboj: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " novaj þlosilrevokoj: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " sekretaj þlosiloj legitaj: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "sekretaj þlosiloj importitaj: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "sekretaj þlosiloj neþanøitaj: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importitaj: %lu" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "þlosilo %08lX: mankas uzantidentigilo\n" -#: g10/import.c:634 +#: g10/import.c:587 #, fuzzy, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:649 +#: g10/import.c:602 #, fuzzy, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "þlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "þlosilo %08lX: mankas valida uzantidentigilo\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "þlosilo %08lX: publika þlosilo ne trovita: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "þlosilo %08lX: nova þlosilo - ignorita\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "neniu skribebla þlosilaro trovita: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "skribas al '%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "eraro dum skribado de þlosilaro '%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, fuzzy, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "þlosilo %08lX: publika þlosilo importita\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "þlosilo %08lX: diferencas de nia kopio\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "þlosilo %08lX: ne povas trovi originalan þlosilblokon: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "þlosilo %08lX: ne povas legi originalan þlosilblokon: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "þlosilo %08lX: 1 nova uzantidentigilo\n" -#: g10/import.c:788 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "þlosilo %08lX: %d novaj uzantidentigiloj\n" -#: g10/import.c:791 +#: g10/import.c:742 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "þlosilo %08lX: 1 nova subskribo\n" -#: g10/import.c:794 +#: g10/import.c:745 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "þlosilo %08lX: %d novaj subskriboj\n" -#: g10/import.c:797 +#: g10/import.c:748 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "þlosilo %08lX: 1 nova subþlosilo\n" -#: g10/import.c:800 +#: g10/import.c:751 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "þlosilo %08lX: %d novaj subþlosiloj\n" -#: g10/import.c:819 +#: g10/import.c:770 #, fuzzy, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "þlosilo %08lX: ne þanøita\n" -#: g10/import.c:881 +#: g10/import.c:832 #, fuzzy, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "mankas implicita sekreta þlosilaro: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "þlosilo %08lX: sekreta þlosilo importita\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "þlosilo %08lX: jam en sekreta þlosilaro\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "þlosilo %08lX: sekreta þlosilo ne trovita: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "þlosilo %08lX: publika þlosilo mankas - ne povas apliki revokatestilon\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "þlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "þlosilo %08lX: revokatestilo importita\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "þlosilo %08lX: mankas uzantidentigilo por subskribo\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, fuzzy, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, fuzzy, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, fuzzy, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "þlosilo %08lX.%lu: Valida subþlosilrevoko\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "þlosilo %08lX: ignoris uzantidentigilon '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "þlosilo %08lX: ignoris subþlosilon\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "þlosilo %08lX: revokatestilo en maløusta loko - ignorita\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "þlosilo %08lX: nevalida revokatestilo: %s - ignorita\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, fuzzy, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "þlosilo %08lX: revokatestilo en maløusta loko - ignorita\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, fuzzy, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "þlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -#: g10/import.c:1535 +#: g10/import.c:1500 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "þlosilo %08lX: revokatestilo aldonita\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "þlosilo %08lX: rekta þlosilsubskribo aldonita\n" @@ -2434,29 +2463,29 @@ msgstr "[revoko]" msgid "[self-signature]" msgstr "[mem-subskribo]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 malbona subskribo\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d malbonaj subskriboj\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 subskribo ne kontrolita pro manko de þlosilo\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d subskriboj ne kontrolitaj pro manko de þlosiloj\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 subskribo ne kontrolita pro eraro\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d subskriboj ne kontrolitaj pro eraroj\n" @@ -2475,21 +2504,28 @@ msgstr "%d uzantidentigiloj sen valida m msgid "User ID \"%s\" is revoked." msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "" #: g10/keyedit.c:382 #, fuzzy, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +msgid "User ID \"%s\" is expired." +msgstr "Uzantidentigilo \"%s\" estas revokita.\n" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, fuzzy, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2500,7 +2536,7 @@ msgstr "" "\n" "Æu vi volas igi øin plena eksportebla subskribo?\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 #, fuzzy msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" @@ -2509,7 +2545,7 @@ msgstr "" "\n" "Æu vi volas igi øin plena eksportebla subskribo?\n" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, fuzzy, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2520,14 +2556,14 @@ msgstr "" "\n" "Æu vi volas igi øin plena eksportebla subskribo?\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 #, fuzzy msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Æu vi volas, ke via subskribo eksvalidiøu je la sama tempo? (j/n) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, fuzzy, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2538,7 +2574,7 @@ msgstr "" "\n" "Æu vi volas igi øin plena eksportebla subskribo?\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 #, fuzzy msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" @@ -2547,53 +2583,53 @@ msgstr "" "\n" "Æu vi volas igi øin plena eksportebla subskribo?\n" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, fuzzy, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" jam estis %ssubskribita per þlosilo %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, fuzzy, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" jam estis %ssubskribita per þlosilo %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nenio por subskribi per þlosilo %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Æi tiu þlosilo eksvalidiøis!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 #, fuzzy msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Æu vi volas, ke via subskribo eksvalidiøu je la sama tempo? (j/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 #, fuzzy msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "eblas subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 #, fuzzy msgid "This would make the key unusable in PGP 2.x.\n" msgstr "æi tiu mesaøo povas ne esti uzebla de PGP 2.x\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2602,32 +2638,36 @@ msgstr "" "Kiom zorge vi kontrolis, ke la þlosilo, kiun vi subskribos, vere apartenas\n" "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Mi ne respondas.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 #, fuzzy msgid " (default)" msgstr "malæifri datenojn (implicita elekto)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Mi tute ne kontrolis.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Mi malzorge kontrolis.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Mi tre zorge kontrolis.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2635,14 +2675,14 @@ msgstr "" "Æu vi estas tute certa, ke vi volas subskribi æi tiun þlosilon\n" "per via þlosilo: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 #, fuzzy msgid "" "\n" "This will be a self-signature.\n" msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 #, fuzzy msgid "" "\n" @@ -2651,7 +2691,7 @@ msgstr "" "\n" "La subskribo estos markita kiel neeksportebla.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 #, fuzzy msgid "" "\n" @@ -2660,7 +2700,7 @@ msgstr "" "\n" "La subskribo estos markita kiel nerevokebla.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2668,7 +2708,7 @@ msgstr "" "\n" "La subskribo estos markita kiel neeksportebla.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2676,7 +2716,7 @@ msgstr "" "\n" "La subskribo estos markita kiel nerevokebla.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2684,7 +2724,7 @@ msgstr "" "\n" "Mi tute ne kontrolis æi tiun þlosilon.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2692,7 +2732,7 @@ msgstr "" "\n" "Mi malzorge kontrolis æi tiun þlosilon.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2700,34 +2740,34 @@ msgstr "" "\n" "Mi tre zorge kontrolis æi tiun þlosilon.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Æu vere subskribi? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "subskribado malsukcesis: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Æi tiu þlosilo ne estas protektita.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Þlosilo estas protektita.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Ne povas redakti æi tiun þlosilon: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2735,7 +2775,7 @@ msgstr "" "Donu la novan pasfrazon por æi tiu sekreta þlosilo.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2743,506 +2783,512 @@ msgstr "" "Vi ne deziras pasfrazon - tio verþajne estas *malbona* ideo!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Æu vi vere volas fari tion? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "movas þlosilsubskribon al la øusta loko\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "forlasi æi tiun menuon" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "f" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "skribi" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "skribi kaj fini" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "helpo" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "montri æi tiun helpon" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fsp" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "montri fingrospuron" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "listo" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "listigi þlosilojn kaj uzantidentigilojn" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "elekti uzantidentigilon N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "þlosilo" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "elekti flankan þlosilon N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "kontroli" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "listigi subskribojn" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "k" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "subskribi" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "subskribi la þlosilon" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsub" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "subskribi la þlosilon loke" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsub" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "subskribi la þlosilon nerevokeble" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsub" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "subskribi la þlosilon loke kaj nerevokeble" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "spuri" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "aluid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "alfoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "aldoni foto-identigilon" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "foruid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "forviþi uzantidentigilon" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "forfoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "al" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "for" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "forviþi flankan þlosilon" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "addrevoker" msgstr "revokita" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "add a revocation key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "forsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "forviþi subskribojn" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "eksval" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "þanøi la daton de eksvalidiøo" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "æefa" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "marku uzantidentigilon kiel æefan" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "alia" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "de sekreta aý publika listo iri al la alia" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "a" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "listigi preferojn (spertula)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "monpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "listigi preferojn (detale)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "agpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "agordi liston de preferoj" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "aktpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "aktualigitaj preferoj" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "pasf" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "þanøi la pasfrazon" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "fido" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "þanøi la posedantofidon" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoki subskribojn" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revuid" msgstr "revsig" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revoke a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "rev" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoki flankan þlosilon" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "el" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "malþalti þlosilon" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "en" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "þalti þlosilon" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "monfoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "montri foto-identigilon" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "ne povas fari tion en neinteraga reøimo\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Sekreta þlosilo estas havebla.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Komando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Bezonas la sekretan þlosilon por fari tion.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 #, fuzzy msgid "Key is revoked." msgstr "Þlosilo estas revokita.\n" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Æu vere subskribi æiujn uzantidentigilojn? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Vi devas elekti almenaý unu þlosilon.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Æu vi vere volas forviþi æi tiun þlosilon? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 #, fuzzy msgid "Really revoke all selected user IDs? " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 #, fuzzy msgid "Really revoke this user ID? " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Æu vi vere volas revoki æi tiun þlosilon? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Æu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Æu vere aktualigi la preferojn? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Æu skribi þanøojn? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Æu fini sen skribi þanøojn? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "aktualigo malsukcesis: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "aktualigo de sekreto malsukcesis: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, fuzzy, c-format msgid "This key may be revoked by %s key " msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sentema)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX kreita: %s eksvalidiøos: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " fido: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Æi tiu þlosilo estas malþaltita" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! subþlosilo estas revokita: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- falsita revoko trovita\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problemo en kontrolo de revoko: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "rev" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "eksval" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3251,46 +3297,46 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 #, 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Forviþis %d subskribon.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Forviþis %d subskribojn.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nenio estis forviþita.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 #, fuzzy msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " @@ -3300,85 +3346,85 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 #, 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:2402 +#: g10/keyedit.c:2473 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Donu la þlosilgrandon" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, 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:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 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:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Mankas responda subskribo en sekreta þlosilaro\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Bonvolu elekti precize unu uzantidentigilon.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, fuzzy, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Mankas flanka þlosilo kun indekso %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "uzantidentigilo: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3387,7 +3433,7 @@ msgstr "" "\"\n" "subskribita per via þlosilo %08lX je %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, fuzzy, c-format msgid "" "\"\n" @@ -3396,59 +3442,59 @@ msgstr "" "\"\n" "subskribita per via þlosilo %08lX je %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 #, 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:3052 +#: g10/keyedit.c:3128 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, fuzzy, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " subskribita per %08lX je %s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revokita de %08lX je %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Vi revokos la sekvajn subskribojn:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " subskribita per %08lX je %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Æu vere krei la revokatestilojn? (j/N)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "mankas sekreta þlosilo\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" @@ -3457,74 +3503,74 @@ msgstr "Uzantidentigilo \"%s\" estas rev #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 #, fuzzy msgid "Critical signature policy: " msgstr "Subskribo-gvidlinioj: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Subskribo-gvidlinioj: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "AVERTO: nevalida notacia dateno trovita\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 #, fuzzy msgid "Critical signature notation: " msgstr "Subskribo-notacio: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Subskribo-notacio: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "ne homlegebla" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Þlosilaro" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [eksvalidiøos: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 #, fuzzy msgid "Primary key fingerprint:" msgstr "listigi þlosilojn kaj fingroþpurojn" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 #, fuzzy msgid " Primary key fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Þlosilo-fingrospuro =" @@ -3609,101 +3655,110 @@ msgstr "NOTO: sendinto petis konfidencon msgid "original file name='%.*s'\n" msgstr "originala dosiernomo='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "memstara revoko - uzu \"gpg --import\" por apliki øin\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notacio: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Gvidlinio: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "kontrolo de subskribo estas malþaltita\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "ne povas trakti æi tiujn pluroblajn subskribojn\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Subskribo farita je %.*s per %s, þlosilo %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Nenia helpo disponata" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "MALBONA subskribo de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Eksvalidiøinta subskribo de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Bona subskribo de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[malcerta]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "æefa" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "nekonata versio" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne povas kontroli subskribon: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "ne aparta subskribo\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "memstara subskribo de klaso 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "malnovstila subskribo (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "nevalida radikpaketo trovita en proc_tree()\n" @@ -3730,75 +3785,80 @@ msgid "" msgstr "" "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, 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/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "ne povas trakti publikþlosilan metodon %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ne estas disponata en æi tiu sesio\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "ne povas agordi kliento-PID por la agento\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "ne povas akiri lego-FD de servilo por la agento\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "ne povas akiri skribo-FD de servilo por la agento\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokolversio %d de gpg-agent ne estas uzebla\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ne povas konektiøi al '%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malþaltas uzadon de agento\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (æefþlosilo %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3809,32 +3869,32 @@ msgstr "" "\"%.*s\"\n" "%u-bita %s þlosilo, ID %08lX, kreita je %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Ripetu pasfrazon\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Donu pasfrazon\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "pasfrazo estas tro longa\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3844,20 +3904,20 @@ msgstr "" "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -3950,7 +4010,7 @@ msgid "failed sending to `%s': status=%u msgstr "malsukceso dum sendo al '%s': statuso=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" +msgid "this keyserver does not support --search-keys\n" msgstr "" #: g10/hkp.c:519 @@ -3990,11 +4050,11 @@ msgstr "" msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4003,17 +4063,17 @@ msgstr "" "æi tio estas PGP-kreita ElGamal-þlosilo, kiu NE estas sekura por " "subskribado!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, fuzzy, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, fuzzy, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, fuzzy, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4022,7 +4082,7 @@ msgstr "" "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, fuzzy, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4031,45 +4091,50 @@ msgstr "" "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTO: subskribo-þlosilo %08lX eksvalidiøis je %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, fuzzy, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, fuzzy, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -#: g10/sign.c:105 +#: g10/sign.c:111 #, fuzzy, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen " "kompletigo.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4097,12 +4162,12 @@ msgstr "AVERTO: '%s' estas malplena dosi msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "eblas subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "ne povas krei %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, fuzzy, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" @@ -4116,7 +4181,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "eblas klartekste subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s æifrado estos aplikata\n" @@ -4131,12 +4196,12 @@ msgstr "ne povas trakti tekstliniojn pli msgid "input line longer than %d characters\n" msgstr "enigata linio pli longa ol %d signojn\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n" @@ -4145,122 +4210,122 @@ msgstr "fido-datenaro loko %lu: skribo m msgid "trustdb transaction too large\n" msgstr "fido-datenaro-transakcio tro granda\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: ne povas aliri: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: dosierujo ne ekzistas!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: ne povas krei þloson\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: ne povas krei þloson\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: ne povas krei: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: malsukcesis krei versiregistron: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: nevalida fido-datenaro kreita\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: fido-datenaro kreita\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: nevalida fido-datenaro\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: malsukcesis krei haktabelon: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: eraro dum aktualigo de versiregistro: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: eraro dum legado de versiregistro: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: eraro dum skribado de versiregistro: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "fido-datenaro: lseek malsukcesis: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ne estas fido-datenaro\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versiregistro kun registronumero %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: eraro dum legado de libera registro: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: eraro dum skribo de dosieruja registro: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: malsukcesis nuligi registron: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: malsukcesis aldoni registron: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la fido-datenaro estas fuþita; bonvolu ruli \"gpg --fix-trustdb\".\n" @@ -4309,39 +4374,39 @@ msgstr "fido-datenaro %lu, speco %d: skr msgid "trustdb: sync failed: %s\n" msgstr "fido-datenaro: sync malsukcesis: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "sekva kontrolo de fido-datenaro je %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "kontrolas la fido-datenaron\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "publika þlosilo %08lX ne trovita: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" @@ -4349,7 +4414,7 @@ msgstr "publika þlosilo de absolute fida #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4898,17 +4963,17 @@ msgstr "Bonvolu ripari æi tiun eblan sek msgid "checking keyring `%s'\n" msgstr "kontrolas þlosilaron '%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu þlosiloj jam kontrolitaj (%lu subskriboj)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu þlosiloj kontrolitaj (%lu subskriboj)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: þlosilaro kreita\n" @@ -5003,7 +5068,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -5096,37 +5161,37 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "Kialo por revoko: " -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 #, 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:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "Kialo por revoko: " -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Æu tamen uzi æi tiun þlosilon? " @@ -5305,9 +5370,6 @@ msgstr "kiraso: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "eraro dum legado de æefa þlosilo por LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record malsukcesis: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "þlosilo %08lX: peto-registro malsukcesis\n" @@ -5320,9 +5382,6 @@ msgstr "kiraso: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "þlosilo %08lX: sekreta kaj publika þlosiloj ne kongruas\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "þlosilo %08lX.%lu: Bona subþlosila bindado\n" diff -urpP gnupg-1.2.2/po/es.po gnupg-1.2.3/po/es.po --- gnupg-1.2.2/po/es.po 2003-05-01 14:38:05.000000000 +0000 +++ gnupg-1.2.3/po/es.po 2003-08-21 20:05:04.000000000 +0000 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-26 21:00+0100\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-25 19:00+0100\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "salir" @@ -302,16 +302,16 @@ msgstr "... esto es un bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "ha encontrado un error... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "no se ha detectado módulo acumulador de entropía\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "no se puede abrir `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "no se puede obtener información de `%s': %s\n" @@ -321,49 +321,49 @@ msgstr "no se puede obtener información # Sugerencia a la sugerencia: ¿qué tal omitido? (pasar en silencio una # cosa; excluirla de lo que se habla o escribe) dice el diccionario. # Bien. También se puede poner "descartado". -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s` no es un fichero regular - omitido\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "nota: el fichero de semillas aleatorias está vacío\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "ATENCIÓN: tamaño incorrecto del fichero de semillas aleatorias - no se usa\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "no se puede leer `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "no se puede crear %s: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "no se puede escribir `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "no se puede cerrar `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "ATENCIÓN: ¡usando un generador de números aleatorios inseguro!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -394,6 +394,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "el algoritmo de resumen `%s' es de sólo lectura en esta versión\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -408,7 +413,7 @@ msgstr "" # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se # puede acentuar? ¿demasiado alta? # ¿Quién dice que no se puede? :-) -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -416,163 +421,163 @@ msgstr "" "@Órdenes:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[file]|crea una firma" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[file]|crea una firma en texto claro" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "crea una firma separada" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[ficheros]|cifra ficheros" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "cifra sólo con un cifrado simétrico" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "sólo almacenar" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[ficheros]|descifra ficheros" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "lista claves" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "lista claves y firmas" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "lista claves y huellas dactilares" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "lista claves secretas" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "elimina claves del anillo público" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "elimina claves del anillo privado" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "firma la clave" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "firma la clave localmente" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "firma la clave no revocablemente" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "firma la clave localmente y no revocablemente" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "genera un certificado de revocación" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exporta claves" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "busca claves en un servidor de claves" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "actualiza todas las claves desde un servidor de claves" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importa/fusiona claves" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "lista sólo la secuencia de paquetes" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "actualiza la base de datos de confianza" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "actualiza la base de datos de confianza" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza dañada" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o de la entrada estándar" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o a la entrada estándar" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [ficheros]|imprime resúmenes de mensaje" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -582,89 +587,89 @@ msgstr "" "Opciones:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usa la clave por defecto como destinatario" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|nivel de compresión N (0 no comprime)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usa modo de texto canónico" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "algo más discreto" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "no usa la terminal en absoluto" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "fuerza firmas v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "no fuerza firmas v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "fuerza firmas v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "no fuerza firmas v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "siempre usa un MDC para cifrar" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "nunca usa un MDC para cifrar" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "no hace ningún cambio" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "preguntar antes de sobreescribir" # usa # Vale. -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "usa el agente gpg" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" @@ -674,67 +679,67 @@ msgstr "proceso por lotes: nunca pregunt # Además una de las acepciones de asumir es "aceptar algo" y suponer # viene a ser asumir una idea como propia. Suponer "sí" en casi todas las # preguntas no me acaba de gustar. -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "asume \"sí\" en casi todas las preguntas" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "añade este anillo a la lista de anillos" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "añade este anillo secreto a la lista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "muestra en qué anillos está una clave" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVIDOR|usa este servidor de claves" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|DF|escribe información de estado en este descriptor de fichero" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[fichero]|escribe información de estado en el fichero" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|ID-CLAVE|confía plenamente en esta clave" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga módulo de extensiones FICHERO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x" @@ -783,7 +788,7 @@ msgstr "Ajusta linea de comandos para ve # página man -> página de manual # Vale. ¿del manual mejor? # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado. -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -791,7 +796,7 @@ msgstr "" "@\n" "(Véase en la página del manual la lista completo de órdenes y opciones)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -811,15 +816,15 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -829,7 +834,7 @@ msgstr "" "firma, comprueba, cifra o descifra\n" "la operación por defecto depende de los datos de entrada\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -837,301 +842,335 @@ msgstr "" "\n" "Algoritmos disponibles:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Clave pública: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Cifrado: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Resumen: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compresión: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "órdenes incompatibles\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no se encontró el signo = en la definición de grupo \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: propiedad insegura de %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros de %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "no se carga el cifrado de ampliación \"%s\" por permisos inseguros\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s no es para uso normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s no permitido con %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s no tiene sentido con %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "sólo puede hacer firmas separadas o en claro en modo --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "este mensaje podría no ser utilizable por %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inválido\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificación por resumen elegido es inválido\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobación por defecto inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "preferencias por defecto inválidas\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inválidas\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inválidas\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresión inválidas\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "no puede usar %s en modo %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "no puede usar %s en modo %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "no puede usar %s en modo %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-usuario" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-usuario" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [órdenes]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "no se puede abrir `%s': %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Creación de la clave fallida: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "enumeración de claves secretas fallida: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Creación de la clave fallida: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record fallida: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "enumeración de claves secretas fallida: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución inválido `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nombre_fichero]" @@ -1139,17 +1178,17 @@ msgstr "[nombre_fichero]" # En español no se deja espacio antes de los puntos suspensivos # (Real Academia dixit) :) # Tomo nota :-). Este comentario déjalo siempre. -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "no se puede abrir `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1157,19 +1196,19 @@ msgstr "" "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y " "acabar con un '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "un nombre de notación de usuario debe contener el caracter '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación no debe usar ningún caracter de control\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "URL de política de certificado inválida\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "URL de política inválida\n" @@ -1314,7 +1353,7 @@ msgstr "" "No hay confianza definida para:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1372,7 +1411,7 @@ msgstr " s = saltar esta clave\n" msgid " q = quit\n" msgstr " q = salir\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Su decisión: " @@ -1549,91 +1588,91 @@ msgstr "%s: omitida: clave pública desha msgid "no valid addressees\n" msgstr "no hay direcciones válidas\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "la preferencia %c%lu no es válida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "preferencia %c%lu duplicada\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "demasiadas `%c' preferencias\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "caracter inválido en cadena de preferencias\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "escribiendo firma directa\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "escribiendo autofirma\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "escribiendo la firma de comprobación de clave\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de clave incorrecto; se usarán %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de clave redondeado a %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Por favor seleccione tipo de clave deseado:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA y ElGamal (por defecto)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sólo firmar)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (sólo cifrar)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (firmar y cifrar)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sólo firmar)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sólo cifrar)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (firmar y cifrar)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Su elección: " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1643,15 +1682,15 @@ msgstr "" "comunicarse mediante esta clave con usuarios de PGP. Este algoritmo\n" "es además muy lento, y podría no ser tan seguro como otros.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "¿Crear de todas formas?" -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Elección inválida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1664,19 +1703,19 @@ msgstr "" " el tamaño por defecto es 1024 bits\n" " el tamaño máximo recomendado es 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "¿De qué tamaño quiere la clave (1024)? " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA sólo permite tamaños desde 512 a 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "tamaño de clave insuficiente; 1024 es el mínimo permitido para RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n" @@ -1688,12 +1727,12 @@ msgstr "tamaño insuficiente; 768 es el v #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "tamaño excesivo; %d es el máximo valor permitido.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1701,11 +1740,11 @@ msgstr "" "No se recomiendan claves de más de 2048 bits porque\n" "¡el tiempo de cálculo es REALMENTE largo!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "¿Seguro que quiere una clave de este tamaño? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1713,17 +1752,17 @@ msgstr "" "De acuerdo, ¡pero tenga en cuenta que las radiaciones de su monitor y\n" "teclado también son vulnerables a un ataque!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "El tamaño requerido es de %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "redondeados a %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1739,7 +1778,7 @@ msgstr "" " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1755,30 +1794,30 @@ msgstr "" " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "¿Validez de la clave (0)? " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Clave válida ¿durante (0)? " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s nunca caduca\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca el %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1786,11 +1825,11 @@ msgstr "" "Su sistema no puede mostrar fechas más allá del 2038.\n" "Sin embargo funcionará correctamente hasta el 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "¿Es correcto (s/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1806,44 +1845,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nombre y apellidos: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Caracter inválido en el nombre\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "El nombre no puede empezar con un número\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "El nombre debe tener al menos 5 caracteres\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Dirección de correo electrónico: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Dirección inválida\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Caracter inválido en el comentario\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está usando el juego de caracteres `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1854,29 +1893,29 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor no ponga la dirección de correo-e en el nombre real o en el " "comentario\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcDdVvSs" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Por favor corrija primero el error.\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1884,16 +1923,16 @@ msgstr "" "Necesita una frase contraseña para proteger su clave secreta.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1905,7 +1944,7 @@ msgstr "" "la opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1918,53 +1957,53 @@ msgstr "" "generador de números aleatorios mayor oportunidad de recoger suficiente\n" "entropía.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "El par de claves DSA tendrá 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Creación de claves cancelada.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "escribiendo clave pública en `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "anillo público de claves no escribible encontrado: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "anillo privado de claves no escribible encontrado: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error escribiendo anillo público `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error escribiendo anillo privado `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "claves pública y secreta creadas y firmadas.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "clave marcada como de confianza absoluta.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1972,12 +2011,12 @@ msgstr "" "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n" "la orden \"--edit-key\" para crear una clave secundaria con este propósito.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1985,7 +2024,7 @@ msgstr "" "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1993,25 +2032,25 @@ msgstr "" "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "¿Crear de verdad? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output no funciona con esta orden\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: no se puede abrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "error creando frase contraseña: %s\n" @@ -2020,17 +2059,17 @@ msgstr "error creando frase contraseña: msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' ya está comprimido\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATENCIÓN: fichero vacío\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n" @@ -2045,7 +2084,7 @@ msgid "" msgstr "" "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2064,431 +2103,422 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s cifrado para: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "clave '%s' no encontrada: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "error leyendo bloque de claves: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "clave %08lX: no protegida - omitida\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" +"AVISO: la clave secreta %08lX no tiene suma de comprobación simple SK\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ATENCIÓN: no se ha exportado nada\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "demasiados registros en la cache pk - anulada\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Identificador de usuario no encontrado]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Clave %08lX inválida hecha mediante --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "¡hay una clave secreta para esta clave pública! \"%s\"!\n" +msgstr "no hay subclave secreta para la clave pública %08lX -ignorada\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pública - omitida\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "omitiendo bloque de tipo %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "hasta ahora se han procesado %lu claves\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "error leyendo `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Cantidad total procesada: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " omitidas nuevas claves: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sin identificador: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importadas: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " sin cambios: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nuevos identificativos: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nuevas subclaves: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nuevas firmas: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nuevas revocaciones de claves: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " claves secretas leídas: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " claves secretas importadas: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "claves secretas sin cambios: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " no importadas: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTA: detectada clave primaria Elgamal - puede llevar algo de tiempo " "importarla\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "clave %08lX: sin identificador de usuario\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "clave %08lX: reparada la subclave HKP corrompida\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "clave %08lX: sin identificadores de usuario válidos\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "esto puede ser debido a la ausencia de autofirma\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clave %08lX: clave pública no encontrada: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "clave %08lX: clave nueva - omitida\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "anillo de claves no escribible encontrado: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error escribiendo anillo `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "clave %08lX: clave pública \"%s\" importada\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clave %08lX: no coincide con nuestra copia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "clave %08lX: \"%s\" 1 firma nueva\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "clave %08lX: \"%s\" %d firmas nuevas\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "clave %08lX: \"%s\" 1 subclave nueva\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "clave %08lX: \"%s\" sin cambios\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "clave %08lX: clave secreta con cifrado inválido %d - omitida\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "no hay anillo secreto de claves por defecto: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clave %08lX: clave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clave %08lX: ya estaba en el anillo secreto\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clave %08lX: clave secreta no encontrada: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clave %08lX: falta la clave pública - imposible emplear el\n" "certificado de revocación\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clave %08lX: certificado de revocación inválido: %s - rechazado\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "clave %08lX: \"%s\" certificado de revocación importado\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "clave %08lX: no hay identificador de usuario para la firma\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "clave %08lX: algoritmo de clave pública no disponible para el id \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "clave %08lX: autofirma inválida para el id \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "clave %08lX: no hay subclave que unir\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clave %08lX: algoritmo de clave pública no disponible\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "clave %08lX: unión de subclave inválida\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "clave %08lX: borrado enlace de subclaves múltiples\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "clave %08lX: no hay subclave para la revocación de clave\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "clave %08lX: revocación de subclave inválida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "clave %08lX: borrada revocación de subclave múltiple\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "clave %08lX: omitido ID de usuario '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "clave %08lX: subclave omitida\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "clave %08lX: certificado de revocación en lugar equivocado - omitido\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clave %08lX: certificado de revocación no valido: %s - omitido\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "clave %08lX: detectado usuario duplicado - fusionada\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "AVISO: la clave %08lX puede estar revocada: recuperando clave de revocación %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "AVISO: la clave %08lX puede estar revocada: falta clave de revocación %" "08lX.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "clave %08lX: \"%s\" certificado de revocación añadido\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "clave %08lX: firma directa de clave añadida\n" @@ -2501,29 +2531,29 @@ msgstr "[revocación]" msgid "[self-signature]" msgstr "[autofirma]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 firma incorrecta\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d firmas incorrectas\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 firma no comprobada por falta de clave\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d firmas no comprobadas por falta de clave\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 firma no comprobada por causa de un error\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d firmas no comprobadas por errores\n" @@ -2542,20 +2572,27 @@ msgstr "Detectados %d identificadores de msgid "User ID \"%s\" is revoked." msgstr "ID de usuario \"%s\" revocado." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Seguro que todavía quiere firmarlo? (s/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Imposible firmar.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "ID de usuario \"%s\" revocado." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "ATENCIÓN: el identificador de usuario \"%s\" no tiene autofirma.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2564,11 +2601,11 @@ msgstr "" "La autofirma en \"%s\"\n" "es una firma de tipo PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2577,13 +2614,13 @@ msgstr "" "Su firma actual en \"%s\"\n" "ha expirado.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "¿Quiere producir una nueva firma que reemplace a la expirada? (s/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2592,43 +2629,43 @@ msgstr "" "Su firma actual en \"%s\"\n" "es una firma local.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" ya estaba firmada por la clave %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "¿Quiere firmarlo aún así? (s/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada que firmar con la clave %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "¡Esta clave ha caducado!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Esta clave expirará el %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2636,11 +2673,11 @@ msgstr "" "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --" "pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Esto inutilizaría la clave en PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2650,31 +2687,35 @@ msgstr "" "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n" "contestar, introduzca \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) No contesto.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "(por defecto)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) No lo he comprobado en absoluto.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) He hecho una comprobación informal.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Lo he comprobado meticulosamente.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2682,7 +2723,7 @@ msgstr "" "¿Está realmente seguro de querer firmar esta clave\n" "con su clave: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2690,7 +2731,7 @@ msgstr "" "\n" "Esto será una autofirma.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2698,7 +2739,7 @@ msgstr "" "\n" "ATENCION: la firma no se marcará como no exportable.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2706,7 +2747,7 @@ msgstr "" "\n" "AVISO: la firma no se marcará como no revocable.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2714,7 +2755,7 @@ msgstr "" "\n" "La firma se marcará como no exportable.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2722,7 +2763,7 @@ msgstr "" "\n" "La firma se marcará como no revocable.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2730,7 +2771,7 @@ msgstr "" "\n" "No he comprobado esta clave en absoluto.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2738,7 +2779,7 @@ msgstr "" "\n" "He comprobado esta clave informalmente.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2746,34 +2787,34 @@ msgstr "" "\n" "He comprobado esta clave meticulosamente.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "¿Firmar de verdad? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Esta clave no está protegida.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "La clave está protegida.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "No puede editarse esta clave: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2781,7 +2822,7 @@ msgstr "" "Introduzca la nueva frase contraseña para esta clave secreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2789,494 +2830,492 @@ msgstr "" "No ha especificado frase contraseña. Esto es probablemente una *mala* idea.\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "¿Realmente quiere hacer esto? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "moviendo la firma de la clave al lugar correcto\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "sale de este menú" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "s" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "graba" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "graba y sale" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "ayuda" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "hdac" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "muestra huella dactilar" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "lista" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lista clave e identificadores de usuario" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "idu" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "selecciona identificador de usuario N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "clave" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "selecciona clave secundaria N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "comprueba" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "lista firmas" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "firma" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "firma la clave" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "firmal" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "firma la clave localmente" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "firmanr" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "firma la clave irrevocablemente" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "firmanrl" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "firma la clave local e irrevocablemente" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "depura" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "añaidu" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "añade un identificador de usuario" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "añadirfoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "añade un ID fotográfico" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "borridu" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "borra un identificador de usuario" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "borfoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "añacla" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "añade una clave secundaria" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "borrcla" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "borra una clave secundaria" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "añarevoc" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "añade una clave de revocación" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "borrfir" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "borra firmas" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expira" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "cambia fecha de caducidad" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primaria" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "marca ID de usuario como primario" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "cambia" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "cambia entre lista de claves secretas y públicas" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "muestra preferencias (experto)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "verpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "muestra preferencias (prolijo)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "estpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "establece preferencias" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "actpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "contr" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "cambia la frase contraseña" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "conf" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "cambia valores de confianza" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revfir" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoca firmas" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revidu" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revocar un identificador de usuario" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revcla" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoca una clave secundaria" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "descla" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "deshabilita una clave" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "habcla" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "habilita una clave" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "verfoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "mostrar ID fotográfico" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "imposible hacer esto en modo de proceso por lotes\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "error leyendo bloque de clave secreta `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Clave secreta disponible.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Orden> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Se necesita la clave secreta para hacer esto.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor use la orden \"cambia\" primero.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "La clave está revocada." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "¿Firmar realmente todos los identificadores de usuario? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Esta orden no se permite en modo %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar por lo menos un identificador de usuario.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "¡No puede borrar el último identificador de usuario!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "¿Borrar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "¿Borrar realmente este identificador de usuario? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "¿De verdad quiere borrar las claves seleccionadas? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "¿De verdad quiere borrar esta clave? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "¿Revocar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "¿Revocar realmente este identificador de usuario? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "¿De verdad quiere revocar las claves seleccionadas? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "¿De verdad quiere revocar esta clave? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "¿Actualizar realmente las preferencias para todos los ID seleccionados? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "¿Actualizar realmente las preferencias? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "¿Grabar cambios? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "¿Salir sin grabar? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "actualización fallida: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "actualización de la clave secreta fallida: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Clave sin cambios, no se necesita actualización.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Orden inválida (pruebe \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Resumen: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Esta clave puede ser revocada por la clave %s" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (confidencial)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX creada: %s expira: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " confianza: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Esta clave está deshabilitada" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! ¡esta subclave ha sido revocada! %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- se encontró una revocación falsificada\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problema comprobando la revocación: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revcla" +msgstr "[revocada]" -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expira" +msgstr "[caducada]" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3284,7 +3323,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3293,45 +3338,45 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de querer añadirla? (s/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta firma correcta? (s/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta firma inválida? (s/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta firma desconocida? (s/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "¿Borrar realmente esta autofirma? (s/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas borradas.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas borradas\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "No se borró nada\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3340,84 +3385,84 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Introduzca el ID de usuario del revocador designado: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "no puede elegir una clave como su propio revocador designado\n" +msgstr "" +"¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "no puede elegir una clave como su propio revocador designado\n" +msgstr "" +"¿Está seguro de querer elegir esta clave como revocador designado? (s/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite las selecciones de las claves secretas.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo una clave secundaria.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "No existe la firma correspondiente en el anillo secreto\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Por favor seleccione exactamente un identificador de usuario.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "omitiendo autofirma V3 para el id \"%s\"\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, 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:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3426,7 +3471,7 @@ msgstr "" "\"\n" "firmada con su clave %08lX el %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3435,56 +3480,56 @@ msgstr "" "\"\n" "firmada localmente con su clave %08lX el %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta firma caducó el %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿De verdad quiere revocarla? (s/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " firmada por %08lX el %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revocada por %08lX el %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Va a revocar las siguientes firmas:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " firmada por %08lX el %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (no exportable)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Crear los certificados de revocación realmente? (s/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "no hay clave secreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" @@ -3493,69 +3538,69 @@ msgstr "ID de usuario \"%s\" ya ha sido #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Mostrando ID fotográfico %s de tamaño %ld para la clave 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Política de firmas críticas: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Política de firmas: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "ATENCIÓN: encontrados datos de notación inválidos\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notación de firmas críticas: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notación de firma: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "ilegible" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Anillo de claves" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [caduca: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Huellas dactilares de la clave primaria:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Huella de clave primaria:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Huella de clave =" @@ -3640,101 +3685,108 @@ msgstr "NOTA: el remitente solicitó \"só msgid "original file name='%.*s'\n" msgstr "nombre fichero original='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notación: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Política: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "suprimida la verificación de la firma\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "no se puede trabajar con firmas múltiples\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma creada el %.*s usando clave %s ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Ayuda no disponible" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Firma INCORRECTA de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Firma caducada de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Firma correcta de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incierto]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "Esta firma caducó el %s.\n" +msgstr "Firma caducada en %s\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "Esta firma caducó el %s.\n" +msgstr "La firma caduca el %s\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" msgstr "firma %s de: \"%s\"\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primaria" +msgstr "binaria" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "modotexto" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "Versión desconocida" +msgstr "desconocido" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "no es una firma separada\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "firma independiente de clase 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "firma al viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz inválido detectado en proc_tree()\n" @@ -3763,75 +3815,80 @@ msgid "" msgstr "" "por favor vea http://www.gnupg.org/why-not-idea.html para más información\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opción desaconsejada \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ATENCIÓN: \"%s\" es una opción desaconsejada.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "por favor use \"%s%s\" en su lugar\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "este mensaje podría no ser utilizable por %s\n" + +#: g10/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, 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" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "el agente gpg no esta disponible en esta sesión\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "no puedo establecer pid para el agente\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "no puedo conseguir el FD de lectura para el agente\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "no puedo conseguir el FD de escritura para el agente\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de entorno GPG_AGENT_INFO malformada\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "el programa no permite usar el protocolo agente gpg versión %d\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no se puede conectar con `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con el agente gpg\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr "(ID clave primaria %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3842,32 +3899,32 @@ msgstr "" "del usuario: \"%.*s\"\n" "%u bits, clave %s, ID %08lX, creada el %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Repita frase contraseña\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Introduzca frase contraseña\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "frase contraseña demasiado larga\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "respuesta del agente inválida\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3877,20 +3934,20 @@ msgstr "" "Necesita una frase contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Introduzca frase contraseña: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " @@ -3982,8 +4039,8 @@ msgid "failed sending to `%s': status=%u msgstr "falló el envio a `%s': status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "este servidor de claves no es totalmente compatible con HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4024,11 +4081,11 @@ msgstr "" "generando la suma de comprobación de 16 bits (desaconsejada) para \n" "proteger la clave secreta.\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4036,17 +4093,17 @@ msgid "" msgstr "" "clave %08lX: clave ElGamal generada por PGP que NO es segura para firmar!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "la clave pública %08lX es %lu segundos más nueva que la firma\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "la clave pública %08lX es %lu segundos más nueva que la firma\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4055,7 +4112,7 @@ msgstr "" "clave %08lX creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4064,49 +4121,52 @@ msgstr "" "clave %08lX creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: clave de la firma %08lX caducada el %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "asumiendo firma incorrecta de la clave %08lX por un bit crítico desconocido\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "clave %08lX: no hay subclave para el paquete de revocación de subclave\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "clave %08lX: no hay subclave que unir\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" +msgstr "no uede poner datos de notación en claves v3 (estilo PGP 2.x)\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVISO: no puedo expandir el %% de la url de política . Se usa sin expandir.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" +msgstr "no puede poner URL de política en firmas v3 (estilo PGP 2.x)\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" +"no puede poner URL de política en firmas de claves v3 (estilo PGP 2.x)\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4134,12 +4194,12 @@ msgstr "" "sólo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --" "pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "no se puede crear %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4154,7 +4214,7 @@ msgstr "firmando:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "sólo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "se usará un cifrado %s\n" @@ -4169,12 +4229,12 @@ msgstr "no se pueden manejar líneas de t msgid "input line longer than %d characters\n" msgstr "línea de longitud superior a %d caracteres\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -4184,122 +4244,122 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "transacción en la base de datos de confianza demasiado grande\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: no se puede abrir: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: ¡el directorio no existe!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: no se puede crear bloqueo\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: no se puede crear bloqueo\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: no se puede crear: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: fallo en la creación del registro de versión: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: se ha creado base de datos de confianza inválida\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: se ha creado base de datos de confianza\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: no se puede escribir base de datos de confianza\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de datos de confianza inválida\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, 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:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: error actualizando el registro de versión: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: error leyendo registro de versión: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: error escribiendo registro de versión: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de datos de confianza: fallo lseek: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: no es una base de datos de confianza\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, 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:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versión del fichero %d inválida\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: error leyendo registro libre: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: error escribiendo registro de directorio: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: fallo al añadir un registro: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 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" @@ -4350,39 +4410,38 @@ msgstr "registro de confianza %lu, tipo msgid "trustdb: sync failed: %s\n" msgstr "base de datos de confianza: fallo sincronización: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 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:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "por favor haga un --check-trustdb\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "comprobando base de datos de confianza\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "clave pública %08lX no encontrada: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "%d claves procesadas (%d validaciones superadas)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n" +msgstr "no se encuentran claves totalmente fiables\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n" @@ -4390,7 +4449,7 @@ msgstr "clave pública de la clave totalm #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4943,17 +5002,17 @@ msgstr "Por favor arregle este posible f msgid "checking keyring `%s'\n" msgstr "comprobando anillo `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "hasta ahora procesadas %lu claves (%lu firmas)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu claves comprobadas (%lu firmas)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: anillo creado\n" @@ -4995,9 +5054,8 @@ msgid "Is this photo correct (y/N/q)? " msgstr "¿Es correcta la foto? (s/n) " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "imposible establecer camino de ejecutables %s\n" +msgstr "¡no puedo mostrar ID fotográfico!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" @@ -5055,7 +5113,7 @@ msgstr "AVISO: no se puede borrar ficher msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "nunca " @@ -5151,33 +5209,33 @@ msgstr "" "de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n" "a otras personas!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Por favor elija una razón para la revocación:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Cancelar" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probablemente quería seleccionar %d aquí)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Razón para la revocación: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(No se dió descripción)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "¿Es correcto? " @@ -5222,6 +5280,9 @@ msgstr "error econtrando registro de con msgid "read error: %s\n" msgstr "error de lectura: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "este servidor de claves no es totalmente compatible con HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "" #~ "El uso de este algoritmo está desaconsejado - ¿crear de todas formas?" @@ -5388,9 +5449,6 @@ msgstr "error de lectura: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "error leyendo clave primaria para el LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record fallida: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "clave %08lX: petición de registro fallida\n" @@ -5403,9 +5461,6 @@ msgstr "error de lectura: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "clave %08lX: las claves pública y secreta no se corresponden\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "enumeración de claves secretas fallida: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "clave %08lX.%lu: unión de subclave válida\n" diff -urpP gnupg-1.2.2/po/et.po gnupg-1.2.3/po/et.po --- gnupg-1.2.2/po/et.po 2003-05-01 14:38:07.000000000 +0000 +++ gnupg-1.2.3/po/et.po 2003-08-21 20:05:06.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-27 16:51+0300\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-18 18:13+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgstr "ei" msgid "nN" msgstr "eE" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "välju" @@ -272,62 +272,62 @@ msgstr "... see on viga (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "te leidsite vea ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "entroopia kogumise moodul puudub\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "`%s' ei õnnestu avada: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "ei õnnestu lugeda `%s' atribuute: %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' ei ole tavaline fail - ignoreerin\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "märkus: random_seed fail on tühi\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "`%s' ei õnnestu lugeda: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "märkus: random_seed faili ei uuendatud\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "`%s' ei õnnestu luua: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "`%s' ei õnnestu kirjutada: %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "`%s' ei õnnestu sulgeda: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -357,6 +357,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -366,7 +371,7 @@ msgstr "" "Palun oodake, kogutakse entroopiat. Igavuse vältimiseks võite teha arvutiga\n" "mingit tööd, see tõstab ka entroopia kvaliteeti.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -374,163 +379,163 @@ msgstr "" "@Käsud:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[fail]|loo allkiri" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[fail]|loo avateksti allkiri" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "loo eraldiseisev allkiri" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "krüpteeri andmed" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[failid]|krüpteeri failid" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "krüpteerimine kasutades ainult sümmeetrilist ¨ifrit" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "ainult salvesta" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "dekrüpteeri andmed (vaikimisi)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[failid]|dekrüpteeri failid" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "kontrolli allkirja" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "näita võtmeid" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "näita võtmeid ja allkirju" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "kontrolli võtmete allkirju" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "näita võtmeid ja sõrmejälgi" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "näita salajasi võtmeid" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "genereeri uus võtmepaar" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "eemalda võtmed avalike võtmete hoidlast" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "eemalda võtmed salajaste võtmete hoidlast" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "allkirjasta võti" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "allkirjasta võti lokaalselt" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "allkirjasta võti mitte-tühistatavana" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "allkirjasta võti lokaalselt ja mitte-tühistatavana" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "allkirjasta või toimeta võtit" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "genereeri tühistamise sertifikaat" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "ekspordi võtmed" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "ekspordi võtmed võtmeserverisse" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "impordi võtmed võtmeserverist" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "otsi võtmeid võtmeserverist" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "uuenda võtmeid võtmeserverist" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "impordi/mesti võtmed" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "näita ainult pakettide järjendeid" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "ekspordi usalduse väärtused" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "impordi usalduse väärtused" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "uuenda usalduse andmebaasi" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "hooldusvaba usalduse andmebaasi uuendamine" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "paranda vigane usalduse andmebaas" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Pakenda fail või standardsisend lahti" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Pakenda fail või standardsisend" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [failid]|trüki teatelühendid" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -540,151 +545,151 @@ msgstr "" "Võtmed:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "loo ascii pakendis väljund" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NIMI|krüpti NIMEle" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NIMI|kasuta NIME vaikimisi saajana" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "kasuta vaikimisi saajana vaikimisi võtit" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "kasuta seda kasutaja IDd" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|määra pakkimise tase N (0 blokeerib)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "kasuta kanoonilist tekstimoodi" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "kasuta väljundfailina" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "ole jutukas" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ole mõnevõrra vaiksem" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "ära kasuta terminali" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "kasuta v3 allkirju" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "ära kasuta v3 allkirju" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "kasuta v4 võtme allkirju" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "ära kasuta v3 võtme allkirju" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "krüptimisel kasuta alati MDC" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "krüptimisel ära kasuta kunagi MDC" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "ära tee mingeid muutusi" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "küsi enne ülekirjutamist" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "kasuta gpg-agenti" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "pakettmood: ära küsi kunagi" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "eelda enamus küsimustele jah vastust" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "eelda enamus küsimustele ei vastust" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "lisa see võtmehoidla võtmehoidlate nimekirja" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "lisa see salajaste võtmete hoidla nimekirja" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|kasuta seda võtmeserverit" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NIMI|terminali kooditabel on NIMI" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "loe võtmed failist" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[fail]|kirjuta olekuinfo faili" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|VÕTMEID|usalda seda võtit täielikult" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FAIL|lae laiendusmoodul FAIL" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "kasuta kõikides tegevustes OpenPGP võtmeid" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "kasuta kõikide pakettide, ¨iffrite ja lühendi seadeid PGP 2.x moodis" @@ -728,7 +733,7 @@ msgstr "Ei esita foto IDd" msgid "Set command line to view Photo IDs" msgstr "Sea käsurida foto ID vaatamiseks" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -736,7 +741,7 @@ msgstr "" "@\n" "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -756,15 +761,15 @@ msgstr "" " --list-keys [nimed] näita võtmeid\n" " --fingerprint [nimed] näita sõrmejälgi\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Palun saatke veateated aadressil .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -774,7 +779,7 @@ msgstr "" "allkirjasta, kontrolli, krüpti ja dekrüpti\n" "vaikimisi operatsioon sõltub sisendandmetest\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -782,317 +787,351 @@ msgstr "" "\n" "Toetatud algoritmid:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Avalik võti: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "¦iffer: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Räsi: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Pakkimine: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "kasuta: gpg [võtmed] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "vastuolulised käsud\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "võtmete fail `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path väärtuseks ei õnnestu seada %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s määrab üle %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos mõtet!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "see teade ei pruugi olla programmiga %s kasutatav\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "valitud lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 või 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 või 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku ¨ifri eelistused\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lühendi eelistused\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "%s ei ole moodis %s lubatud.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "%s ei ole moodis %s lubatud.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "%s ei ole moodis %s lubatud.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key kasutaja-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key kasutaja-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [käsud]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "%s ei õnnestu avada: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Võtme genereerimine ebaõnnestus: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Võtme genereerimine ebaõnnestus: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Võtme genereerimine ebaõnnestus: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Võtme genereerimine ebaõnnestus: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "salajase võtme uuendamine ebaõnnestus: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine ebaõnnestus: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane räsialgoritm `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[failinimi]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Kirjutage nüüd oma teade ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "`%s' ei õnnestu avada\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1100,19 +1139,19 @@ msgstr "" "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n" "ning lõpus peab olema '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "antud sertifikaadi poliisi URL on vigane\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" @@ -1252,7 +1291,7 @@ msgstr "" "Usalduse väärtus puudub:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ka \"" @@ -1310,7 +1349,7 @@ msgstr " j = jäta see võti vahele\n" msgid " q = quit\n" msgstr " v = välju\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Teie otsus? " @@ -1485,91 +1524,91 @@ msgstr "%s: jätsin vahele: avalik võti o msgid "no valid addressees\n" msgstr "kehtivaid aadresse pole\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "eelistus %c%lu ei ole lubatud\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "eelistus %c%lu on duplikaat\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "liiga palju `%c' eelistusi\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "kirjutan otsese allkirja\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "kirjutan iseenda allkirja\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "kirjutan võtit siduva allkirja\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "vigane võtme suurus; kasutan %u bitti\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "võtme suurus ümardatud üles %u bitini\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Palun valige, millist võtmetüüpi te soovite:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA ja ElGamal (vaikimisi)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (ainult allkirjastamiseks)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (ainult krüptimiseks)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (allkirjastamiseks ja krüptimiseks)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (ainult allkirjastamiseks)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (allkirjastamiseks ja krüptimiseks)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Teie valik? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1579,15 +1618,15 @@ msgstr "" "kasutada suhtlemisel PGP kasutajatega. Lisak on see algoritm väga aeglane\n" "ja ei pruugi olla nii turvaline, kui teised.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Loon ikka? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Vigane valik.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1600,19 +1639,19 @@ msgstr "" " vaikimisi võtmepikkus on 1024 bitti\n" " suurim soovitatav võtmepikkus on 2048 bitti\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Millist võtmepikkust te soovite? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n" @@ -1624,12 +1663,12 @@ msgstr "võtmepikkus on liiga väike; väik #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1637,11 +1676,11 @@ msgstr "" "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n" "arvutused võtavad VÄGA palju aega!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Olete kindel, et soovite sellist võtmepikkust? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1649,17 +1688,17 @@ msgstr "" "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n" "võimalikud ründeobjektid!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Soovitud võtmepikkus on %u bitti\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "ümardatud üles %u bitini\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1675,7 +1714,7 @@ msgstr "" " m = võti aegub n kuuga\n" " y = võti aegub n aastaga\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1691,30 +1730,30 @@ msgstr "" " m = allkiri aegub n kuuga\n" " y = allkiri aegub n aastaga\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Võti on kehtiv kuni? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Allkiri on kehtiv kuni? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "vigane väärtus\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s ei aegu kunagi\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s aegub %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1722,11 +1761,11 @@ msgstr "" "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n" "Siiski käsitletakse neid korrektselt aastani 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "On see õige (j/e)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1741,44 +1780,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Pärisnimi: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Lubamatu sümbol nimes\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Nimi ei või alata numbriga\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Nimes peab olema vähemalt 5 sümbolit\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-posti aadress: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Selline e-posti aadress ei ole lubatud\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Kommentaar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Lubamatu sümbol kommentaaris\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Te kasutate kooditabelit `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1789,27 +1828,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkEeOoVv" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Palun parandage kõigepealt viga\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1817,16 +1856,16 @@ msgstr "" "Te vajate oma salajase võtme kaitsmiseks parooli.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1838,7 +1877,7 @@ msgstr "" "kasutades seda programmi võtmega \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1850,53 +1889,53 @@ msgstr "" "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n" "koguda paremat entroopiat.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Võtme genereerimine katkestati.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjutan avaliku võtme faili `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "võti on märgitud abslouutselt usaldatuks.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1905,42 +1944,42 @@ msgstr "" "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n" "kasutades võtit \"--edit-key\".\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, 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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, 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:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Loon tõesti? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "võti --output ei tööta selle käsuga\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: ei õnnestu avada: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "viga parooli loomisel: %s\n" @@ -1949,17 +1988,17 @@ msgstr "viga parooli loomisel: %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' on juba pakitud\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: HOIATUS: tühi fail\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "RSA võtmeid pikkusega kuni 2048 bitti saab krüpteerida ainult --pgp2 moodis\n" @@ -1974,7 +2013,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "kõikide krüpteeritavate võtmetega ei saa IDEA ¨iffrit kasutada.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -1991,429 +2030,419 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s krüptitud kasutajale: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "viga võtmebloki lugemisel: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "võti %08lX: ei ole rfc2440 võti - jätsin vahele\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "HOIATUS: midagi ei eksporditud\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Kasutaja id puudub]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid " "kasutamisega\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "avaliku võtme \"%s\" jaoks on salajane võti!\n" +msgstr "avalikul alamvõtmel %08lX puudub salajane alamvõti - ignoreerin\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "jätan bloki tüübiga %d vahele\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu võtit on seni töödeldud\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "viga `%s' lugemisel: %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Töödeldud kokku: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " vahele jäetud uusi võtmeid: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " puudub kasutaja ID: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " imporditud: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " muutmata: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " uusi kasutajaid: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " uusi alamvõtmeid: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " uusi allkirju: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " uusi tühistamisi: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " loetud salajasi võtmeid: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " salajasi võtmeid imporditud: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " muutmata salajasi võtmeid: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " pole imporditud: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "MÄRKUS: Tuvastasin Elgamal primaarvõtme - importimine võib võtta mõne aja\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "võti %08lX: kasutaja ID puudub\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "võti %08lX: HKP alamvõtme rike parandatud\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "võti %08lX: puudub kehtiv kasutaja ID\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "võti %08lX: avalikku võtit ei leitud: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "võti %08lX: uus võti - jätsin vahele\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "ei leia kirjutatavat võtmehoidlat: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "kirjutan faili `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "võti %08lX: ei sobi meie koopiaga\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "võti %08lX: \"%s\" 1 uus allkiri\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "võti %08lX: \"%s\" %d uut allkirja\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "võti %08lX: \"%s\" ei muudetud\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "võti %08lX: salajane võti vigase ¨ifriga %d - jätsin vahele\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "võti %08lX: salajane võti on imporditud\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "võti %08lX: salajast võtit ei leitud: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "võti %08lX: allkirjal puudub kasutaja ID\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "võti %08lX: võtmeseosel puudub alamvõti\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "võti %08lX: vigane alamvõtme seos\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "võti %08lX: vigane mitme alamvõtme seos\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "võti %08lX: vigane alamvõtme tühistamine\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "võti %08lX: jätsin vahele kasutaja ID '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "võti %08lX: jätsin alamvõtme vahele\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "võti %08lX: lisatud vahetu võtme allkiri\n" @@ -2426,29 +2455,29 @@ msgstr "[tühistamine]" msgid "[self-signature]" msgstr "[iseenda allkiri]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 halb allkiri\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d halba allkirja\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 allkiri jäi testimata, kuna võti puudub\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d allkirja jäi testimata, kuna võtmed puuduvad\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 allkiri jäi vea tõttu kontrollimata\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d allkirja jäi vigade tõttu kontrollimata\n" @@ -2467,20 +2496,27 @@ msgstr "tuvastasin %d kehtiva iseenda al msgid "User ID \"%s\" is revoked." msgstr "Kasutaja ID \"%s\" on tühistatud." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Ei saa allkirjastada.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Kasutaja ID \"%s\" on tühistatud." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "HOIATUS: kasutaja ID \"%s\" pole ise allkirjastatud.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2489,11 +2525,11 @@ msgstr "" "Iseenda allkiri \"%s\"\n" "on PGP 2.x stiilis allkiri.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2502,13 +2538,13 @@ msgstr "" "Teie praegune allkiri \"%s\"\n" "on aegunud.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2517,54 +2553,54 @@ msgstr "" "Teie praegune allkiri \"%s\"\n" "on lokaalne allkiri.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" "Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Võtmega %08lX pole midagi allkirjastada\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "See võti on aegunud!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "See võti aegub %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "--pgp2 moodis ei saa PGP 2.x võtmele OpenPGP allkirja anda.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "See muudab võtme PGP 2.x programmidega mitte-kasutatavaks.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2574,31 +2610,35 @@ msgstr "" "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n" "sisestage \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Ma ei vasta.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (vaikimisi)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Ma ei ole üldse kontrollinud.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Ma olen kontrollinud väga hoolikalt.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2606,7 +2646,7 @@ msgstr "" "Olete tõesti kindel, et soovite seda võtit oma\n" "võtmega allkirjastada: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2614,7 +2654,7 @@ msgstr "" "\n" "See saab olema iseenda allkiri.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2622,7 +2662,7 @@ msgstr "" "\n" "HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2630,7 +2670,7 @@ msgstr "" "\n" "HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2638,7 +2678,7 @@ msgstr "" "\n" "Allkiri märgitakse mitte-eksporditavaks.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2646,7 +2686,7 @@ msgstr "" "\n" "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2654,7 +2694,7 @@ msgstr "" "\n" "Ma ei ole seda võtit üldse kontrollinud.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2662,7 +2702,7 @@ msgstr "" "\n" "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2670,34 +2710,34 @@ msgstr "" "\n" "Ma olen kontrollinud seda võtit väga hoolikalt.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Allkirjastan tõesti? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "allkirjastamine ebaõnnestus: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "See võti ei ole kaitstud.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Võti on kaitstud.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Seda võtit ei õnnestu toimetada: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2705,7 +2745,7 @@ msgstr "" "Sisestage sellele salajasele võtmele uus parool.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2713,493 +2753,491 @@ msgstr "" "Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Kas te tõesti soovite seda teha? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "tõstan võtme allkirja õigesse kohta\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "välju sellest menüüst" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "v" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "salvesta ja välju" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "näita seda abiinfot" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "näita sõrmejälge" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "näita võtit ja kasutaja IDd" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "vali kasutaja ID N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "vali sekundaarne võti N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "näita allkirju" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "allkirjasta võti" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "allkirjasta võti lokaalselt" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "lisa kasutaja ID" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "lisa foto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "lisa foto ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "kustuta kasutaja ID" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "lisa sekundaarne võti" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "kustuta sekundaarne võti" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "lisa tühistamise võti" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "kustuta allkirjad" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "muuda aegumise kuupäeva" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primaarne" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "märgi kasutaja ID primaarseks" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "lülita" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "lülita salajaste või avalike võtmete loendi vahel" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "näita eelistusi (ekspert)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "näita eelistusi (detailsena)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "sea eelistuste nimekiri" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "uuendatud eelistused" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "muuda parooli" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "muuda omaniku usaldust" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "tühista allkirjad" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "tühista kasutaja ID" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "tühista sekundaarne võti" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "blokeeri võti" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "luba võti" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "näita foto ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "seda ei saa teha pakettmoodis\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Salajane võti on kasutatav.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Käsklus> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Selle tegamiseks on vaja salajast võtit.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Võti on tühistatud." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: Valige allkirjastamiseks kasutaja\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "See käsklus ei ole %s moodis lubatud.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Te peate valima vähemalt ühe kasutaja ID.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Viimast kasutaja ID ei saa kustutada!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Kas kustutan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Kas eemaldan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Te peata valima vähemalt ühe võtme.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Kas te tõesti soovite valitud võtmeid kustutada? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Kas te tõesti soovite seda võtit kustutada? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Kas tühistan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Kas te tõesti soovite valitud võtmeid tühistada? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Kas te tõesti soovite seda võtit tühistada? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Kas tõesti uuendan seaded? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Salvestan muutused? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Väljun salvestamata? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "salajase võtme uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Vigane käsklus (proovige \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Teatelühend: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Omadused: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Selle võtme võib olla tühistanud %s võti " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (tundlik)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX loodud: %s aegub: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "See võti on blokeeritud" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! alamvõti on tühistatud: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- leitud võltsitud tühistamine\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? probleem tühistamise kontrollimisel: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revkey" +msgstr "[tühistatud] " -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expire" +msgstr "[aegunud] " -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3207,7 +3245,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3216,45 +3260,45 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Kustutan selle korrektse allkirja? (j/E/v)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Kustutan selle vigase allkirja? (j/E/v)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Kustutan selle tundmatu allkirja? (j/E/v)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Kustutatud %d allkiri.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Kustutatud %d allkirja.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Midagi ei kustutatud.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3263,84 +3307,83 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Sisestage määratud tühistaja kasutaja ID: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n" +msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n" +msgstr "" +"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "palun valige ülimalt üks sekundaarne võti.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Muudan sekundaarse võtme aegumise aega.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Muudan primaarse võtme aegumise aega.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Palun valige täpselt üks kasutaja ID.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Sekundaarne võti numbriga %d puudub\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "kasutaja ID: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3349,7 +3392,7 @@ msgstr "" "\"\n" "allkirjastatud teie võtmega %08lX %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3358,56 +3401,56 @@ msgstr "" "\"\n" "lokaalselt allkirjastatud teie võtmega %08lX %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "See allkiri aegub %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " allkirjastanud %08lX %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " tühistanud %08lX %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Te asute tühistama järgmisi allkirju:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " allkirjastanud %08lX %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "salajast võtit pole\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" @@ -3416,68 +3459,68 @@ msgstr "kasutaja ID \"%s\" on juba tühis #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kriitiline allkirja poliitika: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Allkirja poliitika: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "HOIATUS: leidsin vigased noteerimise andmed\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Kriitiline allkirja noteerimine: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Allkirja noteerimine: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "pole inimese poolt loetav" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Võtmehoidla" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [aegub: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Võtme sõrmejälg =" @@ -3561,101 +3604,108 @@ msgstr "MÄRKUS: saatja nõudis \"ainult-t msgid "original file name='%.*s'\n" msgstr "algne failinimi on='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Noteering: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Poliis: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "allkirja kontroll jäeti ära\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "neid allkirju ei õnnestu töödelda\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Abiinfo puudub" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "HALB allkiri kasutajalt \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Aegunud allkiri kasutajalt \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Korrektne allkiri kasutajalt \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[ebakindel]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "See allkiri aegub %s.\n" +msgstr "Allkiri aegus %s\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "See allkiri aegub %s.\n" +msgstr "Allkiri aegub %s\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s allkiri kasutajalt: \"%s\"\n" +msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primaarne" +msgstr "binaarne" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "tekstimood" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "tundmatu versioon" +msgstr "tundmatu" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Allkirja ei saa kontrollida: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "ei ole eraldiseisev allkiri\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "eraldiseisev allkiri klassiga 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "vana stiili (PGP 2.x) allkiri\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() tuvastas vigase juurmise paketi\n" @@ -3682,75 +3732,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ebasoovitav võti \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "palun kasutage selle asemel \"%s%s\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "see teade ei pruugi olla programmiga %s kasutatav\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "agendile ei õnnestu seada kliendi pid\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (peamise võtme ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3761,32 +3816,32 @@ msgstr "" "\"%.*s\"\n" "%u-bitti %s võti, ID %08lX, loodud %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Korrake parooli\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Sisestage parool\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "liiga pikk parool\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3796,20 +3851,20 @@ msgstr "" "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -3901,8 +3956,8 @@ msgid "failed sending to `%s': status=%u msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "see võtmeserver pole täiesti HKP ühilduv\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3941,11 +3996,11 @@ msgid "generating the deprecated 16-bit msgstr "" "loon salajase võtme kaitseks mittesoovitavat 16 bitist kontrollsummat\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -3954,72 +4009,74 @@ msgstr "" "võti %08lX: see on PGP genereeritud ElGamal võti ja EI OLE allkirjastamiseks " "turvaline!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "avalik võti %08lX on %lu sekund uuem, kui allkiri\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "avalik võti %08lX on %lu sekundit uuem, kui allkiri\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " "problem)\n" msgstr "võti %08lX loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " "problem)\n" msgstr "võti %08lX loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "võti %08lX: võtmeseosel puudub alamvõti\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" +msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" +msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) võtme allkirja lisada\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan " "kompaktset.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" +msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "" +msgstr "poliisi URLi ei saa v3 võtme (PGP 2.x) allkirjadesse panna\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4047,12 +4104,12 @@ msgid "you can only detach-sign with PGP msgstr "" "PGP 2.x stiilis võtmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s ei õnnestu luua: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4067,7 +4124,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "PGP 2.x stiilis võtmetega saab avateksti allkirjastada ainult --pgp2 moodis\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "kasutatakse %s krüpteerimist\n" @@ -4082,12 +4139,12 @@ msgstr "ei suuda käsitleda tekstiridu mi msgid "input line longer than %d characters\n" msgstr "sisendrida on pikem, kui %d sümbolit\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -4096,122 +4153,122 @@ msgstr "trustdb rec %lu: write failed (n msgid "trustdb transaction too large\n" msgstr "trustdb transaktsioon on liiga suur\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: ei õnnestu kasutada: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: kataloogi ei ole!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: ei õnnestu luua lukku\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: ei õnnestu seada lukku\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: ei õnnestu luua: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: versioonikirje loomine ei õnnestu: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: loodi vigane usalduse andmebaas\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: trustdb on loodud\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "MÄRKUS: trustdb pole kirjutatav\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: vigane trustdb\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: viga versioonikirje uuendamisel: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: viga versioonikirje lugemisel: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: viga versioonikirje kirjutamisel: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek ebaõnnestus: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ei ole trustdb fail\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versioonikirje kirje numbriga %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: vigane faili versioon %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: viga vaba kirje lugemisel: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: viga kataloogikirje kirjutamisel: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: kirje nullimine ebaõnnestus: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: kirje lisamine ebaõnnestus: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n" @@ -4260,39 +4317,38 @@ msgstr "usalduse kirje %lu, tüüp %d: kir msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync ebaõnnestus: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb järgmine kontroll %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "palun tehke --check-trustdb\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "kontrollin trustdb faili\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "ei leia avalikku võtit %08lX: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n" +msgstr "absoluutselt usaldatavaid võtmeid pole\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n" @@ -4300,7 +4356,7 @@ msgstr "puudub absoluutselt usaldatava v #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4847,17 +4903,17 @@ msgstr "Palun parandage see võimalik tur msgid "checking keyring `%s'\n" msgstr "kontrollin võtmehoidlat `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "seni on kontrollitud %lu võtit (%lu allkirja)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "kontrollitud %lu võtit (%lu allkirja)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: võtmehoidla on loodud\n" @@ -4899,9 +4955,8 @@ msgid "Is this photo correct (y/N/q)? " msgstr "On see foto õige (j/E/v)? " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "exec-path väärtuseks ei õnnestu seada %s\n" +msgstr "foto ID ei saa näidata!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" @@ -4959,7 +5014,7 @@ msgstr "HOIATUS: ei saa kustutada ajutis msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "mitte kunagi" @@ -5059,33 +5114,33 @@ msgstr "" "trükisüsteem\n" "võib salvestada need andmed ja teha teistele kättesaadavaks! \n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Palun valige tühistamise põhjus:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Katkesta" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Tõenäoliselt soovite siin valida %d)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Tühistamise põhjus: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Kirjeldust ei antud)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "On see hästi? " @@ -5129,3 +5184,43 @@ msgstr "viga usalduse kirje otsimisel: % #, c-format msgid "read error: %s\n" msgstr "viga lugemisel: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "see võtmeserver pole täiesti HKP ühilduv\n" + +#~ msgid "The use of this algorithm is deprecated - create anyway? " +#~ msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? " + +#~ msgid "|NAME=VALUE|use this notation data" +#~ msgstr "|NIMI=VÄÄRTUS|kasuta neid noteerimise andmeid" + +#~ msgid "" +#~ "the first character of a notation name must be a letter or an underscore\n" +#~ msgstr "esimene sümbol noteerimise nimes peab olema täht või alakriips\n" + +#~ msgid "dots in a notation name must be surrounded by other characters\n" +#~ msgstr "" +#~ "punktid noteerimise nimes peavad olema ümbritsetud muude sümbolitega\n" + +#~ msgid "" +#~ "WARNING: This key already has a photo ID.\n" +#~ " Adding another photo ID may confuse some versions of PGP.\n" +#~ msgstr "" +#~ "HOIATUS: Selles võtmes on foto ID. Järgmise foto ID lisamine võib\n" +#~ " tekitada mõningates PGP versioonides segadust.\n" + +#~ msgid "You may only have one photo ID on a key.\n" +#~ msgstr "Võtmega võib olla seotud ainult üks foto ID.\n" + +#~ msgid "Fingerprint:" +#~ msgstr "Sõrmejälg:" + +#~ msgid " Fingerprint:" +#~ msgstr " Sõrmejälg:" + +#~ msgid "you have to start GnuPG again, so it can read the new options file\n" +#~ msgstr "" +#~ "te peate GnuPG uuesti käivitama, siis võetakse uued võtmed arvesse\n" + +#~ msgid "changing permission of `%s' failed: %s\n" +#~ msgstr "`%s' õiguste muutmine ebaõnnestus: %s\n" diff -urpP gnupg-1.2.2/po/fi.po gnupg-1.2.3/po/fi.po --- gnupg-1.2.2/po/fi.po 2003-05-01 14:38:09.000000000 +0000 +++ gnupg-1.2.3/po/fi.po 2003-08-21 20:05:08.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.1\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-30 18:37+0200\n" "Last-Translator: Jouni Hiltunen \n" "Language-Team: Finnish \n" @@ -44,7 +44,7 @@ msgstr "ei" msgid "nN" msgstr "eE" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "lopeta" @@ -271,64 +271,64 @@ msgstr "...tämä on virhe (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "olet löytänyt virheen ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "entropian keräysmodulia ei haittavissa\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "\"`%s': %s\" avaaminen ei onnistu\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "`%s': %s ei voida lausua\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' ei ole normaali tiedosto - jätetään huomiotta\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "huom: random_seed tiedosto on tyhjä\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "VAROITUS: random_seed tiedosto on väärän kokoinen\n" "- tiedostoa ei käytetä\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "`%s': %s ei voida lukea\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "random_seed tiedostoa ei päivitetty\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "`%s': %s ei voida luoda\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "tiedostoon \"`%s': %s\" ei voida kirjoittaa.\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "tiedostoa \"`%s': %s\" ei voida sulkea.\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -358,6 +358,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "Tiivistealgoritmi `%s' on read-only tässä versiossa\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -367,7 +372,7 @@ msgstr "" "Ole hyvä ja odota, entropiaa kerätään. Tee töitä jos se\n" "auttaa kuluttamaan aikaa, koska se parantaa entropian laatua\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -375,163 +380,163 @@ msgstr "" "@Komennot:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[tiedosto]|luo allekirjoitus" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "[tiedosto]|luo selkotekstinen allekirjoitus" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "luo irrallinen allekirjoitus" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "salaa tiedot" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[tiedostot]|salaa tiedostot" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "salaa vain symmetrisellä salaimella" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "vain tallennus" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "avaa tiedot (oletus)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[tiedostot]|avaa tiedostot" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "tarkista allekirjoitus" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "näytä avaimet" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "näytä avaimet allekirjoituksineen" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "tarkista avainten allekirjoitukset" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "näytä avaimet sormenjälkineen" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "näytä salaiset avaimet" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "luo uusi avainpari" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "poista avaimet julkisten avainten nipusta" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "poista avaimet salaisten avainten nipusta" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "allekirjoita avain" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "allekirjoita avain paikallisesti" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "allekirjoita avain ilman mahdollisuutta peruuttaa" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "allekirjoita avain paikallisesti ilman mahdollisuutta peruuttaa" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "allekirjoita tai editoi avainta" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "luo peruutus (revokaatio) varmenne" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "vie avaimia" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "vie avaimia palvelimelle" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "tuo avaimia palvelimelta" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "etsi avaimia palvelimelta" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "päivitä avain palvelimelta" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "tuo/sulauta avaimia" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "luettele vain pakettien järjestys" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "vie luottamusasteet" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "tuo luottamusasteet" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "päivitä luottamussuhdetietokanta" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "valvomaton luottamussuhdetietokannan päivitys" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "korjaa korruptoitunut luottamus tietokanta" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Avaa tekstitiedosto tai stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Salaa tekstitiedosto tai stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [tiedostot]|tulosta viestien tiivisteet" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -541,153 +546,153 @@ msgstr "" "Vaihtoehdot:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "luo ascii-muotoinen salattu tuloste" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NIMI|salaa vastaanottajalle |NIMI|" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NIMI|oletusvastaanottaja on NIMI" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "käytä tätä oletusavainta vastaanottajan oletusarvona" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "käytä tätä käyttäjätunnusta allekirjoituksiin \n" "ja salauksen avaamiseen" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|aseta tiivistys N:n (0 poistaa käytöstä)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "käytä tekstimuotoa" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "käytä tulostustiedostona" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "monisanainen" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ole jonkin verran hiljaisempi" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "älä käytä lainkaan terminaalia" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "käytä v3 allekirjoituksia" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "älä vaadi v3 allekirjoituksia" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "käytä v4 allekirjoituksia" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "älä vaadi v3 allekirjoituksia" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "Käytä aina MDC:tä salaamiseen" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "Älä koskaan käytä MDC:tä salaamiseen" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "älä tee muutoksia" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "kysy ennen päällekirjoitusta" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "käytä gpg-agent:ia" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "batch-tila: älä kysy milloinkaan" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "oleta myönteista vastausta useimpiin kysymyksiin" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "oleta kielteistä vastausta useimpiin kysymyksiin" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "lisää tämä avainnippu avainnippujen luetteloon" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "lisää tämä salainen avainnippu luetteloon" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "näytä mihin avainnippuun tulostettu avain kuuluu" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NIMI|käytä NIMI salaista avainta oletusarvona" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NIMI|aseta NIMI terminaalin merkistöksi" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "lue ehdot tiedostosta" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|statustiedot kirjoitetaan FD:n" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[tiedosto]|kirjoita statustiedot tiedostoon" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|AVAIN_ID|luota ehdottomasti tähän avaimeen" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|TIEDOSTO|lataa laajennusmoduli TIEDOSTO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "jäljittele RFC1991:ssä kuvattua toimintamuotoa" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "aseta kaikki paketti- salain- ja tiivistevaihtoehdot OpenPGP muotoon" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "aseta kaikki paketti-, salain- ja tiivistevaihtoehdot PGP 2.x muotoon" @@ -731,7 +736,7 @@ msgstr "Älä näytä kuvallisia tunnuksia" msgid "Set command line to view Photo IDs" msgstr "Aseta komentotulkki kuvallisien tunnuksien katsomista varten" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -739,7 +744,7 @@ msgstr "" "@\n" "(Katso täydellinen luettelo kaikista komennoista ja ehdoista man-sivuilta)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -757,15 +762,15 @@ msgstr "" "--list-keys [nimet] näytä avaimet\n" "--fingerprint [nimet] näytä sormenjäljet\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Kerro virheistä (englanniksi) \n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Käyttö gpg [ehdot] [tiedostot] (-h saadaksesi ohjeita)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -775,7 +780,7 @@ msgstr "" "allekirjoita, tarkista, salaa tai avaa\n" "oletustoiminto riippuu syötetystä tiedosta\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -783,319 +788,353 @@ msgstr "" "\n" "Tuetut algoritmit:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Julkinen avain" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Salain " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Tiiviste: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Pakkaus: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "käyttö: gpg [ehdot]" -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "ristiriitainen komento\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "= merkkiä ei löytynyt ryhmämäärityksessa \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "Varoitus omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "Varoitus: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Varoitus: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Huom: Vanhat oletusarvoiset asetukset löytyvät tiedostosta `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Huom: Ehdot löytyvät oletusarvoisesti tiedostosta `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "valitsin-tiedosto `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "luetaan valitsimet tiedostosta `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "avainpalvelimen URI:tä ei voitu koota\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: tuontivalitsimet eivät kelpaa\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "tuontivalitsimet eivät kelpaa\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vientivalitsimet eivät kelpaa\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "vientivalitsimet eivät kelpaa\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voitu asettaa\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Huom: %s ei käytetä normaalisti!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ei ole sallittu samanaikaisesti kuin %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s käyttö samanaikaisesti on järjetöntä!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "irrallinen allekirjoitus voidaan luoda vain --pgp2 tilassa\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 tilassa ei voida allekirjoittaa ja salata samanaikaisesti\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 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 otettu " "käyttöön.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2 tilassa vaatii IDEA salaimen\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "%s ei kenties voi käsitellä tätä viestiä\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salain-algoritmi ei kelpaa\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistysalgoritmi ei kelpaa\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistysalgoritmi ei kelpaa\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "tiivistysalgoritmin täytyy olla väliltä %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed täytyy olla suurempi kuin 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed täytyy olla suurempi kuin 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depht tulee olla välillä 1-255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Huom: yksinkertaista S2K tilaa (0) ei suositella käytettäväksi\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K tila ei kelpaa, arvon tulee olla 0, 1 tai 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level arvo ei kelpaa, arvon tulee olla 0, 1 tai 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "oletusarvoiset valinnat eivät kelpaa\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "henkilökohtaisen salaimen valinnat eivät kelpaa\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "henkilökohtaiset tiivisteen valinnat eivät kelpaa\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "henkilökohtaiset tiivistysvalinnat eivät kelpaa\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "Komentoa %s ei sallita %s tilassa.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "Komentoa %s ei sallita %s tilassa.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "Komentoa %s ei sallita %s tilassa.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB alustaminen ei onnistu: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROITUS: vastaanntottajia (-r) annettu käyttämättä julkisen avaimen " "salausta\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key käyttäjätunnus" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key käyttäjätunnus" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key käyttäjätunnus [komennot]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "%s: %s avaus ei onnistu\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainnippu]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Avaimen luonti epäonnistui: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "salaisten avainten enumerointi epäonnistui: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Avaimen luonti epäonnistui: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record epäonnistui: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "salaisten avainten enumerointi epäonnistui: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "tekstin avaaminen epäonnistu: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "salaaminen tekstimuotoon epäonnistui: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "tiivistealgoritmi `%s' ei kelpaa\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[tiedostonimi]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Kirjoita viestisi...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "`%s' avaaminen ei onnistu\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1103,19 +1142,19 @@ msgstr "" "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai välilyöntejä " "sen täytyy loppua merkkiin '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "käyttäjätunnuksen notaationimen täytyy sisältää '@'-merkki\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "notaatiosssa ei saa olla erikoismerkkejä\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "varmenne ohjeistuksen URL ei kelpaa\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "allekirjoitus ohjeistuksen URL ei kelpaa\n" @@ -1258,7 +1297,7 @@ msgstr "" "Luottamusarvoa ei ole asetettu seuraavalle:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " aka \"" @@ -1316,7 +1355,7 @@ msgstr "o = ohita tämä avain\n" msgid " q = quit\n" msgstr "l = lopeta\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Valintasi?" @@ -1503,91 +1542,91 @@ msgstr "%s ohitettu: julkinen avain on p msgid "no valid addressees\n" msgstr "ei kelvollisia vastaanottajia\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "valinta %c%lu ei ole pätevä\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "valinta %c%lu on kopio\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "liian monta `%c' valintaa\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "allekirjoitetaan itse\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "allekirjoitetaan itse\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "allekirjoitetaan avaimen varmentava allekirjoitus\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "avaimen koko on pyöristetty %u bittiin\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Valitse millaisen avaimen haluat:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA ja ElGamal (oletus)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d DSA (vain allekirjoitus)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (vain salaus)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (salaus ja allekirjoitus)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d RSA (vain allekirjoitus)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (salaus ja allekirjoitus)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Valintasi? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1597,15 +1636,15 @@ msgstr "" "viestimään PGP käyttäjien kanssa tätä avainta käyttäessäsi\n" "Tämä algoritmi on myös hyvin hidas ja saattaa olla muita turvattomampi.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Haluatko luoda avaimen kaikesta huolimatta?" -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Valinta ei kelpaa.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1618,19 +1657,19 @@ msgstr "" " oletuskoko on 1024 bittiä\n" " suurin suositeltava koko on 2048 bittiä\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Minkä kokoisen avaimen haluat? (1024)" -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "Avaimen koko on liian pieni, RSA:n pienin sallittu avinkoko on 1024.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "Avaimen koko on liian pieni, alin sallittu arvo on 768.\n" @@ -1642,12 +1681,12 @@ msgstr "Avaimen koko on liian pieni, ali #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "Avaimen koko on liian suuri, suurin sallittu arvo on %d.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1655,11 +1694,11 @@ msgstr "" "2048 bittiä suurempia avaimia ei suositella koska\n" "laskenta voi viedä TODELLA pitkän ajan!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Oletko varma että haluat tämän kokoisen avaimen?" -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1667,17 +1706,17 @@ msgstr "" "Hyvä on, mutta muista että kuvaruutusi ja näppäimistösi säteily \n" "on myös alttiina salakuuntelulle.\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Vaaditun avaimen koko on %u bittiä\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "pyöristetty %u:n bittiin\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1693,7 +1732,7 @@ msgstr "" " m = Avain vanhenee n kuukauden kuluttua\n" " y = Avain vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1709,30 +1748,30 @@ msgstr "" " m = Avain vanhenee n kuukauden kuluttua\n" " y = Avain vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Avain on voimassa (0)" -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Allekirjoitus on voimassa (0)" -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "arvo ei kelpaa\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s ei vanhene koskaan\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s vanhenee %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1740,11 +1779,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Onko tämä oikein (k/e)" -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1758,44 +1797,44 @@ msgstr "" "käyttäjätunnuksen oikeasta nimestä, huomautuksesta ja e-mail osoitteesta\n" "muodossa: \"Matti Meikäläinen (nuorempi) \"\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Oikea nimi: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Nimessä on luvaton merkki\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Nimi ei voi alkaa numerolla\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Nime täytyy olla vähintään 5 merkkiä pitkä\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-mail osoite: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "e-mail osoite ei kelpaa\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Huom: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Huomautuksessa on luvaton merkki\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Käytät `%s' merkistöä.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1806,27 +1845,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Älä syötä e-mail osoitetta nimen tai huomautuksen paikalle\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnHhEeOoLl" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Muuta (N)imi, (H)uomautus, (E)mail vai (L)opeta?" -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muuta (N)imi, (H)uomautus, (E)mail vai (O)k/(L)opeta?" -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Ole hyvä ja korjaa ensin virhe\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1834,16 +1873,16 @@ msgstr "" "Tarvitset salasana suojaamaan salaista avaintasi.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1855,7 +1894,7 @@ msgstr "" "tämän ohjelman ehdolla \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1867,53 +1906,53 @@ msgstr "" "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n" "paremman tilaisuuden kerätä riittävästi entropiaa.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA avainparissa on 1024 bittiä.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Avaimen luonti peruutettu.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjoitan julkisen avaimen kohteeseen `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjoitan salaisen avaimen kohteeseen `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "julkista avainnippua ei löydy kirjoittamista varten. %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "salaista avainnippua ei löydy kirjoittamista varten: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "virhe kirjoitettaessa julkiseen avainnippuun `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "virhe kirjoitettaessa salaiseen avainnippuun `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "Julkinen ja salainen avain on luotu ja allekirjoitettu.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "Avain on määritelty ehdottoman luotettavaksi:\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1921,12 +1960,12 @@ msgstr "" "Huom. tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n" "\"--edit-key\" luodaksesi toissijaisen avaimen tähän tarkoitukseen.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1934,7 +1973,7 @@ msgstr "" "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunu aikahyppy tai\n" "kellon kanssa on ongelmia\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1942,25 +1981,25 @@ msgstr "" "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "Huom: v3 aliavainten luonti ei ole OpenPGP mukaista\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Haluatko todella luoda?" -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: ei voida avata kohdetta: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "virhe luotaess salasanaa: %s\n" @@ -1969,17 +2008,17 @@ msgstr "virhe luotaess salasanaa: %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "symmetristä ESK pakettia ei voida käyttää S2K tilan vuoksi\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "%s on jo tiivistetty\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: VAROITUS: tiedosto on tyhjä\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "--pgp2 tilassa voidaan salata vain 2048 tai pienemmillä RSA avaimilla\n" @@ -1994,7 +2033,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "kaikille salattaville avaimille ei voida käyttää IDEA salainta.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "symmetristä salainta %s (%d) ei löydy vastaanottajan valinnoista\n" @@ -2009,438 +2048,428 @@ msgstr "HUOM: salausalgoritmia %s %d ei msgid "you may not use %s while in %s mode\n" msgstr "Komentoa %s ei sallita %s tilassa.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "avainta '%s' ei löydetty: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "virhe luettaessa avainlohkoa: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "avain %08lX: avain ei noudata rcf2440:aa avain ohitettu\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "avain %08lX. ei suojattu - ohitetaan\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "avain %08lX: PGP 2.x muotoinen avain ohitetaan\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "VAROITUS: mitään ei viety\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "pk välimuistissa on liian monta kohdetta - poistettu käytöstä\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[käyttäjätunnus ei löytynyt]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Epäpäteva avain %08lX määritelty päteväksi \n" "ehdolla --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "Julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" "avain %08lX: salaisella avaimella ei ole vastaavaa \n" "julkista avainta - ohitetaan\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "ohitetaan %d tyyppinen lohko\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "tähän mennessä käsitelty %lu avainta\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "virhe luettaessa `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Kaikkiaan käsitely: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ohitetaan uudet avaimet: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ilman käyttäjätunnuksia: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " tuotu: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " muuttamatta: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " uusia käyttäjätunnuksia: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " uusia alaiavaimia: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " uusia allekirjoituksia: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " uusia avainten peruutuksia (revokaatioita): %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " luettuja salaisia avaimia: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " tuotuja salaisia avaimia: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " muuttamattomia salaisia avaimia: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " %lu ei tuotu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "HUOM: Elgamal tyyppinen ensisijainen avain havaittu - tuominen voi\n" "viedä aikaa\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "avain %08lX: ei käyttäjätunnusta\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "avain %08lX HKP aliavainvirhe korjattu\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" "avain %08lX: käyttäjätunnus '%s' hyväksytty ilman omaa allekirjoitusta\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "avain %08lX: ei voimassa olevia käyttäjätunnuksia\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "tämän voi aiheuttaa puuttuva oma-allekeirjoitus\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "avain %08lX: julkista avainta ei löydetty. %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "avain %08lX: uusi avain ohitetaan\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "avainnippuun: %s ei voida kirjoittaa\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "kirjoitetaan kohteeseen `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "virhe kirjoitettaessa avinnippuun `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "avain %08lX: ei vastaa omaa kopiotamme\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "avain %08lX: alkuperaistä avainlohkoa ei löydy: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "salainen avain %08lX: \"%s\" ei muutoksia\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "avain %08lX: avaimella on epäpätevä salain %d - ohitetaan\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "salaisten avainten nipulle ei ole asetettu oletusarvoa: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "avain %08lX: salainen avain tuotu\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "avain %08lX: avain on jo avainnipussa\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "avain %08lX: salaista avainta ei löydy: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "avain %08lX: ei julkista avainta - peruutus (revokaatio)\n" " varmennetta ei voida käyttää\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "avain %08lX: pätemätön peruutus (revokaatio) varmenne: %s - torjuttu\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "avain %08lX: \"%s\" peruutus (revokaatio) varmenne tuotu\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "avain %08lX: käyttäjätunnuksella ei ole allekirjoitusta\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "avain %08lX: pätemätön oma-allekirjoitus \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "avain %08lX: pätemätön aliavainriippuvuus\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "avain %08lX: ei aliavainta avainten peruuttamista varten\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "avain %08lX: aliavaimen peruutus (revokaatio) ei ole pätevä\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "avain %08lX: käyttäjätunnus ohitettu '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "avain %08lX: aliavain ohitettu\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "avain %08lX: peruutus (revokaati) varmenne väärässä paikassa - ohitetaan\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" "avain %08lX: peruutus (revokaatio) varmenne ei kelpaa: %s - ohitetaan\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "avain %08lX: kaksinkertainen käyttäjätunnus havaittu - sisällytetään\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "Varoitus: avain %08lX sattaa olla peruutettu: haetaan peruutusavain %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "Varoitus: avain %08lX saattaa olla peruutettu: peruutusavain %08lX ei " "saatavilla.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "avain %08lX: \"%s\" peruutus (revokaatio) varmenne lisätty\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "avain %08lX: lisättiin suora allekirjoitus\n" @@ -2453,29 +2482,29 @@ msgstr "[peruutus]" msgid "[self-signature]" msgstr "[oma-allekirjoitus]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 epäkelpo allekirjoitus\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d epäkelpoa allekirjoitusta\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 allekirjoitus on tarkistamatta puuttuvien avainten vuoksi\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d allekirjoitusta ei voitu tarkistaa puuttuvien avainten vuoksi\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 allekirjoitus tarkistamatta virheen vuoksi\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d allekirjoitusta tarkistamatta virjheen vuoksi\n" @@ -2498,20 +2527,27 @@ msgstr "" msgid "User ID \"%s\" is revoked." msgstr "Käyttäjätunnus \"%s\" on peruutettu(revokoitu)." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Oletko varma että haluat allekirjoittaa (k/E)?" -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Allekirjoittaminen ei onnistu.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Käyttäjätunnus \"%s\" on peruutettu(revokoitu)." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "VAROITUS: K-bäyttäjätunnus \"%s\" on tyhj-Aä tiedosto\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2520,13 +2556,13 @@ msgstr "" "Oma-allekirjoitus kohteessa \"%s\"\n" "in PGP2.x-tyylinen allekirjoitus\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP allekirjoitukseksi? " "(k/E)" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2535,13 +2571,13 @@ msgstr "" "Nykyinen allekirjoituksesi kohteessa \"%s\"\n" "on paikallinen vanhentunut.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Haluatko korvata vanhan allekirjoituksen uudella (k/E)" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2550,45 +2586,45 @@ msgstr "" "Nykyinen allekirjoituksesi kohteessa \"%s\"\n" "on paikallinen allekirjoitus.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" "Haluatko vahventaa sen täysin vientikelpoiseksi\n" "allekirjoitukseksi? (k/E)" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Oletko varma että haluat allekirjoittaa kaikesta huolimatta (k/E)?" -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Tämä avain on vanhentunut!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Avain vanhentuu %s..\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Haluatko allekirjoituksesi vanhenentuvan samaan aikaan (K/e)" -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2596,11 +2632,11 @@ msgstr "" "Et voi luoda OpenPGP allekirjoitusta PGP 2.x avaimella \n" "--pgp2 tilassa\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2609,31 +2645,35 @@ msgstr "" "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n" "Jos et tiedä vastausta, syötä \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "(0) En vastaa.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "(oletusarvo)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr "(1) En ole tarkistanut.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Olen suorittanut pintapuolisen tarkistuksen.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) olen suorittanut huolellisen tarkistuksen.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2641,7 +2681,7 @@ msgstr "" "Oletko varma että haluat allekirjoittaa tämän\n" "avaimen omalla avaimellasi:" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2649,7 +2689,7 @@ msgstr "" "\n" "tämän tulee olemaan oma-allekeirjoitus\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2657,7 +2697,7 @@ msgstr "" "\n" "VAROITUS: Tämä allekirjoitus määritellään ei-vientikelpoiseksi.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2665,7 +2705,7 @@ msgstr "" "\n" "VAROITUS: Tämä allekirjoitus määritellään ei-peruutettavaksi.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2673,7 +2713,7 @@ msgstr "" "\n" "Tämä allekirjoitus määritellään ei-vientikelpoiseksi.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2681,7 +2721,7 @@ msgstr "" "\n" "Tämä allekirjoitus määritellään ei-peruutettavaksi.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2689,7 +2729,7 @@ msgstr "" "\n" "En ole tarkistanut tätä avainta lainkaan.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2697,7 +2737,7 @@ msgstr "" "\n" "Olen tarkistanut avaimen pintapuolisesti.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2705,34 +2745,34 @@ msgstr "" "\n" "Olen tarkistanut avaimen huolellisesti.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Haluatko todella allekirjoittaa?" -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "allekirjoitus epäonnistui: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Avainta ei ole suojattu.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Avain on suojattu.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Ei voida editoida avainta: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2740,7 +2780,7 @@ msgstr "" "Syötä uusi salasana salaiselle avaimelle.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2748,493 +2788,493 @@ msgstr "" "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Haluatko todella tehdä tämän? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "ulos tästä valikosta" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "l" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "tallenna" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "tallenna ja lopeta" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "apua" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "näytä tämä ohje" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "näytä sormenjälki" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "näytä avaimet ja käyttäjätunnukset" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "ktn" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "valitse käyttäjätunnus N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "avain" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "valitse toissijainen avain N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "tarkista" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "näytä allekirjoitukset" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "allekirjoita" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "allekirjoita avain" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "allekirjoita avain paikallisesti" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "allekirjoita avain ilman mahdollisuutta peruuttaa" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "allekirjoita avain paikallisesti ilman mahdollisuutta peruuttaa" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "lisää käyttäjätunnus" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "lisää valokuva" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "Poista käyttäjätunnus" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "lisää toissijainen avain" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "poista toissijainen avain" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "lisää peruutusavain" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "poista allekirjoitus" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "vanhenna" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "muuta voimassoloaikaa" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "ensisijainen" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "merkitse käyttäjätunnus ensisijaiseksi" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "vaihda" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "vaihda salaisten ja julkisten avainten luettelon välillä" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "näytä valinnat (ekspertti)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "näytä valinnat (monisanaisesti)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "näytä valinnat" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "päivitä valinnat" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "salasana" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "muuta salasanaa" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "luota" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "muuta luottamusastetta" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "peruallek" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "peru allekirjoitus" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "perutunn" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "peru käyttäjätunnus" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "peruuta toissijainen avain" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "poista käytöstä" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "poista avain käytöstä" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "ota avain käyttöön" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "näytä valokuva" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "tätä ei voi tehdä batch-tilassa\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "virhe luettaessa salaista avainlohkoa `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Salainen avain on saatavilla.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Komento>" -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Tähän tarvitaan salainen avain\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Käytä ensin komentoa \"vaihda\".\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Avain on peruutettu." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Haluatko todella allekirjoittaa kaikki käyttäjätunnukset?" -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: valitse allekirjoitettavat käyttäjätunnukset\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tätä komentoa ei sallita %s tilassa.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus!\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Haluatko todella poistaa kaikki valitut käyttäjätunnukset?" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Haluatko todella poistaa tämän käyttäjätunnuksen?" -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Sunu täytyy valita ainakin yksi avain.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Haluatko todella poistaa valitut avaimet?" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Haluatko todella poistaa tämän avaimen?" -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Haluatko todella peruuttaa kaikki valitut käyttäjätunnukset?" -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Haluatko todella peruuttaa tämän käyttäjätunnuksen?" -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Haluatko todella peruuttaa (revokoida) valitut avaimet?" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Haluatko todella peruuttaa (revokoida) tämän avaimen?" -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Haluatko todella päivittää valinnat näille käyttäjätunnuksille?" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Haluatko todella päivittää valinnat? (k/E)" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Tallenna muutokset?" -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Lopeta tallentamatta muutoksia?" -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "salaisen päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Päivitystä ei tarvita koska avain ei ole muuttunut.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"apua\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Tiiviste: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Ominaisuudet: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "tämä avain voidaan peruutta avaimella %s" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (luottamuksellinen)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX luotu :%s vanhentuu: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "luota: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Tämä avain on poistettu käytöstä" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! aliavain on peruutettu (revokoitu): %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- väärennetty peruutus (revokaatio) löydetty\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? peruutuksen (revokaation) tarkistuksessa on ongelmia: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "vanhenna" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x-tyyliselle käyttäjätunnukselle ei ole valintoja.\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3242,7 +3282,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3252,45 +3298,45 @@ msgstr "" "saada\n" " jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Oletko varma että haluat lisätä sen (k/E)?" -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Et voi lisätä valokuvaa PGP2-muotoiseen avaimeen.\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Poistetaanko tämä voimassa oleva allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Haluatko todella poistaa oman allekirjoituksen? (k/E)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d allekirjoitus poistettu.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d allekirjoitusta poistettu.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Mitään ei poistettu.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3301,84 +3347,84 @@ msgstr "" "saada\n" " jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Et voi lisätä määrättyä peruuttajaa PGP2-muotoiseen avaimeen.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Syötä määrätyn peruuttajan käyttäjätunnus" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x avainta ei voi asettaa määrätyksi peruuttajaksi\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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "ei voi asettaa avainta omaksi määrätyksi peruuttajaksi\n" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "ei voi asettaa avainta omaksi määrätyksi peruuttajaksi\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "ei voi asettaa avainta omaksi määrätyksi peruuttajaksi\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Poista salasten avainten valinnat ole hyvä.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Valitse korkeintaan yksi toissijainen avain ole hyvä.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Muutetaan toissijaisen avaimen voimassaolopäivää.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Muutetaan ensisijaisen avaimen voimassaolopäivää.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3 avainten voimassaolopäivää ei voi muuttaa\n" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "salaisesta avainnipusta ei löydy vastaavaa ellekirjoitusta\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Valitse vain yksi käyttäjätunnus!\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "ohitetaan v3 muotoinen oma-allekirjoitus käyttäjätunnukselle \"%s\"\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Ilmaisimella %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Ilmaisimella %d ei löydy toissijaista avainta\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "Käyttäjätunnus: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3387,7 +3433,7 @@ msgstr "" "\"\n" "allekirjoitettu avaimellasi %08lX %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3396,56 +3442,56 @@ msgstr "" "\"\n" "allekirjoitettu paikallisesti avaimellasi %08lX %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Tämä allekirjoitus vanhentui %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Haluatko todella peruuttaa (revokoida) sen? (k/E)" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko tälle alekirjoitukselle peruutus (revokaatio) varmenne (k/E)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset: \n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " %08lX allekirjoitti tämän %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr "%08lX peruutti (revokoi) tämän %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Olete peruuttamassa (revokoimassa) seuraavat allekirjoitukset:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " %08lX allekirjoitti tämän %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "(ei vientikelpoinen)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Haluatko todella luoda peruutus (revokaatio) varmenteet? (k/E)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "salainen avain ei ole saatavilla\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Käyttäjätunnus \"%s\" on peruutettu(revokoitu)\n" @@ -3454,72 +3500,72 @@ msgstr "Käyttäjätunnus \"%s\" on peruute #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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 sekuntia " "tulevaisuudessa\n" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n" "(käyttäjätunnus %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Tärkein ohjeistus allekirjoituksille:" -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Ohjeistus allekirjoituksille:" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "VAROITUS: löydettiin väärin muotoiltua notaatio dataa\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Tärkein allekirjoitus notaatio:" -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Allekirjoitus notaatio:" -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "ei ihmisten luettavissa" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Avainnippu" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [vanhenee: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Ensisijaisen avaimen sormenjälki: " -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki=" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr "Ensisijaisen avaimen sormenjälki:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki=" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Avaimen sormenjälki=" @@ -3605,103 +3651,112 @@ msgstr "HUOM: lähettäjä määrittää \"luot msgid "original file name='%.*s'\n" msgstr "alkuperäisen tiedoston nimi='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "itsenäinen peruutus (revokaatio) käytä \"gpg --import\" soveltaaksesi\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notaatio:" -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Ohjeistus:" -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "allekirjoituksen varmistus vaiennetaan\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "näitä allekirjoituksia ei voida käsitellä\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "allekirjoitus loi %-*s käyttäen %s avaintunnus %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Ei ohjeita saatavilla" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "allekirjoitus EI TÄSMÄÄ lähettäjallä\"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "vanhentunut allekirjouts lähettäjällä \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Allekirjoitus täsmää lähettäjällä \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[ei tiedossa]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Tämä allekirjoitus vanhentui %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Tämä allekirjoitus vanhentui %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s allekirjoitus lähettäjältä: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "ensisijainen" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "tuntematon versio" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Seuraavaa allekirjoitusta ei voida tarkistaa: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "allekirjoitus ei ole irrallinen\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" "VAROITUS: Haittiin useita allekirjoituksia. Vain ensimmäinen tarkistetaan.\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "irrallinen allekirjoitus luokkaa 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "vanhan mallinen (pgp 2.x) allekirjoitus\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "epäkelpo root paketti havaittu proc_tree():ssä\n" @@ -3728,75 +3783,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: vaihtoehdon \"%s\" käyttöä ei suositella.\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VAROITUS: \"%s\" vaihtoehdon käyttöä ei suositella.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "käytä sen sijaan ehtoa \"%s%s\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "%s ei kenties voi käsitellä tätä viestiä\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "julkisen avaimen algorimin käsittely ei onnistu: %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "alipaketilla tyyppiä %d on asetettu \"critical bit\"\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole käytettävissä tätä istuntoa varten\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "agentille ei voida asettaa pid:tä\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "palvelin ei lue agentin FD:tä\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "palvelin ei kirjoita agentille FD:tä\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO ympäristömuuttuja on väärin muotoiltu\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokollaversio %d ei ole tuettu\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "yhteys kohteeseen `%s': %s ei onnistu\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent yhteysongelma\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "agentin käytössä on ongelmia - käyttö estetään\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr "(pääavaimen tunnus %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3807,32 +3867,32 @@ msgstr "" "\"%.*s\"\n" "%u-bittinen %s avain, tunnus %08lX, luotu %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "toista salasana\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "syötä salasana\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "salasana on liian pitkä\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "agentin lähettämä vastaus ei kelpaa\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "käyttäjän peruuttama\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3841,20 +3901,20 @@ msgstr "" "\n" "tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%ubittinen %s avain , tunnus %08lX, luotu %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "salasanan kysyminen ei onnistu batch-tilassa\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Syötä salasana: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -3946,8 +4006,8 @@ msgid "failed sending to `%s': status=%u msgstr "virhe lähettäessä kohteeseen `%s': status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "tämä avainpalvelin ei ole täysin HKP-yhteensopiva\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3985,11 +4045,11 @@ msgstr "Havaittiin heikko avain - muuta msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "luodaan avaimen suojaksi 16 bittinen tarkistussumma\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -3998,17 +4058,17 @@ msgstr "" "avain %08lX tämä on PGP:n luoma ElGamal avain jota EI ole turvallista \n" "käyttää allekirjoituksiin.\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4018,7 +4078,7 @@ msgstr "" "tai\n" "kellon kanssa on ongelmia\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4028,49 +4088,54 @@ msgstr "" "tai\n" "kellon kanssa on ongelmia)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "Huom: allekirjoitusavain %08lX vanhentui %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta " "\"critical bit\":istä\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "avain %08lX: ei aliavainta avainten peruuttamiseen\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "PGP 2.x avainta ei voi asettaa määrätyksi peruuttajaksi\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "PGP 2.x avainta ei voi asettaa määrätyksi peruuttajaksi\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "VAROITUS: %%-expand ei onnistu (liian suuri). Käytetään laajentamatonta.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "PGP 2.x avainta ei voi asettaa määrätyksi peruuttajaksi\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4097,12 +4162,12 @@ msgstr "VAROITUS: `%s' on tyhjä tiedosto msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "PGP2.x muotoisia avaimia voi allekirjoittaa vain --pgp2 tilassa\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "ei voida luoda kohdetta %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4118,7 +4183,7 @@ msgstr "" "PGP 2.x muotoisia avaimia voi allekirjoittaa tekstimuotoon \n" "vain --pgp2 tilassa\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "käyttetään %s salausta\n" @@ -4133,12 +4198,12 @@ msgstr "en voi käsitellä tekstirivejä jo msgid "input line longer than %d characters\n" msgstr "syöttörivi on pidempi kuin %d merkkiä\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek epäonnistui: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n" @@ -4147,122 +4212,122 @@ msgstr "trustdb rec %lu: kirjoittaminen msgid "trustdb transaction too large\n" msgstr "trustdb toiminto on liian suuri\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: pääsy kohteeseen : %s ei onnistu\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: hakemistoa ei ole olemassa!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: en voi luoda lukitusta\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: en voi luoda lukitusta\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: en voi luoda kohdetta: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: versiotietojen luonti epäonnistui: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: luotu trustdb ei kelpaa\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: trustdb luotu\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "HUOMIO: trustdb:n ei voida kirjoittaa\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb ei kelpaa\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: hast-taulukon luonti ei onnistu: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: virhe päivitettäessä versiotietoja: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: virhe luettaessa versiotietoja: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: virhe kirjoitettaessa versiotitetoja: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek epäonnistui: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: luku epäonnistui (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ei ole trustdb tiedosto\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versiotiedoissa recnum on %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: tiedostoversio %d ei kelpaa\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: tietueen nollaaminen epäonnistui: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdg on korruptoitunut, aja \"gpg --fix-trustdb\"\n" @@ -4312,39 +4377,39 @@ msgstr "luottamus tietue %lu, tyyppiä %d msgid "trustdb: sync failed: %s\n" msgstr "trustdb: syncronointi epäonnistui: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "seuraava trustdb tarkistus %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "tarkistetaan trustdb:tä\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "julkista avainta %08lX ei löydy: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n" @@ -4352,7 +4417,7 @@ msgstr "ehdottomasti luotettu julkinen a #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4904,17 +4969,17 @@ msgstr "Ole hyvä ja korjaa tämä mahdolli msgid "checking keyring `%s'\n" msgstr "tarkistetaan avainrengasta `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "tähän mennessä käsitelty %lu avainta (%lu allekirjoitusta)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: luotiin avainnippu\n" @@ -5015,7 +5080,7 @@ msgstr "VAROITUS: välisikaista tiedostoa msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROITUS: ei voida poistaa väliaikaista hakemistoa `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "ei koskaan " @@ -5111,33 +5176,33 @@ msgstr "" "kelvoton. Mutta varo: tulostusjärjestelmäsi voi tallentaa tietoa\n" "ja luovuttaa sen toisille!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Valise peruutuksen (revokaation) syy:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Peruuta" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Haluat luultavasti valita tässä %d)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "Syötä valinnainen kuvaus. Lopeta tyhjällä rivillä: \n" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Peruutuksen (revokaation) syy: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Ei kuvausta)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Onko tätä oikein?" @@ -5182,6 +5247,9 @@ msgstr "virhe luettaessa luottotietuetta msgid "read error: %s\n" msgstr "lukuvirhe: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "tämä avainpalvelin ei ole täysin HKP-yhteensopiva\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "Tämän algoritmin käyttöä kehotetaan välttämään - luonko silti?" @@ -5323,9 +5391,6 @@ msgstr "lukuvirhe: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "virhe luettaessa ensisijaista avainta kohteelle LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record epäonnistui: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "avain %08lX: kysely epäonnistui\n" @@ -5338,9 +5403,6 @@ msgstr "lukuvirhe: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "avaimen %08lX salainen ja julkinen avain eivät vastaa toisiaan\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "salaisten avainten enumerointi epäonnistui: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "avain %08lX.%lu: aliavainten sitovuus on pätevä\n" diff -urpP gnupg-1.2.2/po/fr.po gnupg-1.2.3/po/fr.po --- gnupg-1.2.2/po/fr.po 2003-05-01 14:38:11.000000000 +0000 +++ gnupg-1.2.3/po/fr.po 2003-08-21 20:05:10.000000000 +0000 @@ -5,12 +5,12 @@ # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.60.2.7 2003/05/01 11:02:38 werner Exp $ +# $Id: fr.po,v 1.60.2.12 2003/08/21 17:18:35 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-28 18:48+0300\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -52,7 +52,7 @@ msgstr "non" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "quitter" @@ -279,65 +279,65 @@ msgstr "... c'est un bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "vous avez trouvé un bug... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "aucun module de récupération d'entropie n'a été trouvé.\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "impossible d'ouvrir `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "impossible d'accéder à `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' n'est pas un fichier régulier - ignoré\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "note: le fichier `random_seed' est vide\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n" "Celui-ci ne sera pas utilisé.\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "impossible de lire `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "impossible de créer `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "impossible d'écrire `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "impossible de fermer `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "" "ATTENTION: utilisation d'un générateur de nombres aléatoires peu sûr !!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -369,6 +369,11 @@ msgstr "" "l'algorithme de hachage `%s' ne marche que pour la lecture dans cette\n" "version\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -379,7 +384,7 @@ msgstr "" "faire autre chose pour ne pas vous ennuyer, car cela donnera une\n" "meilleure qualité à l'entropie.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -387,167 +392,167 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "faire une signature détachée" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "chiffrer les données" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[fichiers]|chiffrer les fichiers" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "chiffrement symétrique seulement" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "déchiffrer les données (défaut)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[fich.]|déchiffrer les fichiers" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "vérifier une signature" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "lister les clés" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "lister les clés et les signatures" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "vérifier les signatures des clés" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "lister les clés et les empreintes" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "lister les clés secrètes" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "générer une nouvelle paire de clés" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "enlever les clés du porte-clés public" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "enlever les clés du porte-clés secret" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "signer une clé" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "signer une clé localement" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "signer une clé irrévocablement" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "signer une clé localement et irrévocablement" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "signer ou éditer une clé" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "générer un certificat de révocation" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exporter les clés" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exporter les clés vers un serveur de clés" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importer les clés d'un serveur de clés" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "chercher les clés avec un serveur de clés" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "mettre à jour les clés depuis un serveur" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importer/fusionner les clés" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importer les indices de confiance" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "mettre la base de confiance à jour" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "mise à jour inattendue de la base de confiance" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "réparer une base de confiance corrompue" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "" "Enlever l'armure d'un fichier ou de\n" "l'entrée standard" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "" "Mettre une armure à un fichier ou à\n" "l'entrée standard" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -557,153 +562,153 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "créer une sortie ascii avec armure" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOM|utiliser NOM comme récipient par défaut" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "utiliser la clé par déf. comme récipient" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou déchiffrer" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 désactive)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "utiliser le mode texte canonique" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "bavard" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "ne pas utiliser du tout le terminal" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forcer les signatures en v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "ne pas forcer les signatures en v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "forcer les signatures en v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "ne pas forcer les signatures en v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "toujours utiliser un sceau pour le chiffrement" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "" "ne jamais utiliser de sceau pour le\n" "chiffrement" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "ne rien changer" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "demander avant d'écraser un fichier" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "utiliser gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "mode automatique: ne jamais rien demander" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "répondre oui à la plupart des questions" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "répondre non à la plupart des questions" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clés à la liste" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clés secret à la liste" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "indiquer où est une clé listée" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clé secrète par défaut" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HÔTE|utiliser ce serveur pour chercher des clés" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractères NOM" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|écrire l'état sur ce descripteur" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[fichier]|écrire les informations d'état vers ce fichier" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|IDCLÉ|donner une confiance ultime à cette clé" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode décrit dans la RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "utiliser le comportement défini par OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "utiliser le comportement de PGP 2.x\n" @@ -752,7 +757,7 @@ msgstr "" "Choisir la ligne de commande servant à\n" "afficher les photos d'identité" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -760,7 +765,7 @@ msgstr "" "@\n" "(Voir la page de manuel pour une liste complète des commandes et options)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -780,17 +785,17 @@ msgstr "" " --list-keys [utilisateur] montrer les clés\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Signaler toutes anomalies à (en anglais)\n" "et tout problème de traduction à .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -800,7 +805,7 @@ msgstr "" "signer, vérifier, chiffrer ou déchiffrer\n" "l'opération par défaut dépend des données entrées\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -808,328 +813,362 @@ msgstr "" "\n" "Algorithmes supportés:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Clé publique: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Chiffrement: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hachage: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compression: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = signature trouvée dans la définition du groupe \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVERTISSEMENT: propriétaire de %s \"%s\" peu sûr\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu sûres\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "AVERTISSEMENT: le propriétaire du répertoire contenant est peu\n" "sûr pour %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "AVERTISSEMENT: les permissions du répertoire contenant %s \"%s\"\n" "sont peu sûres\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: l'ancien fichier d'options par défaut `%s' a été ignoré\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: pas de fichier d'options par défaut `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "l'extension de chiffrement \"%s\" n'a pas été chargée car ses\n" "permissions sont peu sûres\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caractères valide\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "impossible d'interpréter l'URI du serveur de clés\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'exécution à %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature détachée ou en texte clair\n" "qu'en mode --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "vous ne pouvez pas signer et chiffrer en même temps en mode --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n" "est activé.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrage IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "ce message ne sera pas utilisable par %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification sélectionnée est invalide\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "«completes-needed» doit être supérieur à 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "«marginals-needed» doit être supérieur à 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "«max-cert-depth» doit être compris entre 1 et 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level invalide; ce doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "préférences par défaut invalides\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "préférences de chiffrement personnelles invalides\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "préférences de hachage personnelles invalides\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "préférences de compression personnelles invalides\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISSEMENT: des récipients (-r) ont donnés alors que le chiffrement\n" "ne se fait pas par clé publique\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key utilisateur" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key utilisateur" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "impossible d'ouvrir %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "La génération de clé a échoué: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "La génération de clé a échoué: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "La génération de clé a échoué: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "La génération de clé a échoué: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "la mise à jour de la clé secrète a échoué: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a échoué: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a échoué: %s \n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Vous pouvez taper votre message...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossible d'ouvrir `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1137,19 +1176,19 @@ 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" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "l'URL de politique de certification donnée est invalide\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "l'URL de politique de signature donnée est invalide\n" @@ -1292,7 +1331,7 @@ msgstr "" "Pas de confiance définie pour :\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1349,7 +1388,7 @@ msgstr " s = sauter cette clé\n" msgid " q = quit\n" msgstr " q = quitter\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Votre décision ? " @@ -1530,94 +1569,94 @@ msgstr "%s: ignoré: la clé publique est msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "la préférence %c%lu n'est pas valide\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "préférence %c%lu dupliquée\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "trop de préférences `%c'\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Caractère invalide dans la chaîne de préférences\n" # g10/keygen.c:123 ??? -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "écriture de la signature directe\n" # g10/keygen.c:123 ??? -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "écriture de l'auto-signature\n" # g10/keygen.c:161 ??? -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "écriture de la signature de liaison\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Taille invalide; utilisation de %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "taille arrondie à %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Sélectionnez le type de clé désiré:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA et ElGamal (par défaut)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (signature seule)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (chiffrement seul)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (signature et chiffrement)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (signature seule)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (chiffrement seul)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (signature et chiffrement)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Votre choix ? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1628,15 +1667,15 @@ msgstr "" "PGP. Cet algorighme est aussi très lent, et n'est peut-être pas aussi\n" "sûr que les autres choix.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Créer quand même ? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Choix invalide.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1649,19 +1688,19 @@ msgstr "" " la taille par défaut est 1024 bits\n" " la taille maximale conseillée est 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Quelle taille de clé désirez-vous ? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "taille trop petite; 768 est la plus petite valeur permise.\n" @@ -1673,12 +1712,12 @@ msgstr "taille trop petite; 768 est la p #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "taille trop importante; %d est la plus grande valeur permise.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1686,11 +1725,11 @@ msgstr "" "Les tailles supérieures à 2048 ne sont pas conseillées car\n" "les calculs prennent VRAIMENT beaucoup de temps !\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Etes-vous sûr de vouloir cette taille ? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1698,17 +1737,17 @@ msgstr "" "D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n" "clavier sont aussi très vulnérables aux attaques !\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La taille demandée est %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "arrondie à %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1724,7 +1763,7 @@ msgstr "" " m = la clé expire dans n mois\n" " y = la clé expire dans n années\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1740,30 +1779,30 @@ msgstr "" " m = la signature expire dans n mois\n" " y = la signature expire dans n années\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "La clé est valide pour ? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "La signature est valide pour ? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valeur invalide\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s n'expire pas du tout\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s expire le %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1771,11 +1810,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Est-ce correct (o/n) ? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1791,44 +1830,44 @@ msgstr "" " « Heinrich Heine (Der Dichter) »\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nom réel: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Caractère invalide dans le nom\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Le nom ne doit pas commencer par un chiffre\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 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:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Adresse e-mail: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Ce n'est pas une adresse e-mail valide\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Commentaire: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Caractère invalide dans le commentaire\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vous utilisez le jeu de caractères '%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1839,28 +1878,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Ne mettez pas d'adresse e-mail dans le nom réel ou dans le commentaire\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Corrigez l'erreur d'abord\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1868,16 +1907,16 @@ msgstr "" "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "le mot de passe n'a pas été correctement répété ; recommencez." -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1889,7 +1928,7 @@ msgstr "" "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1901,55 +1940,55 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "La paire de clés DSA fera 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "La génération de clé a été annulée.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "écriture de la clé publique vers `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "écriture de la clé secrète vers `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, 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:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, 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:2285 +#: g10/keygen.c:2305 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:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "clé marquée comme ayant une confiance ultime.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1958,13 +1997,13 @@ msgstr "" "utiliser la commande «--edit-key» pour générer une clé secondaire à\n" "cette fin.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, 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:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1972,7 +2011,7 @@ msgstr "" "la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1980,26 +2019,26 @@ msgstr "" "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Créer vraiment ? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output n'est pas compatible avec cette commande\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: impossible d'ouvrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "erreur pendant la création du mot de passe: %s\n" @@ -2009,17 +2048,17 @@ msgid "can't use a symmetric ESK packet msgstr "" "il n'est pas possible d'utiliser un paquet ESK symétrique en mode S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' déjà compressé\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATTENTION: fichier vide\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "le chiffrement RSA ne se fait qu'avec des clés de moins de 2048 bits\n" @@ -2037,7 +2076,7 @@ msgstr "" "impossible d'utiliser le chiffre IDEA pour toutes les clés vers\n" "lesquelles vous chiffrez.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2056,437 +2095,427 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s chiffré pour: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "clé '%s' introuvable: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "erreur pendant la lecture du bloc de clé : %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "clé %08lX: non protégée - ignorée\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "clé %08lX: clé de style PGP 2.x - ignorée\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ATTENTION: rien n'a été exporté\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "trop d'entrées dans le cache pk - désactivé\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Nom utilisateur introuvable]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "La clé invalide %08lX a été rendue valide par --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "il y a une clé secrète pour la clé publique \"%s\" !\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "utilisation de la clé secondaire %08lX à la place de la clé\n" "principale %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clé %08lX: clé secrète sans clé publique - non prise en compte\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "un bloc de type %d a été ignoré\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu clés traitées jusqu'ici\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "erreur pendant la lecture de `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr " Quantité totale traitée: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " nouvelles clés ignorées: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sans nom d'utilisateur: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importée: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " inchangée: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nouveaux noms d'utilisateurs: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nouvelles sous-clés: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nouvelles signatures: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nouvelles révocations de clés: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " clés secrètes lues: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " clés secrètes importées: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " clés secrètes inchangées: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " non importée: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTE: Clé principale Elgamal détectée - l'importation peut prendre un\n" "certain temps\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "clé %08lX: pas de nom d'utilisateur\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "clé %08lX: corruption de sous-clé HKP réparée\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "clé %08lX: nom d'utilisateur non auto-signé accepté '%s':\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "clé %08lX: pas de nom d'utilisateur valide\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "cela peut provenir d'une auto-signature manquante\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clé %08lX: clé publique pas trouvée: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "clé %08lX: nouvelle clé - ignorée\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "aucun porte-clé n'a été trouvé avec des droits d'écriture : %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "écriture de `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erreur durant l'écriture du porte-clés `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "clé %08lX: clé publique \"%s\" importée\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clé %08lX: ne ressemble pas à notre copie\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clé %08lX: impossible de trouver le bloc de clés original: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clé %08lX: impossible de lire le bloc de clés original: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "clé %08lX: \"%s\" un nouvel utilisateur\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "clé %08lX: \"%s\" %d nouveaux utilisateurs\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "clé %08lX: \"%s\" une nouvelle signature\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "clé %08lX: \"%s\" %d nouvelles signatures\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "clé %08lX: \"%s\" une nouvelle sous-clé\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "clé %08lX: \"%s\" %d nouvelles sous-clés\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "clé %08lX: \"%s\" n'a pas changé\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" "clé %08lX: clé secrète avec le chiffrement invalide %d - non prise\n" "en compte\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "pas de porte-clés par défaut: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clé %08lX: clé secrète importée\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clé %08lX: déjà dans le porte-clés secret\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clé %08lX: clé secrète pas trouvée: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clé %08lX: pas de clé publique - le certificat de révocation ne peut\n" "être appliqué\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clé %08lX: certificat de révocation invalide: %s - rejeté\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "clé %08lX: \"%s\" certificat de révocation importé\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "clé %08lX: pas d'utilisateur pour la signature\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "clé %08lX: algorithme de clé publique non supporté avec le nom\n" "d'utilisateur \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "clé %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "clé %08lX: pas de sous-clé pour relier la clé\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clé %08lX: algorithme de clé publique non supporté\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "clé %08lX: liaison avec la sous-clé invalide\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "clé %08lX: supressions de liaisons multiples avec des sous-clés\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "clé %08lX: pas de sous-clé pour révoquer la clé\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "clé %08lX: révocation de sous-clé invalide\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "clé %08lX: suppression de la révocation de sous-clé multiples\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "clé %08lX: utilisateur non pris en compte: '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "clé %08lX: sous-clé non prise en compte\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "clé %08lX: signature non exportable (classe %02x) - ignorée\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "clé %08lX: certificat de révocation au mauvais endroit - ignorée\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clé %08lX: certificat de révocation invalide: %s - ignorée\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "clé %08lX: signature de sous-clé au mauvais endroit - ignorée\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "clé %08lX: classe de signature non attendue (0x%02X) - ignorée\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "clé %08lX: nom d'utilisateur en double fusionné\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "AVERTISSEMENT: la clé %08lX est peut-être révoquée: recherche de la clé de\n" "révocation %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "AVERTISSEMENT: la clé %08lX est peut-être révoquée: la clé de révocation\n" "%08lX est absente.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "clé: %08lX: \"%s\" certificat de révocation ajouté\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "clé %08lX: ajout de la signature de clé directe\n" @@ -2499,29 +2528,29 @@ msgstr "[révocation]" msgid "[self-signature]" msgstr "[auto-signature]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "une mauvaise signature\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d mauvaises signatures\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "une signature non vérifiée à cause d'une clé manquante\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signatures non vérifiées à cause de clés manquantes\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "une signature non vérifiée à cause d'une erreur\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signatures non vérifiées à cause d'erreurs\n" @@ -2540,22 +2569,29 @@ msgstr "%d nom d'utilisateurs sans auto- msgid "User ID \"%s\" is revoked." msgstr "Le nom d'utilisateur \"%s\" est révoqué." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Etes-vous sûr de toujours vouloir le signer ? (o/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Impossible de signer.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Le nom d'utilisateur \"%s\" est révoqué." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "" "AVERTISSEMENT: le nom d'utilisateur \"%s\" ne comporte pas\n" "d'auto-signature.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2564,11 +2600,11 @@ msgstr "" "L'auto-signature de \"%s\"\n" "est de style PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2577,7 +2613,7 @@ msgstr "" "Votre signature actuelle de \"%s\"\n" "a expiré.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" "Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n" @@ -2585,7 +2621,7 @@ msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2594,43 +2630,43 @@ msgstr "" "Votre signature actuelle de \"%s\"\n" "est locale.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Voulez vous la rendre complètement exportable ? (o/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Rien à signer avec la clé %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Cette clé a expiré !" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Cette clé va expirer le %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2638,11 +2674,11 @@ msgstr "" "il n'est pas possible de générer une signature OpenPGP d'une clé de style\n" "PGP 2.x en mode --pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Cela rendra la clé inutilisable par PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2652,31 +2688,35 @@ msgstr "" "appartient réellement à la personne sus-nommée ? Si vous ne savez\n" "quoi répondre, entrez \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Je ne répondrai pas.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (par défaut)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Je n'ai pas vérifié du tout.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) J'ai un peu vérifié.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) J'ai vérifié très soigneusement.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2684,7 +2724,7 @@ msgstr "" "Etes-vous vraiment sûr(e) que vous voulez signer cette clé\n" "avec la vôtre: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2692,7 +2732,7 @@ msgstr "" "\n" "cela sera une auto-signature.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2700,7 +2740,7 @@ msgstr "" "\n" "AVERTISSEMENT: la signature ne sera pas marquée comme non-exportable.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2709,7 +2749,7 @@ msgstr "" "AVERTISSEMENT: La signature ne sera pas marquée comme\n" "non-révocable.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2717,7 +2757,7 @@ msgstr "" "\n" "La signature sera marquée comme non-exportable.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2725,7 +2765,7 @@ msgstr "" "\n" "La signature sera marquée comme non-révocable.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2733,7 +2773,7 @@ msgstr "" "\n" "Je n'ai pas du tout vérifié cette clé.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2741,7 +2781,7 @@ msgstr "" "\n" "J'ai un peu vérifié cette clé.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2749,40 +2789,40 @@ msgstr "" "\n" "J'ai vérifié cette clé avec grand soin.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Signer réellement ? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "la signature a échoué: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Cette clé n'est pas protégée.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "La clé est protégée.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossible d'éditer cette clé: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "Entrez le nouveau mot de passe pour cette clé secrète.\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2791,496 +2831,496 @@ msgstr "" "*mauvaise* idée\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Voulez-vous vraiment faire cela ? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "replacer la signature d'une clé à l'endroit correct\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "enregistrer" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "enregistrer et quitter" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "afficher cette aide" # g10/keyedit.c:556 ??? -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "afficher l'empreinte" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "lister" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lister la clé et les noms d'utilisateurs" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "sélectionner le nom d'utilisateur N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "clé" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "sélectionner la clé secondaire N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "vérifier" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "signer" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "signer la clé" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsigner" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "signer la clé localement" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsigner" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "signer la clé de façon non-révocable" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsigner" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "signer la clé de façon locale et non-révocable" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "déboguer" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "aj.ut" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "aj.photo" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "ajouter une photo d'identité" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "suppr.ut" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "enlever un utilisateur" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "suppr.photo" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "aj.clé" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "ajouter une clé secondaire" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "suppr.clé" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "enlever une clé secondaire" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "aj.rev" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "ajouter une clé de révocation" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "suppr.sign" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "supprimer les signatures" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "changer la date d'expiration" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "principale" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "marquer le nom d'utilisateur comme principal" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "changer" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "passer de la liste des clés secrètes aux clés privées et inversement" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "préf" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "lister les préférences (expert)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "montr.préf" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "lister les préférences (bavard)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "mettre.préf" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "donner la liste de préférences" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "préf.màj" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "préférences mises à jour" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "mot.pas" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "confi." -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "révoquer les signatures" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "révoquer un nom d'utilisateur" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revclé" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "révoquer une clé secondaire" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "désactiver" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "désactiver une clé" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "activer" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "activer une clé" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "montr.photo" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "montrer la photo d'identité" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "impossible de faire cela en mode automatique\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "erreur pendant la lecture du bloc de clé secrète `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "La clé secrète est disponible.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Commande> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Il faut la clé secrète pour faire cela.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Utilisez la commande «toggle» d'abord.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "La clé est révoquée." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Signer vraiment tous les utilisateurs ? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Aide: Sélectionner les utilisateurs à signer\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Cette commande n'est pas admise en mode %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Vous devez sélectionner au moins un utilisateur.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Enlever réellement tous les utilisateurs sélectionnés ? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Enlever réellement cet utilisateur ? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Vous devez sélectionner au moins une clé.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Voulez-vous vraiment supprimer cette clé ? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Révoquer réellement tous les noms d'utilisateurs sélectionnés ? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Révoquer réellement ce nom d'utilisateur ? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Voulez-vous vraiment révoquer cette clé ? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Enlever réellement les préférences des utilisateurs sélectionnés ? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Faut-il vraiment mettre à jour les préférences ? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Enregistrer les changements? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Quitter sans enregistrer? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "la mise à jour a échoué: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "la mise à jour de la clé secrète a échoué: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 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:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez «help»)\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Hachage: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Fonctions: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Cette clé peut être révoquée par la clé %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensible)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX créée: %s expire: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " confiance: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Cette clé a été désactivée" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! la sous-clé a été révoquée: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- une révocation truquée a été trouvée\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problème de vérification de la révocation: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revclé" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3288,7 +3328,13 @@ msgstr "" "Notez que la validité affichée pour la clé n'est pas nécessairement\n" "correcte à moins de relancer le programme.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3298,46 +3344,46 @@ msgstr "" "d'identité peut empêcher certaines versions de PGP d'accepter\n" "cette clé\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Supprimer cette bonne signature ? (o/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Supprimer cette signature invalide ? (o/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Supprimer cette signature inconnue ? (o/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d signature supprimée.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d signatures supprimées\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Rien n'a été supprimé.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3347,16 +3393,16 @@ msgstr "" "désigné peut empêcher certaines versions de PGP d'accepter\n" "cette clé.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Entrez le nom d'utilisateur du révocateur désigné: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" @@ -3365,20 +3411,20 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "vous ne pouvez pas utiliser une clé comme son propre révocateur\n" "désigné\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " @@ -3386,54 +3432,54 @@ msgstr "" "vous ne pouvez pas utiliser une clé comme son propre révocateur\n" "désigné\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sélections des clés secrètes.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sélectionner au plus une clé secondaire.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clé secondaire.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clé principale.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clés secret\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Vous devez sélectionner exactement un utilisateur.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clé secondaire avec l'index %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "nom d'utilisateur: «" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3442,7 +3488,7 @@ msgstr "" "»\n" "signé avec votre clé %08lX à %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3451,56 +3497,56 @@ msgstr "" "\"\n" "signé localement avec votre clé %08lX à %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Générer un certificat de révocation pour cette signature ? (o/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Vous avez signé ces noms d'utilisateurs:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " signé par %08lX à %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " révoqué par %08lX à %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Vous êtes sur le point de révoquer ces signatures:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " signé par %08lX à %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Créer réellement les certificats de révocation ? (o/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "pas de clé secrète\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Le nom d'utilisateur \"%s\" est déjà révoqué.\n" @@ -3509,71 +3555,71 @@ msgstr "Le nom d'utilisateur \"%s\" est #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Affichage %s photo d'identité de taille %ld pour la clé 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Politique de signature critique: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Politique de signature: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "ATTENTION: des données de notation invalides ont été détectées\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notation de signature critique: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notation de signature: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "illisible par un humain" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Porte-clés" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [expire: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Empreinte de clé principale:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Empreinte de la clé principale:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Empreinte de la clé =" @@ -3659,87 +3705,96 @@ msgstr "NOTE: l'expéditeur a demandé «po msgid "original file name='%.*s'\n" msgstr "nom de fichier original: '%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notation: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Politique: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "vérification de signature supprimée\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "le traitement de ces signatures multiples est impossible\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec une clé %s ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Pas d'aide disponible" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "MAUVAISE signature de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Signature expirée de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Bonne signature de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incertain]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "Signature %s de: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "principale" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "version inconnue" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossible de vérifier la signature: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "la signature n'est pas détachée\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" @@ -3747,16 +3802,16 @@ msgstr "" "première\n" "sera vérifiée.\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "signature autonome de classe 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide détecté dans proc_tree()\n" @@ -3785,78 +3840,83 @@ msgid "" msgstr "" "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: option déconseillée \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVERTISSEMENT: \"%s\" est une option déconseillée.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "utilisez \"%s%s\" à la place\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "ce message ne sera pas utilisable par %s\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "impossible de gérer l'algorithme à clé publique %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, 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" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent n'est pas disponible dans cette session\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "impossible d'obtenir le pid du client pour l'agent\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur de lecture du serveur\n" "pour l'agent\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur d'écriture du serveur pour l'agent\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "le protocole gpg-agent version %d n'est pas supporté\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter à `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problème de communication avec ssh-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problème avec l'agent - arrêt d'utilisation de l'agent\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID clé principale %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3868,32 +3928,32 @@ msgstr "" "\"%.*s\"\n" "clé %u bits %s, ID %08lX, créée %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Répétez le mot de passe\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Entrez le mot de passe\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "mot de passe trop long\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "réponse de l'agent invalide\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3903,20 +3963,20 @@ msgstr "" "Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n" "l'utilisateur: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clé de %u bits %s, ID %08lX, créée le %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "impossible de demander un mot de passe en mode automatique\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -4012,8 +4072,8 @@ msgid "failed sending to `%s': status=%u msgstr "l'envoi à `%s' a échoué: le résultat est %u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "ce serveur de clés n'est pas complètement compatible avec HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4053,11 +4113,11 @@ msgstr "" "génération de la somme de contrôle de 16 bits (dépréciée) pour protéger\n" "la clé secrète\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4066,20 +4126,20 @@ msgstr "" "clé %08lX: ceci est une clé ElGamal générée par PGP qui n'est PAS\n" "sûre pour les signatures !\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "" "la clé publique %08lX est plus récente de %lu seconde que la signature\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "" "la clé publique %08lX est plus récente de %lu secondes que la signature\n" # on s'amuse comme on peut... -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4088,7 +4148,7 @@ msgstr "" "la clé %08lX a été créée %lu seconde dans le futur (rupture\n" "spatio-temporelle ou problème d'horloge)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4097,56 +4157,61 @@ msgstr "" "la clé %08lX a été créée %lu secondes dans le futur (rupture\n" "spatio-temporelle ou problème d'horloge\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTE: la clé de signature %08lX a expiré le %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "la signature de la clé %08lX est supposée être fausse car un bit\n" "critique est inconnu\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "clé %08lX: pas de sous-clé pour le paquet de révocation de sous-clé\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "clé %08lX: pas de sous-clé pour relier la clé\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVERTISSEMENT: impossible de faire une expansion à base de %%\n" "(chaîne trop grande). Utilisation de la version non expansée.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4175,12 +4240,12 @@ msgstr "" "il n'est possible générer une signature détachée avec des clés de\n" "style PGP 2.x qu'en mode --pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "impossible de créer %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4197,7 +4262,7 @@ msgstr "" "il n'est possible de faire une signature en texte clair avec des clés\n" "de style PGP 2.x qu'en mode --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "le chiffrement %s sera utilisé\n" @@ -4212,12 +4277,12 @@ msgstr "impossible de traiter les lignes msgid "input line longer than %d characters\n" msgstr "la ligne d'entrée est plus longue que %d caractères\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -4227,124 +4292,124 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "transaction de base de confiance trop volumineuse\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: impossible d'accéder: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: le répertoire n'existe pas !\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: impossible de créer le verrouillage\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: impossible de créer le verrou\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossible de créer: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: impossible de créer un enregistrement de version: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: base de confiance invalide créée\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: base de confiance créée\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTE: la base de confiance n'a pas les permissions d'écriture\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de confiance invalide\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, 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:619 +#: g10/tdbio.c:622 #, 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:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, 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:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de confiance: «lseek()» a échoué: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, 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:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: enregistrement de version avec un numéro %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: version %d du fichier invalide\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, 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:1380 +#: g10/tdbio.c:1385 #, 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:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: impossible d'ajouter un enregistrement: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n" @@ -4395,39 +4460,39 @@ msgstr "enregistrement de confiance %lu, msgid "trustdb: sync failed: %s\n" msgstr "base de confiance: la synchronisation a échoué: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "vérification de la base de confiance inutile\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "vérifier la base de confiance\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "clé publique %08lX non trouvée : %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "la clé publique de la clé de confiace ultime %08lX est introuvable\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "la clé publique de la clé de confiace ultime %08lX est introuvable\n" @@ -4435,7 +4500,7 @@ msgstr "la clé publique de la clé de con #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4994,17 +5059,17 @@ msgstr "Réparez ce problème de sécurité msgid "checking keyring `%s'\n" msgstr "vérification du porte-clés `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu clés traitées jusqu'ici (%lu signatures)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu clés vérifiées (%lu signatures)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: porte-clés créé\n" @@ -5111,7 +5176,7 @@ msgstr "" "AVERTISSEMENT: impossible d'effacer le répertoire temporaire `%s':\n" "%s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "jamais " @@ -5208,33 +5273,33 @@ msgstr "" "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:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "choisissez la cause de la révocation:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Annuler" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Vous devriez sûrement sélectionner %d ici)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Cause de révocation: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Aucune description donnée)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Est-ce d'accord ? " @@ -5278,3 +5343,6 @@ msgstr "erreur pendant la recherche de l #, c-format msgid "read error: %s\n" msgstr "erreur de lecture: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "ce serveur de clés n'est pas complètement compatible avec HKP\n" diff -urpP gnupg-1.2.2/po/gl.po gnupg-1.2.3/po/gl.po --- gnupg-1.2.2/po/gl.po 2003-05-01 14:38:13.000000000 +0000 +++ gnupg-1.2.3/po/gl.po 2003-08-21 20:05:13.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-24 15:26+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -45,7 +45,7 @@ msgstr "non" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "abandonar" @@ -272,62 +272,62 @@ msgstr "... isto é un erro (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "atopou un erro ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "non se detectou un módulo de acumulación de entropía\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "non se puido abrir `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "non se puido facer stat sobre `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' non é un ficheiro normal - ignórase\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "nota: o ficheiro random_seed está baleiro\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "non se pode ler de `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "nota: o ficheiro random_seed non se actualiza\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "non se pode crear `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "non se pode escribir en `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "non se pode pechar `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: ¡¡emprégase un xerador de números aleatorios inseguro!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -359,6 +359,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "o algoritmo de resumo `%s' é de só lectura nesta versión\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -369,7 +374,7 @@ msgstr "" "pouco se iso evita que se aburra, que iso ha aumenta-la\n" "calidade da entropía.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -377,163 +382,163 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[ficheiro]|facer unha sinatura" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[ficheiro]|facer unha sinatura en texto claro" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "facer unha sinatura separada" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "cifrar datos" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[ficheiros]|cifrar ficheiros" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "cifrar só con cifrado simétrico" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "só armacenar" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "descifrar datos (por defecto)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[ficheiros]|descifrar ficheiros" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verificar unha sinatura" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "ve-la lista de chaves" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "ve-la lista de chaves e sinaturas" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "verifica-las sinaturas das chaves" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "ve-la lista de chaves e pegadas dactilares" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "ve-la lista de chaves secretas" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "xerar un novo par de chaves" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "borrar chaves do chaveiro público" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "borrar chaves do chaveiro secreto" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "asinar unha chave" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "asinar unha chave localmente" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "asinar unha chave de xeito non revocable" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "asinar unha chave localmente e de xeito non revocable" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "asinar ou editar unha chave" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "xerar un certificado de revocación" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportar chaves a un servidor de chaves" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importar chaves dun servidor de chaves" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "buscar chaves nun servidor de chaves" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "actualizar tódalas chaves dun servidor de chaves" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importar/mesturar chaves" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "listar só a secuencia de paquetes" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exporta-los valores de confianza no propietario" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importa-los valores de confianza no propietario" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "actualiza-la base de datos de confianza" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "actualización inatendida da base de datos de confianza" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "amañar unha base de datos de confianza corrompida" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Quita-la armadura a un ficheiro ou á entrada estándar" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Pór armadura a un ficheiro ou á entrada estándar" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [ficheiros]|visualizar resumos de mensaxes" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -543,153 +548,153 @@ msgstr "" "Opcións:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "crear saída con armadura en ascii" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifrar para NOME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOME|empregar NOME como valor por defecto do destinatario" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usa-la chave por defecto coma o destinatario por defecto" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "empregar este id de usuario para asinar ou descifrar" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usar modo de texto canónico" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "usar coma ficheiro de saída" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "lareto" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ser un pouquiño máis calado" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "non usa-la terminal en absoluto" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forzar sinaturas v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "non forzar sinaturas v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "forzar sinaturas de chave v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "non forzar sinaturas de chave v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "sempre usar un MDC para cifrar" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "nunca usar un MDC para cifrar" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "non facer ningún cambio" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "avisar antes de sobrescribir" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "emprega-lo gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "modo por lotes: non preguntar nunca" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "asumir `si' na maioría das preguntas" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "asumir `non' na maioría das preguntas" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "engadir este chaveiro á lista de chaveiros" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "engadir este chaveiro secreto á lista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "amosar en que chaveiro está unha chave listada" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|empregar NOME coma chave secreta por defecto" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|empregar este servidor de chaves para buscar chaves" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "le-las opcións dun ficheiro" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|DF|escribi-la información de estado a este DF" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[ficheiro]|escribi-la información de estado no ficheiro" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|IDCHAVE|confiar absolutamente nesta chave" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emula-lo modo descrito no RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "axustar tódalas opcións de paquetes, cifrado e resumo ao comportamento " "OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "axustar tódalas opcións de paquetes, cifrado e resumo ao comportamento PGP 2." @@ -735,7 +740,7 @@ msgstr "Non amosar Identificacións Fotog msgid "Set command line to view Photo IDs" msgstr "Estabrece-la liña de comando para ve-las Identificacións Fotográficas" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -743,7 +748,7 @@ msgstr "" "@\n" "(Vexa a páxina man para un listado completo de comandos e opcións)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -763,17 +768,17 @@ msgstr "" " --list-keys [nomes] amosa-las chaves\n" " --fingerprint [nomes] amosa-las pegadas dactilares\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Por favor, informe dos erros no programa a ,\n" "e dos erros na traducción a .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -783,7 +788,7 @@ msgstr "" "asinar, verificar, cifrar ou descifrar\n" "a operación por defecto depende dos datos de entrada\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -791,319 +796,353 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Pública: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compresión: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uso: gpg [opcións] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "comandos conflictivos\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "non se atopou un signo = na definición do grupo \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: propiedade insegura en %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros en %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opcións `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s non é para uso normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s non se admite con %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s non ten sentido empregándoo con %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 " "activado.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "esta mensaxe pode non ser utilizable por %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non é válido\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compresión debe estar entre %d e %d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe valer entre 1 e 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "preferencias por defecto non válidas\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non válidas\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non válidas\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresión personais non válidas\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "non se pode empregar %s no modo %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "non se pode empregar %s no modo %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "non se pode empregar %s no modo %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-de-usuario" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-de-usuario" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "non se puido abrir %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "A xeración da chave fallou: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "erro ao enumera-las chaves secretas: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "A xeración da chave fallou: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record fallou: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "erro ao enumera-las chaves secretas: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non válido `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[ficheiro]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Escriba a súa mensaxe ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "non se puido abrir `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1111,19 +1150,19 @@ msgstr "" "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe " "rematar en '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación non pode empregar ningún carácter de control\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "o URL de normativa de certificación dado non é válido\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" @@ -1264,7 +1303,7 @@ msgstr "" "Non se asignou un valor de confianza a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1321,7 +1360,7 @@ msgstr " o = omitir esta chave\n" msgid " q = quit\n" msgstr " s = saír\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "¿A súa decisión? " @@ -1499,91 +1538,91 @@ msgstr "%s: omitido: a chave pública est msgid "no valid addressees\n" msgstr "non hai enderezos válidos\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "a preferencia %c%lu non é válida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "preferencia %c%lu duplicada\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "demasiadas preferencias `%c'\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "escribindo unha sinatura directa\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "escribindo a propia sinatura\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "escribindo unha sinatura que liga a chave\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de chave non válido; empregando %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de chave redondeado a %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Por favor, seleccione o tipo de chave que quere:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA e ElGamal (por defecto)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (só asinar)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (só cifrar)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (asinar e cifrar)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (só asinar)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (asinar e cifrar)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "¿A súa selección? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1593,15 +1632,15 @@ msgstr "" "esta clave para se comunicar con usuarios de PGP. Este algoritmo tamén é\n" "moi lento, e pode non ser tan seguro coma as outras opcións.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "¿Crear de tódolos xeitos? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Selección non válida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1614,19 +1653,19 @@ msgstr "" " tamaño de chave por defecto: 1024 bits\n" " tamaño de chave máximo recomendado: 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "¿Qué tamaño de chave quere? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA só admite tamaños entre 512 e 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "chave pequena de máis; 1024 é o menor valor admitido para RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "chave pequena de máis; 768 é o menor valor admitido\n" @@ -1638,12 +1677,12 @@ msgstr "chave pequena de máis; 768 é o m #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "chave grande de máis; %d é o maior tamaño admitido.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1651,11 +1690,11 @@ msgstr "" "¡As chaves maiores de 2048 bits non se aconsellan porque\n" "os cálculos levan MOITO tempo!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "¿Está seguro de que quere este tamaño de chave? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1663,17 +1702,17 @@ msgstr "" "De acordo, ¡pero teña en conta que a radiación do monitor e o teclado tamén " "son vulnerables a ataques!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamaño de chave requerido son %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "redondeado a %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1689,7 +1728,7 @@ msgstr "" " m = a chave caduca en n meses\n" " y = a chave caduca en n anos\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1705,30 +1744,30 @@ msgstr "" " m = a sinatura caduca en n meses\n" " y = a sinatura caduca en n anos\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "¿Por canto tempo é válida a chave? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "¿Por canto tempo é válida a sinatura? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valor non válido\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s non caduca nunca\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca o %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1736,11 +1775,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "¿Isto é correcto? (s/n) " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1756,44 +1795,44 @@ msgstr "" " \"Heinrich Heime (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nome: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Caracter non válido no nome\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "O nome non pode comezar cun díxito\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "O nome debe ter alomenos 5 caracteres\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Enderezo de E-mail: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Non é un enderezo de e-mail válido\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Carácter non válido no comentario\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está a usa-lo xogo de caracteres `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1804,28 +1843,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor, non poña o enderezo de correo no nome real ou no comentario\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeAaSs" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Por favor, corrixa antes o erro\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1833,16 +1872,16 @@ msgstr "" "Necesita un contrasinal para protexe-la súa chave secreta.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1854,7 +1893,7 @@ msgstr "" "momento, empregando este programa coa opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1866,53 +1905,53 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "O par de chaves DSA ha ter 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Cancelouse a xeración de chaves.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "gravando a chave pública en `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, 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:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro escribindo no chaveiro público `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro escribindo no chaveiro secreto `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 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:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "chave marcada coma de confianza absoluta.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1921,12 +1960,12 @@ msgstr "" "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n" "con esa finalidade.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1934,7 +1973,7 @@ msgstr "" "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1942,25 +1981,25 @@ msgstr "" "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "¿Crear realmente? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output non traballa con este comando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: non se pode abrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro ao crea-lo contrasinal: %s\n" @@ -1969,17 +2008,17 @@ msgstr "erro ao crea-lo contrasinal: %s\ msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "non se pode empregar un paquete simétrico ESK debido ao modo S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' xa está comprimido\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVISO: ficheiro baleiro\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "só pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n" @@ -1995,7 +2034,7 @@ msgstr "" "non se puido emprega-la cifra IDEA para tódalas chaves ás que está a " "cifrar.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2013,440 +2052,430 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s cifrado para: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "erro ao le-lo bloque de chaves: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chave %08lX: non é unha chave rfc2440 - omitida\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "chave %08lX: non está protexida - omitida\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "AVISO: non se exportou nada\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "demasiadas entradas na caché de chaves públicas - desactivada\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Non se atopou o id de usuario]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "¡hai unha chave secreta para a chave pública \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sen chave pública - omitida\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "pasando por alto un bloque de tipo %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves procesadas hasta polo momento\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "erro lendo `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total procesado: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr "novas chaves omitidas: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sin IDs de usuario: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importadas: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " sin cambios: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuario: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " novas sub-chaves: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " novas sinaturas: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revocacións de chaves: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr "chaves secretas lidas: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "chaves secretas importadas: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chaves secretas sin cambios: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " non importadas: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTA: Detectouse unha clave primaria Elgamal - ha tomar algún tempo " "importala\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "chave %08lX: non hai ID de usuario\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "chave %08lX: non hai IDs de usuario válidos\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por unha auto-sinatura que falta\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chave %08lX: chave pública non atopada: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "chave %08lX: nova chave - omitida\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "non se atopou un chaveiro no que se poida escribir: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "escribindo a `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro escribindo no chaveiro `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública \"%s\" importada\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chave %08lX: non coincide coa nosa copia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n" "%s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" "chave %08lX: non foi posible le-lo bloque de chaves original:\n" "%s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "chave %08lX: \"%s\" 1 nova sinatura\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "chave %08lX: \"%s\" %d novas sinaturas\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "chave %08lX: \"%s\" sen cambios\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "non hai un chaveiro privado por defecto: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chave %08lX: xa estaba no chaveiro secreto\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chave %08lX: chave secreta non atopada: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: non hai chave pública - non se pode aplica-lo\n" "certificado de revocación\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" "chave %08lX: certificado de revocación incorrecto:\n" "%s - rechazado\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: \"%s\" certificado de revocación importado\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "chave %08lX: non hai ID de usuario para a sinatura\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s" "\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "" "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública non soportado\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chave %08lX: ligazón de sub-chave incorrecta\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "chave %08lX: revocación de sub-chave non válida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "chave %08lX: omitido o ID de usuario '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chave %08lX: omitida a sub-chave\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX " "ausente.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n" @@ -2459,29 +2488,29 @@ msgstr "[revocación]" msgid "[self-signature]" msgstr "[auto-sinatura]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 sinatura errónea\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d sinaturas erróneas\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 sinatura non verificada debido a unha chave que falta\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d sinaturas non verificadas debido a chaves que faltan\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 sinatura non verificada debido a un erro\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d sinaturas non verificadas debido a erros\n" @@ -2500,20 +2529,27 @@ msgstr "detectados %d IDs de usuario sin msgid "User ID \"%s\" is revoked." msgstr "O ID de usuario \"%s\" está revocado." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Está seguro de que quere asinalo? (s/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Non se puido asinar.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "O ID de usuario \"%s\" está revocado." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "AVISO: o ID de usuario \"%s\" non está asinado por el mesmo.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2522,11 +2558,11 @@ msgstr "" "A auto-sinatura de \"%s\"\n" "é unha sinatura tipo PGP 2.x\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "¿Quere promovela a unha auto-sinatura OpenPGP? (s/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2535,13 +2571,13 @@ msgstr "" "A súa sinatura actual en \"%s\"\n" "caducou.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "¿Quere emitir unha nova sinatura que substitúa á caducada? (s/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2550,54 +2586,54 @@ msgstr "" "A súa sinatura actual en \"%s\"\n" "é unha sinatura local.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" xa estaba asinado coa chave %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "¿Quere asinalo outra vez de tódolos xeitos? (s/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada que asinar coa chave %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "¡Esta chave caducou!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Esta chave ha caducar o %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Isto podería face-la chave non utilizable en PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2606,31 +2642,35 @@ msgstr "" "¿Con canto tino comprobou que a chave que vai asinar realmente pertence á\n" "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Non hei respostar.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (por defecto)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Non o comprobei en absoluto.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Fixen algunhas comprobacións.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Fixen comprobacións moi exhaustivas.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2638,7 +2678,7 @@ msgstr "" "¿Esta seguro de que quere asinar esta chave\n" "coa súa chave: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2646,7 +2686,7 @@ msgstr "" "\n" "Esta ha ser unha auto-sinatura.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2654,7 +2694,7 @@ msgstr "" "\n" "AVISO: a sinatura non se ha marcar coma non exportable.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2662,7 +2702,7 @@ msgstr "" "\n" "AVISO: A sinatura non se ha marcar coma non revocable.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2670,7 +2710,7 @@ msgstr "" "\n" "A sinatura hase marcar coma non exportable.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2678,7 +2718,7 @@ msgstr "" "\n" "A sinatura hase marcar coma non revocable.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2686,7 +2726,7 @@ msgstr "" "\n" "Non se comprobou esta chave en absoluto.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2694,7 +2734,7 @@ msgstr "" "\n" "Comprobouse esta chave de xeito informal.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2702,34 +2742,34 @@ msgstr "" "\n" "Comprobouse esta chave con moito tino.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "¿Asinar de verdade? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "fallou a sinatura: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Esta chave non está protexida.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "A chave está protexida.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Non se pode editar esta chave: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2737,7 +2777,7 @@ msgstr "" "Introduza o novo contrasinal para esta chave secreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2745,495 +2785,495 @@ msgstr "" "Non desexa un contrainal - ¡o que é unha *mala* idea!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "¿Seguro que quere facer esto? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "movendo a sinatura dunha chave ó seu sitio\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "saír deste menú" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "s" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "gardar" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "gardar e saír" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "axuda" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "amosar esta axuda" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "amosar fingerprint" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "listar" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "listar chave e IDs de usuario" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "selecciona-lo ID de usuario N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "chave" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "selecciona-la chave secundaria N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "verificar" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "listar sinaturas" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "v" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "asina-la chave" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "f" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "asina-la chave localmente" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "asina-la chave de xeito non revocable" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "asina-la chave localmente e de xeito non revocable" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "depurar" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "engadir un ID de usuario" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "engadir unha identificación fotográfica" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "borrar un ID de usuario" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "engadir unha chave secundaria" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "borrar unha chave secundaria" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "engadir unha chave de revocación" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "borrar sinaturas" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "cambia-la fecha de expiración" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "marcar un ID de usuario coma primario" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "cambiar entre o listado de chaves públicas e secretas" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "c" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "lista-las preferencias (expertos)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "lista-las preferencias (moitos datos)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "estabrece-la lista de preferencias" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "cambia-lo contrasinal" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "cambia-la confianza sobre o dono" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revocar sinaturas" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revocar un ID de usuario" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revocar unha chave secundaria" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "deshabilitar unha chave" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "habilitar unha chave" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "amosa-la identificación fotográfica" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "non se pode facer iso no modo por lotes\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "A chave secreta está disponible.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Cómpre a chave secreta para facer isto.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor, empregue o comando \"toggle\" antes.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "A chave está revocada." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Non se admite este comando no modo %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar alomenos un ID de usuario.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "¡Non pode borra-lo último ID de usuario!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "¿Seguro de que quere borrar este ID de usuario? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Debe seleccionar alomenos unha chave.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "¿Seguro de que quere borra-las chaves seleccionadas? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "¿Seguro de que quere borrar esta chave? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "¿Seguro de que quere revocar este ID de usuario? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "¿Realmente quere revoca-las chaves seleccionadas? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "¿Realmente quere revocar esta chave? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "¿Seguro que quere actualiza-las preferencias dos IDs de usuario " "seleccionados? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "¿Realmente desexa actualiza-las preferencias? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "¿Garda-los cambios? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "¿Saír sin gardar? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "a actualización fallou: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "o segredo da actualización fallou: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "A chave non cambiou, polo que non fai falla actualizar.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Resumo: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Esta chave pode estar revocada por %s chave " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensible)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX creada: %s caduca: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " confianza: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Esta chave está desactivada" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! revocouse a subchave: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- atopouse unha revocación falsa\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problema ao comproba-la revocación: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3241,7 +3281,13 @@ msgstr "" "Teña en conta que a validez da chave amosada non é necesariamente\n" "correcta a menos que reinicie o programa.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3250,47 +3296,47 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de que quere engadila? (s/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta sinatura correcta? (s/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Borrada %d sinatura.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Borradas %d sinaturas.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Non se borrou nada.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3300,16 +3346,16 @@ msgstr "" "designado\n" " pode facer que algunhas versións de PGP rexeiten esta chave.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Introduza o ID de usuario do revocador designado: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" @@ -3317,69 +3363,69 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite as seleccións das chaves secretas.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo unha chave secundaria.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando a data de expiración para a chave secundaria.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando a data de expiración da chave primaria.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Escolla exactamente un ID de usuario.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Non hai chave secundaria con índice %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3388,7 +3434,7 @@ msgstr "" "\"\n" "asinado coa súa chave %08lX no %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3397,56 +3443,56 @@ msgstr "" "\"\n" "asinado localmente coa súa chave %08lX no %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿Está seguro de que quere revocala? (s/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " asinada por %08lX no %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revocada por %08lX no %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Está a punto de revocar estas sinaturas:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " asinada por %08lX no %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (non exportable)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "non hai chave secreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" @@ -3455,70 +3501,70 @@ msgstr "o ID de usuario \"%s\" xa está r #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Normativa de sinaturas críticas: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Normativa de sinaturas: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "AVISO: atopáronse datos de notación non válidos\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notación de sinaturas críticas: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notación de sinaturas: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "non lexible por humanos" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Chaveiro" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [caduca: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Pegada dactilar =" @@ -3602,102 +3648,111 @@ msgstr "NOTA: o remitente pediu \"confid msgid "original file name='%.*s'\n" msgstr "nome do ficheiro orixinal='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notación: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Normativa: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verificación de sinatura suprimida\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "non se poden manexar estas sinaturas múltiples\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Asinada o %.*s usando %s coa chave de ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Non hai axuda dispoñible" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Sinatura INCORRECTA de\"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Sinatura caducada de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Sinatura correcta de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incerto]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "Sinatura %s de: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "versión descoñecida" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Non foi posible verifica-la sinatura: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "non é unha sinatura separada\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "sinatura independiente de clase 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "Sinatura ó vello estilo (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz incorrecto detectado en proc_tree()\n" @@ -3726,75 +3781,80 @@ msgid "" msgstr "" "mire en http://www.gnupg.org/why-not-idea.html para obter máis información\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opción a extinguir \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: \"%s\" é unha opción a extinguir\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "empregue \"%s%s\" no seu canto\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "esta mensaxe pode non ser utilizable por %s\n" + +#: g10/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, 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" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non está dispoñible nesta sesión\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "non se pode estabrece-lo pid do cliente para o axente\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versión %d do protocolo de gpg-agent non está soportada\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "non se puido conectar a `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3805,32 +3865,32 @@ msgstr "" "\"%.*s\"\n" "Chave de %u bits, %s, ID %08lX, creada o %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Repita o contrasinal\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Introduza o contrasinal\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "contrasinal demasiado longo\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "resposta do axente non válida\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3840,20 +3900,20 @@ msgstr "" "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -3945,8 +4005,8 @@ msgid "failed sending to `%s': status=%u msgstr "fallo ao enviar a `%s': estado=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "este servidor de chaves non é totalmente compatible con HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3988,11 +4048,11 @@ msgstr "" "xerando o checksum de 16-bits a extinguir para a protección da chave " "secreta\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4001,17 +4061,17 @@ msgstr "" "chave %08lX: ¡esta é unha chave ElGamal xerada por PGP que NON é xegura para " "sinaturas!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4020,7 +4080,7 @@ msgstr "" "creouse a chave %08lX %lu segundo no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4029,55 +4089,60 @@ msgstr "" "creouse a chave %08lX %lu segundos no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "chave %08lX: non hai unha sub-chave para o paquete de a revocación de " "subchave\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVISO: non se pode expandir-%% a notación (grande de máis). Úsase sen " "expandir.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4104,12 +4169,12 @@ msgstr "" "só pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --" "pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "non foi posible crear %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4123,7 +4188,7 @@ msgstr "asinando:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "hase empregar cifrado %s\n" @@ -4138,12 +4203,12 @@ msgstr "non é posible manexar liñas de t msgid "input line longer than %d characters\n" msgstr "a liña de entrada contén máis de %d caracteres\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -4153,122 +4218,122 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "transacción da base de datos de confianza demasiado grande\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: non é posible acceder: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: ¡o directorio non existe!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: non se pode crea-lo bloqueo\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: non se pode bloquear\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: non se pode crear: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: non se puido crea-lo rexistro de versión: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: creouse unha base de datos de confianza incorrecta\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: creouse a base de datos de confianza\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: non se pode escribir na base de datos de confianza\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de datos de confianza non válida\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: fallo ao crear unha táboa hash: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, 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:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, 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:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de datos de confianza: lseek fallou: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: non é un ficheiro de base de datos de confianza\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, 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:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versión do ficheiro incorrecta %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro ao ler un rexistro libre: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: non se puido engadir un rexistro: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb" @@ -4320,39 +4385,39 @@ msgstr "rexistro de confianza %lu, tipo msgid "trustdb: sync failed: %s\n" msgstr "base de datos de confianza: fallou a sincronización: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "comprobando a base de datos de confianza\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "non se atopou a chave pública %08lX: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n" @@ -4360,7 +4425,7 @@ msgstr "non se atopou a chave pública da #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4912,17 +4977,17 @@ msgstr "Por favor, amañe este posible fa msgid "checking keyring `%s'\n" msgstr "comprobando o chaveiro `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu chaves comprobadas ata o momento (%lu sinaturas)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu chaves comprobadas (%lu sinaturas)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: chaveiro creado\n" @@ -5024,7 +5089,7 @@ msgstr "AVISO: non se puido borra-lo fic msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "nunca " @@ -5119,33 +5184,33 @@ msgstr "" "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:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Por favor, escolla o motivo da revocación:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Cancelar" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(probablemente queira seleccionar %d aquí)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Motivo para a revocación: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Non se deu unha descrición)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "¿É correcto? " @@ -5190,6 +5255,9 @@ msgstr "erro ao buscar un rexistro de co msgid "read error: %s\n" msgstr "erro de lectura: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "este servidor de chaves non é totalmente compatible con HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "Este algoritmo está obsoleto - ¿crear de tódolos xeitos? " @@ -5349,9 +5417,6 @@ msgstr "erro de lectura: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "erro ao le-la chave primaria para o LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record fallou: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "chave %08lX: a consulta do rexistro fallou\n" @@ -5364,9 +5429,6 @@ msgstr "erro de lectura: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "chave %08lX: as chaves secreta e pública non coinciden\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "erro ao enumera-las chaves secretas: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "chave %08lX.%lu: Ligadura de subchave correcta\n" diff -urpP gnupg-1.2.2/po/gnupg.pot gnupg-1.2.3/po/gnupg.pot --- gnupg-1.2.2/po/gnupg.pot 2003-05-01 11:05:53.000000000 +0000 +++ gnupg-1.2.3/po/gnupg.pot 2003-08-21 16:22:32.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "" msgid "nN" msgstr "" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "" @@ -274,62 +274,62 @@ msgstr "" msgid "you found a bug ... (%s:%d)\n" msgstr "" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -351,6 +351,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -358,320 +363,320 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " msgstr "" -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" " " msgstr "" -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" @@ -715,13 +720,13 @@ msgstr "" msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -733,354 +738,388 @@ msgid "" " --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "" -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, c-format +msgid "keyserver send failed: %s\n" +msgstr "" + +#: g10/g10.c:2341 +#, c-format +msgid "keyserver receive failed: %s\n" +msgstr "" + +#: g10/g10.c:2343 +#, c-format +msgid "key export failed: %s\n" +msgstr "" + +#: g10/g10.c:2355 +#, c-format +msgid "keyserver search failed: %s\n" +msgstr "" + +#: g10/g10.c:2365 +#, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "" @@ -1215,7 +1254,7 @@ msgid "" "%4u%c/%08lX %s \"" msgstr "" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr "" @@ -1269,7 +1308,7 @@ msgstr "" msgid " q = quit\n" msgstr "" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "" @@ -1434,106 +1473,106 @@ msgstr "" msgid "no valid addressees\n" msgstr "" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr "" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr "" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr "" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr "" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr "" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr "" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr "" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "" -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "" -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1542,19 +1581,19 @@ msgid "" " highest suggested keysize is 2048 bits\n" msgstr "" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "" -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" @@ -1566,38 +1605,38 @@ msgstr "" #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "" -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" msgstr "" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1607,7 +1646,7 @@ msgid "" " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1617,40 +1656,40 @@ msgid "" " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "" -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "" -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "" -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1660,44 +1699,44 @@ msgid "" "\n" msgstr "" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "" -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "" -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "" -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1705,42 +1744,42 @@ msgid "" "\n" msgstr "" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "" -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1748,7 +1787,7 @@ msgid "" "\n" msgstr "" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1756,94 +1795,94 @@ msgid "" "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "" -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "" @@ -1852,17 +1891,17 @@ msgstr "" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" @@ -1876,7 +1915,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -1891,422 +1930,412 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr "" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr "" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr "" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr "" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "" @@ -2319,29 +2348,29 @@ msgstr "" msgid "[self-signature]" msgstr "" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "" @@ -2360,901 +2389,918 @@ msgstr "" msgid "User ID \"%s\" is revoked." msgstr "" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "" -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "" #: g10/keyedit.c:382 #, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +msgid "User ID \"%s\" is expired." msgstr "" -#: g10/keyedit.c:401 +#: g10/keyedit.c:402 +#, c-format +msgid "User ID \"%s\" is not self-signed." +msgstr "" + +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "" -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr "" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr "" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr "" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" msgstr "" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" msgstr "" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" msgstr "" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" msgstr "" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" msgstr "" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "" -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "" -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "" -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "" -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "" -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "" -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "" -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "" -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "" -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "" -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "" -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "" -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 msgid "[revoked] " msgstr "" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 msgid "[expired] " msgstr "" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" "locally signed with your key %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr "" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr "" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr "" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" @@ -3263,68 +3309,68 @@ msgstr "" #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "" -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "" -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "" -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr "" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr "" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr "" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr "" @@ -3408,99 +3454,107 @@ msgstr "" msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "" -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "" -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +msgid "Key available at: " +msgstr "" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, c-format msgid "Signature expired %s\n" msgstr "" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, c-format msgid "Signature expires %s\n" msgstr "" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 msgid "binary" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "unknown" msgstr "" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -3526,75 +3580,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr "" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3602,52 +3661,52 @@ msgid "" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "" @@ -3739,7 +3798,7 @@ msgid "failed sending to `%s': status=%u msgstr "" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" +msgid "this keyserver does not support --search-keys\n" msgstr "" #: g10/hkp.c:519 @@ -3778,78 +3837,83 @@ msgstr "" msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " "signatures!\n" msgstr "" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " "problem)\n" msgstr "" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " "problem)\n" msgstr "" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -3874,12 +3938,12 @@ msgstr "" msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -3892,7 +3956,7 @@ msgstr "" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "" @@ -3907,12 +3971,12 @@ msgstr "" msgid "input line longer than %d characters\n" msgstr "" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" @@ -3921,122 +3985,122 @@ msgstr "" msgid "trustdb transaction too large\n" msgstr "" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" @@ -4085,38 +4149,38 @@ msgstr "" msgid "trustdb: sync failed: %s\n" msgstr "" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4124,7 +4188,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4559,17 +4623,17 @@ msgstr "" msgid "checking keyring `%s'\n" msgstr "" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "" @@ -4661,7 +4725,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -4749,33 +4813,33 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "" diff -urpP gnupg-1.2.2/po/hu.po gnupg-1.2.3/po/hu.po --- gnupg-1.2.2/po/hu.po 2003-05-01 14:38:15.000000000 +0000 +++ gnupg-1.2.3/po/hu.po 2003-08-21 20:05:15.000000000 +0000 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-24 23:12+0200\n" +"Project-Id-Version: gnupg 1.2.3\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-07-31 23:11+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Nagy Ferenc László \n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgstr "nem" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "kilépés" @@ -272,63 +272,63 @@ msgstr "Ez egy programhiba... (%s:%d:%s) msgid "you found a bug ... (%s:%d)\n" msgstr "Talált egy programhibát... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "Nem észleltem entrópiagyûjtõ modult.\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "Nem tudom a stat mûveletet elvégezni a(z) \"%s\" állományon: %s.\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "\"%s\" nem szabályos állomány. Figyelmen kívül hagyom.\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "" "Megjegyzés: random_seed állomány (véletlenszám-generátor állapota) üres.\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "FIGYELEM: Érvénytelen méretû random_seed állomány. Nem használom.\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "Nem tudom olvasni a(z) \"%s\" állományt: %s.\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "Megjegyzés: random_seed állományt nem frissítettem.\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "Nem tudom írni a(z) \"%s\" állományt: %s.\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "FIGYELEM: Nem biztonságos véletlenszám-generátort használok!!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -358,6 +358,13 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "\"%s\" kivonatoló algoritmus csak olvasható ebben a kiadásban\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" +"FIGYELEM: \"%s\" kivonatoló algoritmus nem része az OpenPGP-nek. Csak saját " +"felelõsségére használja!\n" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -367,7 +374,7 @@ msgstr "" "Kérem, várjon, entrópiát gyûjtök! Vagy inkább csináljon közben valamit\n" "a gépen, az az entrópiám minõségét is javítani fogja!\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -375,163 +382,163 @@ msgstr "" "@Parancsok:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[fájl]|aláírás készítése" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[fájl]|olvasható szöveg aláírása" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "különálló aláírás készítése" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "adat titkosítása" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[fájlok]|állományok titkosítása" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "titkosítás csak szimmetrikus rejtjelezõvel" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "csak tárolás" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "adat visszafejtése (alapértelmezés)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[fájlok]|állományok visszafejtése" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "aláírás ellenõrzése" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "kulcsok listázása" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "kulcsok és aláírások listázása" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "kulcsaláírások ellenõrzése" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "kulcsok és ujjlenyomatok listázása" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "titkos kulcsok listázása" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "új kulcspár létrehozása" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "kulcsok eltávolítása a titkoskulcs-karikáról" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "kulcs aláírása" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "kulcs aláírása helyileg" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "kulcs aláírása visszavonhatatlanul" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "kulcs aláírása helyileg és visszavonhatatlanul" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "kulcs aláírása vagy szerkesztése" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "visszavonási igazolás készítése" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "kulcsok exportálása" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "kulcsok exportálása kulcsszerverre" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "kulcsok importálása kulcsszerverrõl" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "kulcsok keresése kulcsszerveren" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "minden kulcs frissítése kulcsszerverrõl" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "kulcsok importálása/összefûzése" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "csak a csomagok listázása" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "bizalmi értékek exportja" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "bizalmi értékek importja" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "bizalmi adatbázis frissítése" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "bizalmi adatbázis frissítése felügyelet nélkül" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "sérült bizalmi adatbázis kijavítása" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "páncél eltávolítása állományról vagy bemenetrõl" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "állomány vagy bemenet páncélozása" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [fájlok]|üzenet kivonatának kiírása" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -541,151 +548,151 @@ msgstr "" "Opciók:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "ascii páncélozott kimenet létrehozása" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NÉV|titkosítás NÉV részére" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NÉV|NÉV használata alapértelmezett címzettként" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "alapért. kulcs haszn. alapért. címzettként" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "felh. azonosító aláíráshoz és visszafejtéshez" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "kanonikus szöveges mód használata" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "kimeneti állomány megadása" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "bõbeszédû mód" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "még szûkszavúbb mód" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "ne használja a terminált egyáltalán" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "3-as verziójú aláírások erõltetése" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "ne erõltesse a 3-as verziójú aláírásokat" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "4-es verziójú aláírások erõltetése" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "ne erõltesse a 4-es verziójú aláírásokat" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "mindig használjon MDC-t titkosításkor" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "soha ne használjon MDC-t titkosításkor" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "ne csináljon semmi változtatást" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "felülírás elõtt rákérdezés" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "gpg ügynök használata" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "kötegelt mód: soha nem kérdez" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "igen válasz feltételezése a legtöbb kérdésre" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "nem válasz feltételezése a legtöbb kérdésre" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "kulcskarika hozzáadása a kulcskarikalistához" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "titkoskulcs-karika hozzáadása a listához" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "mutatja a kilistázott kulcs kulcskarikáját is" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NÉV|terminál karakterkódolásának megadása" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "opciók beolvasása állományból" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[fájl]|állapotinformációk állományba írása" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KULCS|alapvetõen megbízunk ebben a kulcsban" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|fájl|bõvítõ modul betöltése" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "RFC1991-ben leírt mód emulációja" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "opciók OpenPGP módra állítása" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "opciók PGP 2.x módra állítása" @@ -729,7 +736,7 @@ msgstr "ne mutassa a fotóazonosítókat" msgid "Set command line to view Photo IDs" msgstr "parancssor állítása fotóazonosítók megnézéséhez" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -737,7 +744,7 @@ msgstr "" "@\n" "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -757,17 +764,17 @@ msgstr "" " --list-keys [nevek] kulcsok kiíratása\n" " --fingerprint [nevek] ujjlenyomatok kiíratása\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "A hibákat (angolul) a címre írja meg!\n" "Fordítással kapcsolatban az címre írjon!\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -777,7 +784,7 @@ msgstr "" "Aláírás, ellenõrzés, titkosítás vagy visszafejtés.\n" "Az alapértelmezett mûvelet a bemeneti adattól függ.\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -785,316 +792,352 @@ msgstr "" "\n" "Támogatott algoritmusok:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Nyilvános kulcsú (pubkey): " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Rejtjelezõ (cipher): " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Kivonatoló (hash): " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Tömörítõ (compression): " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "Használat: gpg [opciók] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "\"%s\" opciós fájl: %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "A \"%s\" rejtjelezõ bõvítést rossz engedélyek miatt töltöm be.\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core állományt hozhat létre!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hatástalanítja %s-t!\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s és %s nem használható együtt!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s értelmetlen %s mellett!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "Csak különálló és olvashatószöveg-aláírást készíthet --pgp2 módban!\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Nem írhat alá és titkosíthat egyszerre --pgp2 módban!\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Csak állományokat (pipe-ot nem) használhat --pgp2 módban!\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Üzenet titkosítása --pgp2 módban IDEA rejtjelezõt igényel!\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, 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/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "A tömörítõalgoritmus száma %d és %d közé kell essen!\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-nál!\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-nél!\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth 1 és 255 közé kell essen!\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "Érvénytelen default-check-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "Érvénytelen alapértelmezett preferenciák!\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "Érvénytelen személyes kivonatolópreferenciák!\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "Érvénytelen személyes tömörítõpreferenciák!\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" +"Lehet, hogy nem használhatja \"%s\" rejtjelezõ algoritmust %s módban!\n" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" +"Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "Lehet, hogy nem használhatja \"%s\" tömörítõ algoritmust %s módban!\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [fájlnév]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [fájlnév]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [fájlnév]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [fájlnév]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [fájlnév]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [fájlnév]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [fájlnév]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key felh-azonosító" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonosító" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key felh-azonosító" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key felh-azonosító" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonosító [parancsok]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "Nem tudom megnyitni %s-t: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, c-format +msgid "keyserver send failed: %s\n" +msgstr "Küldés a kulcsszerverre sikertelen: %s\n" + +#: g10/g10.c:2341 +#, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" + +#: g10/g10.c:2343 +#, c-format +msgid "key export failed: %s\n" +msgstr "Kulcsexportálás sikertelen: %s\n" + +#: g10/g10.c:2355 +#, c-format +msgid "keyserver search failed: %s\n" +msgstr "Keresés a kulcsszerveren sikertelen: %s\n" + +#: g10/g10.c:2365 +#, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "Páncél eltávolítása nem sikerült: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Érvénytelen kivonatoló algoritmus: %s\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[fájlnév]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Kezdheti gépelni az üzenetet...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "Nem tudom megnyitni %s-t!\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1102,19 +1145,19 @@ msgstr "" "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = " "jellel kell befejezõdjön.\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "Egy jelölés értékében nem szerepelhet vezérlõkarakter!\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" @@ -1254,7 +1297,7 @@ msgstr "" "Nincs megbízhatósági érték rendelve:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " azaz \"" @@ -1312,7 +1355,7 @@ msgstr " h = kulcs kihagyása\n" msgid " q = quit\n" msgstr " k = kilépés\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Mit választ? " @@ -1490,91 +1533,91 @@ msgstr "%s: Kihagyva: Nyilvános kulcs ni msgid "no valid addressees\n" msgstr "Nincsenek érvényes címzettek!\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "%c%lu preferencia érvénytelen!\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "%c%lu preferencia kétszer szerepel!\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "Túl sok \"%c\" preferencia.\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "Sima aláírást írok.\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "Önaláírást írok.\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "Összefûzõ aláírást írok.\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Kulcsméret érvénytelen; %u bitet használok.\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Kulcsméretet felkerekítettem %u bitre.\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Kérem, adja meg, milyen kulcsot kíván:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA és ElGamal (alapértelmezés)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (csak aláírás)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (csak titkosítás)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (aláírás és titkosítás)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (csak aláírás)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (aláírás és titkosítás)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Mit választ? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1585,15 +1628,15 @@ msgstr "" "ez az algoritmus nagyon lassú, és talán nem is olyan biztonságos, mint\n" "a többi választható.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Mégis létrehozzam? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Érvénytelen választás.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1606,19 +1649,19 @@ msgstr "" " alapértelmezett kulcsméret: 1024 bit\n" " legnagyobb ajánlott kulcsméret: 2048 bit\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Milyen kulcsméretet szeretne? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "A DSA csak 512 és 1024 közötti kulcsméretet támogat.\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "Kulcsméret túl kicsi; 1024 a legkisebb megengedett érték RSA-hoz.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "Kulcsméret túl kicsi; 768 a legkisebb megengedett érték.\n" @@ -1630,12 +1673,12 @@ msgstr "Kulcsméret túl kicsi; 768 a legk #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "Kulcsméret túl nagy; %d a legnagyobb megengedett érték.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1643,11 +1686,11 @@ msgstr "" "2048-nál nagyobb kulcsméret nem ajánlott, mert a számítások\n" "NAGYON sokáig fognak tartani!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Biztos benne, hogy akarja ezt a kulcsméretet? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1655,17 +1698,17 @@ msgstr "" "Rendben, de vegye figyelembe, hogy a támadók a monitorának vagy\n" "a billentyûzetének a sugárzását is felhasználhatják!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "A kívánt kulcsméret %u bit.\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "Felkerekítve %u bitre.\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1681,7 +1724,7 @@ msgstr "" " m = a kulcs n hónapig érvényes\n" " y = a kulcs n évig érvényes\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1697,30 +1740,30 @@ msgstr "" " m = az aláírás n hónapig érvényes\n" " y = az aláírás n évig érvényes\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Meddig érvényes a kulcs? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Meddig érvényes az aláírás? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "Érvénytelen érték!\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s soha nem jár le.\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s lejár: %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1728,11 +1771,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Ez így helyes (i/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1748,44 +1791,44 @@ msgstr "" " \"Heinrich Heine (a költõ) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Teljes név: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Érvénytelen karakter a névben!\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "A név lehet, hogy nem kezdõdhet számmal!\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "A név legalább 5 karakter kell legyen!\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-mail cím: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Ez nem érvényes e-mail cím.\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Megjegyzés: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Érvénytelen karakter a megjegyzésben!\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, 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:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1796,28 +1839,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnMmEeRrKk" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "(N)év, (M)egjegyzés, (E)-mail megváltozatása vagy (K)ilépés? " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "(N)év, (M)egjegyzés, (E)-mail megváltozatása vagy (R)endben/(K)ilépés? " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Kérem, elõbb javítsa ki a hibát!\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1825,16 +1868,16 @@ msgstr "" "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1846,7 +1889,7 @@ msgstr "" "az \"--edit-key\" opcióval.\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1858,53 +1901,53 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "A DSA kulcspár 1024 bites lesz.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Kulcs létrehozása megszakítva.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "Írom a kulcsot a %s állományba.\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "Nem írható titkoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 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:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "A kulcsot alapvetõen megbízhatónak jelöltem.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1913,45 +1956,45 @@ msgstr "" "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n" "teheti meg.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, 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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, 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:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Valóban létrehozzam? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s-t nem tudom megnyitni: %s.\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "Hiba a jelszó létrehozásakor: %s.\n" @@ -1960,17 +2003,17 @@ msgstr "Hiba a jelszó létrehozásakor: %s msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "\"%s\" már tömörített.\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "FIGYELEM: \"%s\" üres állomány.\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "Csak 2048 bites, vagy rövidebb RSA kulcsokkal titkosíthat --pgp2 módban!\n" @@ -1985,7 +2028,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "Nem tudom az IDEA rejtjelezõt használni az összes címzett kulcshoz.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format 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" @@ -2000,433 +2043,425 @@ msgstr "A %s (%d) tömörítés használata s msgid "you may not use %s while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s titkosítva \"%s\" számára\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "Hiba a kulcsblokk olvasásakor: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "%08lX kulcs: nem rfc2440 kulcs - kihagytam.\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "%08lX kulcs: nem védett - kihagytam.\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszerû SK ellenõrzõösszege.\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "FIGYELEM: Semmit sem exportáltam.\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "Túl sok bejegyzés van a nyilvánoskulcs-gyorsítótárban - letiltom.\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[ismeretlen kulcs]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "%08lX érvénytelen kulcsot érvényesítettük az\n" "--allow-non-selfsigned-uid opcióval.\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "Van egy titkos kulcs a \"%s\" nyilvános kulcshoz!\n" +msgstr "" +"Nincs titkos alkulcs a \"%s\" nyilvános alkulcshoz - figyelmen kívül " +"hagyom.\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsõdleges helyett.\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "%08lX kulcs: titkos kulcs nyilvános kulcs nélkül - kihagytam.\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "%d típusú blokkot kihagyom.\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "Eddig %lu kulcsot dolgoztam fel.\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "Hiba \"%s\" olvasásakor: %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr " Összesen feldolgoztam: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " új kulcsok kihagyva: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " felh. azonosító nélkül: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" -msgstr " importálva: %lu" +msgstr " importálva: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " változatlan: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " új felh. azonosítók: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " új alkulcsok: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " új aláírások: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " új kulcsvisszavonások: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " olvasott titkos kulcsok: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " importált titkos kulcsok: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "változatlan titkos kulcsok: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " nem importált: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "MEGJEGYZÉS: Elgamal elsõdleges kulcsot érzékeltem.\n" "Eltarthat egy ideig az importálása.\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "Ezt okozhatja egy hiányzó önaláírás.\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "%08lX kulcs: új kulcs - kihagytam.\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "Nem írható kulcskarikát találtam: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "Írok a \"%s\" állományba.\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "%08lX kulcs: \"%s\" nem változott.\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" "%08lX kulcs: Titkos kulcs érvénytelen (%d) rejtjelezõvel - kihagytam.\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "%08lX kulcs: Titkos kulcs importálva.\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "%08lX kulcs: Már szerepel a titkoskulcs-karikán.\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "%08lX kulcs: Titkos kulcs nem található: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "%08lX kulcs: Nincs felhasználói azonsító ehhez az aláíráshoz!\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. " "azonosítón!\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "%08lX kulcs: Alkulcsot kihagytam.\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefûztem.\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "FIGYELEM: %08lX kulcsot visszavonhatták:\n" "lehívom a %08lX visszavonó kulcsot.\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "FIGYELEM: %08lX kulcsot visszavonhatták:\n" "visszavonó kulcs (%08lX) nincs jelen.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n" @@ -2439,29 +2474,29 @@ msgstr "[visszavonás]" msgid "[self-signature]" msgstr "[önaláírás]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 rossz aláírás.\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d rossz aláírás.\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 aláírást nem ellenõriztem hiányzó kulcs miatt.\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d aláírást nem ellenõriztem hiányzó kulcs miatt.\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 aláírást nem ellenõriztem hiba miatt.\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d aláírást nem ellenõriztem hiba miatt.\n" @@ -2480,20 +2515,27 @@ msgstr "%d felhasználóazonosítót találta msgid "User ID \"%s\" is revoked." msgstr "\"%s\" felhasználói azonosítót visszavonták." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Nem tudom aláírni.\n" #: g10/keyedit.c:382 #, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" -msgstr "FIGYELEM: \"%s\" felhasználóazonosítón nincs önaláírás.\n" +msgid "User ID \"%s\" is expired." +msgstr "\"%s\" felhasználói azonosító lejárt." + +#: g10/keyedit.c:402 +#, c-format +msgid "User ID \"%s\" is not self-signed." +msgstr "\"%s\" felhasználóazonosítón nincs önaláírás." -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2502,11 +2544,11 @@ msgstr "" "\"%s\" önaláírása\n" "PGP 2.x stílusú.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Szeretné átalakítani OpenPGP önaláírássá? (i/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2515,13 +2557,13 @@ msgstr "" "Az Ön jelenlegi aláírása a(z) \"%s\"\n" "kulcson lejárt.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Szeretne kiadni egy új aláírást, amellyel lecseréli a lejártat? (i/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2530,54 +2572,54 @@ msgstr "" "Az Ön jelenlegi aláírása a(z) \"%s\"\n" "kulcson helyi aláírás.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Szeretné átalakítani teljes, exportálható aláírássá? (i/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" már alá lett írva helyileg a %08lX kulccsal!\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" már alá lett írva a %08lX kulccsal!\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Még egyszer alá akarja írni? (i/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nincs mit aláírni a %08lX kulccsal!\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Ez a kulcs lejárt!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Ez a kulcs lejár: %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Szeretné, ha az aláírása ugyanekkor járna le? (I/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "Lehet, hogy nem rakhat OpenPGP aláírást egy PGP 2.x kulcsra --pgp2 módban.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Ez használhatatlanná tenné a kulcsot PGP 2.x-ben.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2586,31 +2628,35 @@ msgstr "" "Mennyire gondosan ellenõrizte, hogy a kulcs, melyet aláírni készül, valóban\n" "a fent nevezett személyhez tartozik? Ha nem tudja a választ, írjon \"0\"-t!\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Nem válaszolok.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (alapértelmezés)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Egyáltalán nem ellenõriztem.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) A szokásos ellenõrzéseket végeztem.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Nagyon alaposan ellenõriztem.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): " + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2618,7 +2664,7 @@ msgstr "" "Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n" "az Ön kulcsával: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2626,7 +2672,7 @@ msgstr "" "\n" "Ez egy önaláírás lesz.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2634,7 +2680,7 @@ msgstr "" "\n" "FIGYELEM: Az aláírás nem lesz \"nem exportálhatóként\" megjelölve.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2642,7 +2688,7 @@ msgstr "" "\n" "FIGYELEM: Az aláírás nem lesz \"nem visszavonhatóként\" megjelölve.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2650,7 +2696,7 @@ msgstr "" "\n" "Az aláírást \"nem exportálhatónak\" jelöljük.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2658,7 +2704,7 @@ msgstr "" "\n" "Az aláírást \"nem visszavonhatónak\" jelöljük.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2666,7 +2712,7 @@ msgstr "" "\n" "Egyáltalán nem ellenõriztem ezt a kulcsot.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2674,7 +2720,7 @@ msgstr "" "\n" "A szokásos módon ellenõriztem ezt a kulcsot.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2682,34 +2728,34 @@ msgstr "" "\n" "Nagyon gondosan ellenõriztem ezt a kulcsot.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Valóban aláírja? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "Aláírás sikertelen: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Ez a kulcs nem védett.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "A kulcs védett.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2717,7 +2763,7 @@ msgstr "" "Írja be az új jelszót ehhez a titkos kulcshoz!\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2725,493 +2771,491 @@ msgstr "" "Ön nem akar jelszót. Ez valószínûleg *rossz* ötlet!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Valóban ezt akarja? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "Átrakom a kulcsaláírást a megfelelõ helyre.\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "kilépés ebbõl a menübõl" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "mentés és kilépés" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "megmutatja ezt a súgót" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "megmutatja az ujjlenyomatot" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "kilistázza a kulcs- és felhasználóazonosítókat" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "N. felhasználói azonosító kiválasztása" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "N. másodlagos kulcs kiválasztása" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "aláírások kilistázása" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "kulcs aláírása" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "kulcs helyi aláírása" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "kulcs nem visszavonható aláírása" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "kulcs nem visszavonható helyi aláírása" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "felhasználói azonosító hozzáadása" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "fotóazonosító hozzáadása" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "felhasználói azonosító törlése" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "másodlagos kulcs (alkulcs) hozzáadása" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "másodlagos kulcs törlése" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "visszavonó kulcs hozzáadása" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "aláírások törlése" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "lejárat megváltoztatása" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "felhasználóazonosító megjelölése elsõdlegesként" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "váltás a titkos és a nyilvános kulcs listázása között" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "preferenciák listázása (szakértõ)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "preferenciák listázása (részletes)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "preferencialista beállítása" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferenciák frissítése" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "jelszóváltoztatás" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "aláírások visszavonása" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "felhasználói azonosító visszavonása" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "másodlagos kulcs visszavonása" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "kulcs tiltása" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "kulcs engedélyezése" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "fotóazonosító megmutatása" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Titkos kulcs rendelkezésre áll.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Parancs> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Ehhez szükség van a titkos kulcsra.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Kérem, használja elõbb a \"toggle\" parancsot!\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "A kulcsot visszavonták." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Valóban aláírja az összes felhasználóazonosítót? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Ez a parancs %s módban nem engedélyezett.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Legalább egy kulcsot ki kell választania!\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Valóban törli a kiválasztott kulcsokat? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Valóban törli ezt a kulcsot? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Valóban visszavonja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Valóban visszavonja a kijelölt kulcsokat? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Valóban visszavonja ezt a kulcsot? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Valóban frissítsem a preferenciákat? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Mentsem a változtatásokat? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Kilépjek mentés nélkül? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "Frissítés sikertelen: %s.\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 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:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Kivonat: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Jellemzõk: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Ezt a kulcsot a következõ %s kulcs visszavonhatja: " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (érzékeny)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX létrehozva: %s lejár: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Ez a kulcs tiltott." -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! Alkulcsot visszavonták: %s.\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- Hamis visszavonást találtam!\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? Nem tudom ellenõrizni a visszavonást: %s.\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revkey" +msgstr "[visszavont] " -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expire" +msgstr "[lejárt] " -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nincsenek preferenicák egy PGP 2.x felhasználóazonosítón!\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3219,7 +3263,15 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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 "" +"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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3229,45 +3281,45 @@ msgstr "" "okozhatja,\n" " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Továbbra is hozzá akarja adni? (i/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Törli ezt a jó aláírást? (i/N/k)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Valóban törli ezt az önaláírást? (i/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nem töröltem semmit.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3277,85 +3329,84 @@ msgstr "" " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a " "kulcsot!\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 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:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n" +msgstr "" +"FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n" +msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 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:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Másodlagos kulcs lejárati idejének változatása.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 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:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Nincs %d indexû másodlagos kulcs!\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "Felhasználóazonosító: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3364,7 +3415,7 @@ msgstr "" "\"\n" "Aláírva az Ön %08lX kulcsával %s idõpontban.\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3373,56 +3424,56 @@ msgstr "" "\"\n" "Helyileg aláírva az Ön %08lX kulcsával %s idõpontban.\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Ez az aláírás lejárt %s idõpontban.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Biztos benne, hogy mégis visszavonja? (i/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Ön aláírta a következõ felhasználóazonosítókat:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " aláírva %08lX által %s%s%s idõpontban.\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " visszavonva %08lX által %s idõpontban.\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "A következõ aláírásokat fogja visszavonni:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " aláírva %08lX által %s%s idõpontban.\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "Nincs titkos kulcs.\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" @@ -3431,69 +3482,69 @@ msgstr "\"%s\" felhasználói azonosítót m #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kritikus aláírási eljárásmód: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Aláírási eljárásmód: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "FIGYELEM: Érvénytelen jelölõ adatot találtam.\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Kritikus aláírás-jelölés: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Aláírásjelölés: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "nem olvasható forma" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Kulcskarika" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [lejár: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Elsõdleges kulcs ujjlenyomata:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Alkulcs ujjlenyomata:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Elsõdleges kulcs ujjlenyomata:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Alkulcs ujjlenyomata:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Kulcs ujjlenyomata =" @@ -3579,104 +3630,110 @@ msgstr "MEGJEGYZÉS: A feladó kérése: \"c msgid "original file name='%.*s'\n" msgstr "Eredeti fájlnév: '%.*s'.\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Jelölés: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Eljárásmód: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "Aláírásellenõrzés elnyomva.\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "Nem tudom kezelni ezeket a többszörös aláírásokat!\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" "Aláírás létrehozva %.*s idõpontban,\n" "kulcs típusa: %s, azonosító: %08lX.\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +msgid "Key available at: " +msgstr "Kulcs található: " + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "ROSSZ aláírás a következõtõl: \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Lejárt aláírás a következõtõl: \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Jó aláírás a következõtõl: \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[bizonytalan]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "Ez az aláírás lejárt %s idõpontban.\n" +msgstr "Az aláírás lejárt: %s.\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "Ez az aláírás lejárt %s idõpontban.\n" +msgstr "Az aláírás lejár: %s.\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s aláírás a következõtõl: \"%s\"\n" +msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primary" +msgstr "bináris" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "szöveges" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "ismeretlen verzió" +msgstr "ismeretlen" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Nem tudom ellenõrizni az aláírást: %s.\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "Nem különálló aláírás.\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, 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:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "Régi stílusú (PGP 2.x) aláírás.\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "Érvénytelen gyökércsomagot találtam a proc_tree() függvényben!\n" @@ -3704,77 +3761,82 @@ msgid "" msgstr "" "További információt a http://www.gnupg.org/why-not-idea.html oldalon talál.\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: Elavult opció: \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "FIGYELEM: \"%s\" elavult opció!\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "Kérem, ezt használja helyette: \"%s%s\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, 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/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "A %d típusú alcsomag kritikus bitje beállított.\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "Nem tudom beállítani a kliens pid-et az ügynöknek.\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "Nem tudom lekérni a szerver olvasási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "Nem tudom lekérni a szerver írási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "%d gpg-agent protokollverzió nem támogatott!\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "Kommunikációs probléma a gpg ügynökkel!\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "Probléma van az ügynökkel. Letiltom a használatát.\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr "" " \n" " (fõ kulcsazonosító: %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3786,32 +3848,32 @@ msgstr "" "\"%.*s\"\n" "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Ismételje meg a jelszót!\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Írja be a jelszót!\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "A jelszó túl hosszú!\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "Érvénytelen válasz az ügynöktõl!\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "A felhasználó megszakította a mûveletet.\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3822,20 +3884,20 @@ msgstr "" "használatához:\n" "\"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s." -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "Nem tudok jelszót bekérni kötegelt módban!\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Írja be a jelszót: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " @@ -3928,8 +3990,8 @@ msgid "failed sending to `%s': status=%u msgstr "Nem tudtam felküldeni %s kulcsszerverre. Státusz: %u.\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "Ez a kulcsszerver nem teljesen HKP kompatíbilis.\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "Ez a kulcsszerver nem támogatja a --search-keys kapcsolót.\n" #: g10/hkp.c:519 #, c-format @@ -3969,11 +4031,11 @@ msgid "generating the deprecated 16-bit msgstr "" "Elavult, 16 bites ellenõrzõösszeget hozok létre titkos kulcs védelméhez.\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "FIGYELEM: Aláíráskivonat-konfliktus az üzenetben.\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -3982,17 +4044,17 @@ msgstr "" "%08lX kulcs: Ez egy PGP által létrehozott ElGamal kulcs, mely\n" "NEM biztonságos aláírásokhoz!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4001,7 +4063,7 @@ msgstr "" "%08lX kulcs %lu másodperccel a jövõben készült. (Idõugrás vagy " "óraprobléma.)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4010,50 +4072,53 @@ msgstr "" "%08lX kulcs %lu másodperccel a jövõben készült. (Idõugrás vagy " "óraprobléma.)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "MEGJEGYZÉS: Aláíró kulcs (%08lX) lejárt: %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavonó csomaghoz.\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "%08lX kulcs: Nincs alkulcs az alkulcskötõ aláíráshoz!\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" +msgstr "Nem tehet jelölõadatot a v3-as (PGP 2.x stílusú) aláírásokba!\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" +msgstr "Nem tehet jelölõadatot a v3-as (PGP 2.x stílusú) kulcsaláírásokba!\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "FIGYELEM: Nem tudom kifejteni a %% jeleket a jelölésben (túl hosszú).\n" "Kifejtés nélkül használom.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" +msgstr "Nem tehet eljárásmód-URL-t a v3-as (PGP 2.x stílusú) aláírásokba!\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" +"Nem tehet eljárásmód-URL-t a v3-as (PGP 2.x stílusú) kulcsaláírásokba!\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4082,12 +4147,12 @@ msgid "you can only detach-sign with PGP msgstr "" "Különálló aláírást PGP 2.x stílusú kulcsokkal csak --pgp2 módban készíthet!\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s nem hozható létre: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4103,7 +4168,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "Olvasható szöveget PGP 2.x stílusú kulccsal csak --pgp2 módban írhat alá!\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s titkosítást fogok használni.\n" @@ -4118,12 +4183,12 @@ msgstr "Nem tudok %d karakternél hosszab msgid "input line longer than %d characters\n" msgstr "A bemeneti sor hosszabb, mint %d karakter.\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4132,122 +4197,122 @@ msgstr "Bizalmi adatbázis %lu. rekord: í msgid "trustdb transaction too large\n" msgstr "Bizalmi adatbázis tranzakciója túl nagy.\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: Nem tudom elérni: %s.\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: Könyvtár nem létezik!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: Nem tudok lock-ot létrehozni.\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: Nem tudok lock-ot csinálni.\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: Nem tudom létrehozni: %s.\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: Érvénytelen bizalmi adatbázis jött létre.\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: Bizalmi adatbázis létrejött.\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "MEGJEGYZÉS: Bizalmi adatbázis nem írható.\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: Érvénytelen bizalmi adatbázis.\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: Hiba a verziórekord írásakor: %s.\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: Nem bizalmi adatbázis.\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: Verziórekord, rekordszám: %lu.\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: Érvénytelen állományverzió (%d).\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, 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:1465 +#: g10/tdbio.c:1470 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" @@ -4297,39 +4362,38 @@ msgstr "%lu bizalmi rekord, %d típus: ír msgid "trustdb: sync failed: %s\n" msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 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:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "Ellenõrzöm a bizalmi adatbázist.\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "Nem találom az alapvetõen megbízható %08lX kulcs nyilvános kulcsát!\n" +msgstr "Nem találtam alapvetõen megbízható kulcsot.\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "Nem találom az alapvetõen megbízható %08lX kulcs nyilvános kulcsát!\n" @@ -4337,7 +4401,7 @@ msgstr "Nem találom az alapvetõen megbíz #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4898,17 +4962,17 @@ msgstr "Kérem, oldja meg ezt a lehetsége msgid "checking keyring `%s'\n" msgstr "Ellenõrzöm a(z) \"%s\" kulcskarikát.\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu kulcsot ellenõriztem eddig (%lu aláírással).\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu kulcsot ellenõroztem (%lu aláírással).\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: Kulcskarikát létrehoztam.\n" @@ -4950,9 +5014,8 @@ msgid "Is this photo correct (y/N/q)? " msgstr "Ez a fotó megfelelõ (i/N/k)? " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n" +msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" @@ -5010,7 +5073,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "FIGYELEM: nem tudom törölni a \"%s\" átmeneti könyvtárat: %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "soha " @@ -5105,33 +5168,33 @@ msgstr "" "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:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Kérem, válassza ki a visszavonás okát:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Mégsem" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, 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:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Visszavonás oka: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Nincs leírás.)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Ez így rendben van? " @@ -5175,3 +5238,6 @@ msgstr "Hiba bizalmi rekord keresésekor: #, c-format msgid "read error: %s\n" msgstr "Olvasási hiba: %s.\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "Ez a kulcsszerver nem teljesen HKP kompatíbilis.\n" diff -urpP gnupg-1.2.2/po/id.po gnupg-1.2.3/po/id.po --- gnupg-1.2.2/po/id.po 2003-05-01 14:38:16.000000000 +0000 +++ gnupg-1.2.3/po/id.po 2003-08-21 20:05:16.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-29 14:48GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -47,7 +47,7 @@ msgstr "tidak" msgid "nN" msgstr "tT" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "keluar" @@ -274,62 +274,62 @@ msgstr "... kesalahan (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "anda menemukan kesalahan ...(%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "modul entropi gathering tidak terdeteksi\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "tidak dapat membuka `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "tidak dapat melakukan statistik `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "'%s' bukan file reguler - diabaikan\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "catatan: file random_seed kosong\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "tidak dapat membaca `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "catatan: file random_seed tidak diupdate\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "tidak dapat menulis `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "tidak dapat menutup `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -359,6 +359,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -369,7 +374,7 @@ msgstr "" "bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n" "kualitas entropi.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -377,163 +382,163 @@ msgstr "" "@Perintah:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[file]|buat signature" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[file]|buat signature teks" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "buat detached signature" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "enkripsi data" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[files]|enkripsi file" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "enkripsi hanya dengan symmetric cipher" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "hanya disimpan" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "dekripsi data (default)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[files]|dekripsi file" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifikasi signature" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "tampilkan kunci" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "tampilkan kunci dan signature" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "periksa signature kunci" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "tampilkan kunci dan fingerprint" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "tampilkan kunci rahasia" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "buat sepasang kunci baru" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "hapus kunci dari keyring publik" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "hapus kunci dari keyring pribadi" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "tandai kunci" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "tandai kunci secara lokal" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "tandai kunci tidak dapat di-revoke" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "tandai kunci secara lokal dan tidak dapat di-revoke" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "tandai atau edit kunci" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "buat sertifikat revokasi" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "ekspor kunci" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "ekspor kunci ke key server" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "impor kunci dari key server" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "cari kunci di key server" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "update semua kunci dari keyserver" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "impor/gabung kunci" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "tampilkan hanya urutan paket" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "ekspor nilai ownertrust" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "impor nilai ownertrust" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "perbarui database trust" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "perbarui database trust secara otomatis" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "perbaiki database trust yang terkorupsi" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "De-Armor file atau stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "En-Armor file atau stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [file]|cetak digest pesan" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -543,151 +548,151 @@ msgstr "" "Pilihan:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "ciptakan output ascii" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAMA|enkripsi untuk NAMA" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAMA|gunakan NAMA sebagai penerima baku" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "gunakan kunci baku sebagai penerima baku" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "gunakan id-user ini untuk menandai/dekripsi" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|set tingkat kompresi N (0 tidak ada)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "gunakan mode teks kanonikal" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "gunakan sebagai file output" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "detil" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "lebih diam" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "jangan menggunakan terminal" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "paksa signature v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "jangan paksa signature v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "paksa signature kunci v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "jangan paksa signature kunci v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "selalu gunakan MDC untuk enkripsi" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "jangan gunakan MDC untuk enkripsi" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "jangan buat perubahan" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "tanya sebelum menimpa" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "gunakan gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "mode batch: tanpa tanya" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "asumsikan ya untuk seluruh pertanyaan" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "asumsikan tidak untuk seluruh pertanyaan" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "tambah keyring ini ke daftar keyring" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "tambah keyring rahasia ini ke daftar" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "tampilkan keyring tempat kunci yang dipilih berada" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|gunakan keyserver ini utk lihat kunci" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAMA|set charset terminal ke NAMA" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "baca pilihan dari file" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|tulis info status ke FD ini" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[file]|tulis status info ke file" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|sangat percayai kunci ini" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FILE|muat modul ekstensi FILE" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emulasikan mode seperti dalam RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x" @@ -731,7 +736,7 @@ msgstr "Jangan tampilkan Photo IDs" msgid "Set command line to view Photo IDs" msgstr "Set perintah baris untuk melihat Photo IDs" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -739,7 +744,7 @@ msgstr "" "@\n" "(Lihat man page untuk daftar lengkap semua perintah dan option)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -759,15 +764,15 @@ msgstr "" " --list-keys [nama] tampilkan kunci\n" " --fingerprint [nama] tampilkan fingerprint\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Silakan laporkan kesalahan ke .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -777,7 +782,7 @@ msgstr "" "tandai, cek, enkripsi atau dekripsi\n" "operasi baku tergantung pada data input\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -785,323 +790,357 @@ msgstr "" "\n" "Algoritma yang didukung:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Cipher: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Kompresi: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "pemakaian: gpg [pilihan] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "perintah saling konflik\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "anda hanya dapat membuat signature detached atau clear saat dalam mode --" "pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --" "pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --" "pgpg2\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritma kompresi harus di antara %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "tidak dapat membuka %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Pembuatan kunci gagal: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Pembuatan kunci gagal: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Pembuatan kunci gagal: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Pembuatan kunci gagal: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "gagal perbarui rahasia: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "tidak dapat membuka `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1109,19 +1148,19 @@ msgstr "" "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, " "dan diakhiri dengan sebuah '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" @@ -1262,7 +1301,7 @@ msgstr "" "Tidak ada nilai trust untuk:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1320,7 +1359,7 @@ msgstr " s = lewati kunci ini\n" msgid " q = quit\n" msgstr " q = berhenti\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Keputusan anda? " @@ -1496,91 +1535,91 @@ msgstr "%s: dilewati: kunci publik dimat msgid "no valid addressees\n" msgstr "tidak ada alamat yang valid\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "preferensi %c%lu tidak valid\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "preferensi %c%lu ganda \n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "terlalu banyak preferensi `%c'\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "menulis signature direct\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "menulis self signature\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "menulis key binding signature\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize tidak valid; menggunakan %u bit\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize dibulatkan hingga %u bit\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Silakan pilih kunci yang anda inginkan:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA dan ElGamal (baku)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (hanya menandai)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (hanya enkripsi)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (tandai dan enkripsi)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (hanya menandai)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (tandai dan enkripsi)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Pilihan anda? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1591,15 +1630,15 @@ msgstr "" "ini\n" "juga sangat lambat, dan mungkin tidak seaman pilihan lainnya.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Tetap dibuat? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Pilihan tidak valid.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1612,20 +1651,20 @@ msgstr "" " keysize default adalah 1024 bit\n" " keysize tertinggi dianjurkan 2048 bit\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Keysize yang anda inginkan? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" @@ -1637,12 +1676,12 @@ msgstr "keysize terlalu kecil; 768 adala #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1650,11 +1689,11 @@ msgstr "" "Keysize lebih besar dari 2048 tidak dianjurkan karena\n" "komputasi akan sangat lama!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Apakah anda yakin memerlukan keysize ini? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1662,17 +1701,17 @@ msgstr "" "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah " "diserang!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Keysize yang diminta adalah %u bit\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "dibulatkan hingga %u bit\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1688,7 +1727,7 @@ msgstr "" " m = kunci berakhir dalam n bulan\n" " y = kunci berakhir dalam n tahun\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1704,30 +1743,30 @@ msgstr "" " m = signature berakhir dalam n bulan\n" " y = signature berakhir dalam n tahun\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Kunci valid untuk? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Signature valid untuk? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "nilai yang tidak valid\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s tidak pernah berakhir\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s berakhir pada %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1735,11 +1774,11 @@ msgstr "" "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n" "Namun, ia dapat menanganinya secara benar hingga 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Benar (y/t)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1754,44 +1793,44 @@ msgstr "" "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n" " \"Heinrich Heine (Der Dichter) \"\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nama sebenarnya: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Karakter tidak valid dalam nama\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Nama tidak boleh dimulai dengan digit\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Nama harus berukuran minimum 5 karakter\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Alamat email: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Bukan alamat email yang valid\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Komentar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Karakter tidak valid dalam komentar\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Anda menggunakan set karakter `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1801,27 +1840,27 @@ msgstr "" "Anda memilih USER-ID ini:\n" " \"%s\"\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Silakan perbaiki kesalahan ini dulu\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1829,16 +1868,16 @@ msgstr "" "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1851,7 +1890,7 @@ msgstr "" "menggunakan program ini dengan pilihan \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1863,53 +1902,53 @@ msgstr "" "selama pembuatan prima; ini akan memberi random number generator kesempatan\n" "yang baik untuk memperoleh entropi.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Keypair DSA akan memiliki 1024 bit.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Pembuatan kunci dibatalkan.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "menulis kunci publik ke `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "kesalahan menulis keyring publik `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "kesalahan menulis keyring rahasia `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "kunci publik dan rahasia dibuat dan ditandai.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "kunci ditandai sebagai sangat dipercaya.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1918,44 +1957,44 @@ msgstr "" "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua " "untuk tujuan ini.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, 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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, 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:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Ingin diciptakan? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output tidak berfungsi untuk perintah ini\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: tidak dapat membuka: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "kesalahan penciptaan passphrase: %s\n" @@ -1964,17 +2003,17 @@ msgstr "kesalahan penciptaan passphrase: msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' sudah dikompresi\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: PERINGATAN: file kosong\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --" @@ -1991,7 +2030,7 @@ msgid "" msgstr "" "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n" @@ -2006,428 +2045,418 @@ msgstr "memaksa algoritma kompresi %s (% msgid "you may not use %s while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s dienkripsi untuk: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "gagal membaca keyblock: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "kunci %08lX: tidak diproteksi - dilewati\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "PERINGATAN: tidak ada yang diekspor\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User id tidak ditemukan]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "melewati blok tipe %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu kunci telah diproses\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "kesalahan membaca `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Jumlah yang telah diproses: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " lewati kunci baru: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " tanpa ID user: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " diimpor: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " tidak berubah: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " ID user baru: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " subkey baru: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " signature baru: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " pembatalan kunci baru: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " kunci rahasia dibaca: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " kunci rahasia diimpor: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " kunci rahasia tidak berubah: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " tidak diimpor: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "CATATAN: Kunci primer Elgamal terdeteksi - mungkin membutuhkan beberapa saat " "untuk mengimpor\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "kunci %08lX: tidak ada ID user\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "kunci %08lX: tidak ada ID user yang valid\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "kunci %08lX: kunci baru - dilewati\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "menulis ke `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "kesalahan menulis keyring `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "kunci %08lX: 1 user ID baru \"%s\"\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "kunci %08lX: \"%s\" %d user ID baru\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "kunci %08lX: \"%s\" 1 signature baru\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "kunci %08lX: \"%s\" %d signature baru\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "kunci %08lX: \"%s\" 1 subkey baru\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "kunci %08lX: \"%s\" %d subkey baru\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "kunci %08lX: \"%s\" tidak berubah\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "tidak ada keyring rahasia baku: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "kunci %08lX: kunci rahasia diimpor\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "kunci %08lX: sudah ada di keyring rahasia\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat " "pembatalan\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "kunci %08lX: tidak ada ID user untuk signature\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "kunci %08lX: tidak ada subkey untuk key binding\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "kunci %08lX: algoritma publik key tidak didukung\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "kunci %08lX: subkey binding tidak valid\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "kunci %08lX: hapus subkey binding ganda\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "kunci %08lX: pembatalan subkey tidak valid\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "kunci %08lX: hapus pembatalan subkey ganda\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "kunci %08lX: melewati ID user " -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "kunci %08lX: melewati subkey\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "kunci %08lX: signature kunci langsung ditambahkan\n" @@ -2440,29 +2469,29 @@ msgstr "[pembatalan]" msgid "[self-signature]" msgstr "[self-signature]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 signature yang buruk\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d signature yang buruk\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 signature tidak diperiksa karena tidak ada kunci\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signature tidak diperiksa karena tidak ada kunci\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 signature tidak diperiksa karena kesalahan\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signature tidak diperiksa karena ada kesalahan\n" @@ -2481,20 +2510,27 @@ msgstr "terdeteksi ID %d user tanpa self msgid "User ID \"%s\" is revoked." msgstr "User ID \"%s\" dibatalkan." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Apakah anda yakin masih ingin menandainya? (y/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "..Tidak dapat menandai.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "User ID \"%s\" dibatalkan." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "PERINGATAN: user ID \"%s\" bukan self-signed.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2503,11 +2539,11 @@ msgstr "" "Self-signature pada \"%s\"\n" "adalah signature bergaya PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2516,7 +2552,7 @@ msgstr "" "Signature anda saat ini pada \"%s\"\n" "telah habis berlaku.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis " @@ -2524,7 +2560,7 @@ msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2533,43 +2569,43 @@ msgstr "" "Signature anda saat ini pada \"%s\"\n" "adalah signature.lokal \n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Apakah anda ingin menandainya lagi? (y/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Tidak ada yang ditandai dengan kunci %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Kunci ini telah berakhir!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2577,11 +2613,11 @@ msgstr "" "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat " "dalam mode --pgp2\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2591,31 +2627,35 @@ msgstr "" "menandai benar benar milik\n" "orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Saya tidak akan menjawab.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (default)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Saya belum memeriksanya.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2623,7 +2663,7 @@ msgstr "" "Apakah anda yakin untuk menandai kunci ini \n" "dengan kunci anda: " -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2631,7 +2671,7 @@ msgstr "" "\n" "Ini akan jadi self-signature.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2639,7 +2679,7 @@ msgstr "" "\n" "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2647,7 +2687,7 @@ msgstr "" "\n" "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2655,7 +2695,7 @@ msgstr "" "\n" "Signature akan ditandai sebagai tidak dapat diekspor.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2663,7 +2703,7 @@ msgstr "" "\n" "Signature akan ditandai sebagai tidak dapat dibatalkan.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2671,7 +2711,7 @@ msgstr "" "\n" "Saya belum memeriksa kunci ini sama sekali.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2679,7 +2719,7 @@ msgstr "" "\n" "Saya telah memeriksa kunci ini.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2687,34 +2727,34 @@ msgstr "" "\n" "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Ditandai? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "gagal menandai: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Kunci ini tidak diproteksi.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Bagian rahasia kunci primer tidak tersedia.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Kunci diproteksi.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Tidak dapat mengedit kunci ini: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2722,7 +2762,7 @@ msgstr "" "Masukkan passphrase baru untuk kunci rahasia ini.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2730,493 +2770,493 @@ msgstr "" "Anda tidak ingin passphrase - bukan ide yang baik!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Apakah anda ingin melakukan hal ini? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "memindahkan signature kunci ke tempat yang tepat\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "berhenti dari menu ini" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "simpan" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "simpan dan berhenti" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "bantuan" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "tampilkan bantuan" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "tampilkan fingerprint" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "tampilkan" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "tampilkan kunci dan ID user" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "pilih ID user N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "kunci" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "pilih kunci sekunder N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "periksa" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "tampilkan signature" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "tandai" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "tandai kunci" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "tandai kunci secara lokal" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "tandai kunci sebagai tidak dapat dibatalkan" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "tambah sebuah ID user" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "tambah sebuah photo ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "hapus ID user" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "tambah kunci sekunder" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "hapus kunci sekunder" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "tambah kunci pembatalan" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "hapus signature" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "ubah tanggal kadaluarsa" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primer" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "tandai ID user sebagai primer" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "ubah tampilan kunci rahasia dan publik" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "tampilkan preferensi (ahli)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "tampilkan preferensi (verbose)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "set daftar preferensi" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "perbarui preferensi" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "ubah passphrase" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "ubah ownertrust" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "batalkan signature" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "batalkan sebuah ID user" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "batalkan kunci sekunder" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "tiadakan kunci" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "aktifkan kunci" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "tampilkan photo ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "tidak dapat melakukan hal itu dalam mode batch\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "kesalahan membaca keyblock rahasia `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Kunci rahasia tersedia.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Perintah> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Silakan gunakan dulu perintah \"toogle\".\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Kunci dibatalkan" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Tandai ID seluruh user? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Petunjuk: Pilih ID user untuk ditandai\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Anda tidak dapat menghapus ID user terakhir!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Hapus ID user ini? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Anda harus memilih minimum satu kunci.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Anda ingin menghapus kunci terpilih ini? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Anda ingin menghapus kunci ini? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Benar-benar hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Benar-benar hapus ID user ini? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Anda ingin membatalkan kunci terpilih ini? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Anda ingin membatalkan kunci ini? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Perbarui preferensi untuk user ID terpilih?" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Update preferensi?" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Simpan perubahan? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Berhenti tanpa menyimpan? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "gagal memperbarui: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "gagal perbarui rahasia: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Fitur: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensitive)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX diciptakan: %s berakhir: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " trust: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! subkey telah dibatalkan: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev - ditemukan pembatalan palsu\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? masalah memeriksa pembatalan: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3224,7 +3264,13 @@ msgstr "" "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n" "kecuali anda memulai kembali program.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3234,45 +3280,45 @@ msgstr "" "dapat menyebabkan beberapa versi\n" " PGP menolak kunci ini.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Anda tetap ingin menambahkannya? (y/n) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Hapus signature baik ini? (y/T/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Hapus signature tidak valid ini? (y/T/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Hapus signature tidak dikenal ini? (y/T/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Yakin ingin menghapus self-signature ini? (y/T)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Tidak ada yang dihapus.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3282,15 +3328,15 @@ msgstr "" "designated dapat\n" "............menyebabkan beberapa versi PGP menolak kunci ini.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Masukkan user ID pihak yang ingin dibatalkan: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" @@ -3298,20 +3344,20 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan " "sendiri\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " @@ -3319,54 +3365,54 @@ msgstr "" "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan " "sendiri\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Silakan hapus pilihan dari kunci rahasia.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Silakan pilih maksimum satu kunci sekunder.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Merubah batas waktu untuk kunci sekunder.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Merubah batas waktu untuk kunci primer.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Tidak ada signature koresponden di ring rahasia\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Tidak ada kunci sekunder dengan index %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID user: " -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3375,7 +3421,7 @@ msgstr "" "\"\n" "ditandai dengan kunci anda %08lX pada %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3384,56 +3430,56 @@ msgstr "" "\"\n" "ditandai secara lokal dengan kunci anda %08lX pada %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Anda tetap ingin membatalkannya? (y/n) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Anda telah menandai ID user ini:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " ditandai oleh %08lX pada %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " dibatalkan oleh %08lX pada %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Anda akan membatalkan signature ini:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " ditandai oleh %08lX pada %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Ingin membuat sertifikat pembatalan? (y/T)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" @@ -3442,68 +3488,68 @@ msgstr "User ID \"%s\" telah dibatalkan\ #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kebijakan signature kritis: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Kebijakan signature: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "PERINGATAN: ditemukan notasi data tidak valid\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notasi signature kritis: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notasi signature: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "tidak dapat dibaca manusia" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Keyring" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [berakhir: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Fingerprint kunci primer:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Fingerprint kunci primer =" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Fingerprint kunci =" @@ -3587,102 +3633,111 @@ msgstr "CATATAN: pengirim meminta \"for- msgid "original file name='%.*s'\n" msgstr "original file name='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notasi: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Kebijakan: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verifikasi signature tidak diabaikan\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "tidak dapat menangani banyak signature ini\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Tidak tersedia bantuan" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "signature BURUK dari \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Signature kadaluarsa dari \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Signature baik dari \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[uncertain]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signature dari: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primer" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "versi tidak dikenal" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Tidak dapat memeriksa signature: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "bukan detached signature\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "kelas signature mandiri 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "signature model lama (PGP 2.X)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n" @@ -3711,75 +3766,80 @@ msgstr "" "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih " "lanjut\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "silakan gunakan \"%s%s\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "tidak dapat menangani algoritma kunci publik %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpaket tipe %d memiliki bit kritis terset\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent tidak tersedia untuk sesi ini\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "tidak dapat menset pid client untuk agen\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "tidak dapat membuat server membaca FD untuk agen\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "tidak dapat membuat server menulis FD untuk agen\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokol gpg-agent versi %d tidak didukung\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "tidak dapat terkoneksi ke `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID kunci utama %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3790,32 +3850,32 @@ msgstr "" "\"%.*s\"\n" "%u-bit %s key, ID %08lX, tercipta %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Ulangi passphrase\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Masukkan passphrase\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "passphrase terlalu panjang\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3825,20 +3885,20 @@ msgstr "" "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -3930,8 +3990,8 @@ msgid "failed sending to `%s': status=%u msgstr "failed sending to `%s': status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "keyserver ini tidak kompatibel penuh dengan HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3969,11 +4029,11 @@ msgstr "PERINGATAN: terdeteksi kunci lem msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "Peringatan: konflik digest signature dalam pesan\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -3982,17 +4042,17 @@ msgstr "" "kunci %08lX: ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk " "signature!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4001,7 +4061,7 @@ msgstr "" "kunci %08lX telah diciptakan dalam %lu detik mendatang (masalah waktu atau " "jam)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4010,53 +4070,58 @@ msgstr "" "kunci %08lX telah diciptakan dalam %lu detik mendatang (masalah waktu atau " "jam)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "CATATAN: kunci signature %08lX berakhir %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "kunci %08lX: tidak ada subkey untuk key binding\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar). " "Menggunakan yang tidak di-expand.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4085,12 +4150,12 @@ msgstr "" "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --" "pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "tidak dapat membuat %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n" @@ -4105,7 +4170,7 @@ msgstr "" "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --" "pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s enkripsi akan digunakan\n" @@ -4120,12 +4185,12 @@ msgstr "tidak dapat menangani baris teks msgid "input line longer than %d characters\n" msgstr "baris input lebih dari %d karakter\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek gagal: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -4134,122 +4199,122 @@ msgstr "trustdb rec %lu: write failed (n msgid "trustdb transaction too large\n" msgstr "transaksi trustdb terlalu besar\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: tidak dapat mengakses: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: direktori tidak ada!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: tidak dapat membuat lock\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: tidak dapat membuat lock\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: tidak dapat membuat: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: gagal membuat catatan versi: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: tercipta trustdb tidak valid\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: tercipta trustdb\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "CATATAN: trustdb tidak dapat ditulisi\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb tidak valid\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: gagal membuat hashtable: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: kesalahan memperbaharui catatan versi: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: kesalahan membaca catatan versi: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: kesalahan menulis catatan versi: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek gagal: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: bukan file trustdb\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: catatan versi dengan recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versi file %d tidak valid\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: kesalahan membaca record bebas: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: kesalahan menulis dir record: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: gagal mengosongkan record: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: gagal menambahkan record: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n" @@ -4298,39 +4363,39 @@ msgstr "trust record %lu, tipe %d: gagal msgid "trustdb: sync failed: %s\n" msgstr "trustdb: gagal sync: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "pemeriksaan trustdb berikutnya pada %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "memeriksa trustdb\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "kunci publik %08lX tidak ditemukan: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" @@ -4338,7 +4403,7 @@ msgstr "kunci publik yang sangat terperc #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4899,17 +4964,17 @@ msgstr "Silakan perbaiki kemungkinan lub msgid "checking keyring `%s'\n" msgstr "memeriksa keyring `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu kunci telah diperiksa (%lu signature)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu kunci telah diperiksa (%lu signature)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: keyring tercipta\n" @@ -5012,7 +5077,7 @@ msgstr "PERINGATAN: tidak dapat menghapu msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "tidak pernah..." @@ -5109,34 +5174,34 @@ msgstr "" "pencetakan\n" "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Silakan pilih alasan untuk pembatalan:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Batal" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Mungkin anda ingin memilih %d di sini)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Alasan pembatalan: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Tidak diberikan deskripsi)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Ini oke? " @@ -5181,5 +5246,8 @@ msgstr "kesalahan: gagal menemukan catat msgid "read error: %s\n" msgstr "kesalahan pembacaan: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "keyserver ini tidak kompatibel penuh dengan HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?" diff -urpP gnupg-1.2.2/po/it.po gnupg-1.2.3/po/it.po --- gnupg-1.2.2/po/it.po 2003-05-01 14:38:18.000000000 +0000 +++ gnupg-1.2.3/po/it.po 2003-08-21 20:05:18.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-28 02:34+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -45,7 +45,7 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "quit" @@ -273,64 +273,64 @@ msgstr "... questo è un bug (%s:%d:%s)\n msgid "you found a bug ... (%s:%d)\n" msgstr "hai trovato un bug... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "non è stato trovato il modulo per raccogliere l'entropia\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "impossibile aprire `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "impossibile eseguire stat su `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' non è un file regolare - ignorato\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "nota: il file random_seed è vuoto\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "impossibile leggere `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "nota: il file random_seed non è stato aggiornato\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "impossibile creare `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "impossibile scrivere su `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "impossibile chiudere `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "" "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -361,6 +361,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -371,7 +376,7 @@ msgstr "" "po',\n" "visto che questo migliorerà la qualità dell'entropia.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -379,163 +384,163 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[file]|cifra i file" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[file]|decifra i file" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "rimuove le chiavi dal portachiavi pubblico" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "rimuove le chiavi dal portachiavi privato" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "firma una chiave" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "firma una chiave localmente" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "firma una chiave irrevocabilmente" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "firma una chiave localmente e irrevocabilmente" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "esporta le chiavi a un key server" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importa le chiavi da un key server" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "cerca delle chiavi su un key server" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "aggiorna tutte le chiavi da un key server" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "aggiorna il database della fiducia" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "aggiornamento non presidiato del database della fiducia" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -545,153 +550,153 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifra per NOME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usa NOME come destinatario predefinito" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usa la chiave predefinita come destinatario predefinito" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disab.)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "non usa per niente il terminale" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "non forza l'uso di firme v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "forza l'uso di firme v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "non forza l'uso di firme v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "usa sempre un MDC per cifrare" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "non usa mai un MDC per cifrare" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "non fa cambiamenti" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "chiede prima di sovrascrivere" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "usa gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "modo batch: non fa domande" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "assumi \"sì\" per quasi tutte le domande" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "assumi \"no\" per quasi tutte le domande" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "mostra in quali portachiavi sono contenute le chiavi elencate" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME come chiave segreta predefinita" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|cerca le chiavi in questo keyserver" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NOME|imposta NOME come set di caratteri del terminale" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato sul FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[file]|scrivi le informazioni di stato nel file" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|assegna fiducia definitiva a questa chiave" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto in RFC 1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "imposta tutte le opzioni di pacchetto,\n" "cifrario e digest per OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x" @@ -735,7 +740,7 @@ msgstr "Non mostra le fotografie" msgid "Set command line to view Photo IDs" msgstr "Imposta la riga di comando per vedere le fotografie" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -743,7 +748,7 @@ msgstr "" "@\n" "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -763,15 +768,15 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -781,7 +786,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -789,322 +794,356 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Cifrari: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compressione: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uso: gpg [opzioni] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n" "permessi insicuri.\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "questo messaggio può non essere utilizzabile da %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritmo di compressione deve essere tra %d e %d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "non è possibile usare %s in modalità %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "non è possibile usare %s in modalità %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "non è possibile usare %s in modalità %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n" "crittografia a chiave pubblica\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Generazione della chiave fallita: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Generazione della chiave fallita: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Generazione della chiave fallita: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Generazione della chiave fallita: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "aggiornamento della chiave segreta fallito: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1112,19 +1151,19 @@ msgstr "" "il nome di una nota deve essere formato solo da caratteri stampabili o\n" "spazi e terminare con un '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "l'URL della politica di certificazione indicato non è valido\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" @@ -1265,7 +1304,7 @@ msgstr "" "Nessun valore di fiducia assegnato a:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1323,7 +1362,7 @@ msgstr " s = salta questa chiave\n" msgid " q = quit\n" msgstr " q = abbandona\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Cosa hai deciso? " @@ -1499,91 +1538,91 @@ msgstr "%s: saltata: chiave pubblica dis msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "la preferenza %c%lu non è valida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "la preferenza %c%lu è doppia\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "ci sono troppe preferenze `%c'\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "scrittura della firma diretta\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "scrittura della autofirma\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "scrittura della firma di collegamento alla chiave\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "dimensione della chiave non valida; uso %u bit\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "dimensioni della chiave arrotondate a %u bit\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Per favore scegli che tipo di chiave vuoi:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA e ElGamal (default)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (firma solo)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (cifra solo)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (firma e cifra)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (firma solo)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (firma e cifra)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Cosa scegli? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1593,15 +1632,15 @@ msgstr "" "questa chiave per comunicare con utenti di PGP. Inoltre questo algoritmo è\n" "molto lento e potrebbe non essere sicuro come gli altri.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "La creo lo stesso? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Scelta non valida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1614,19 +1653,19 @@ msgstr "" " la dimensione predefinita è 1024 bit\n" " la dimensione massima consigliata è 2048 bit\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Di che dimensioni vuoi la chiave? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n" @@ -1638,12 +1677,12 @@ msgstr "la chiave è troppo corta; 768 è #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1651,11 +1690,11 @@ msgstr "" "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n" "VERAMENTE lunghi!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Sei sicuro di volere una chiave di queste dimensioni? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1663,17 +1702,17 @@ msgstr "" "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla " "tua tastiera sono molto vulnerabili ad attacchi!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La dimensione richiesta della chiave è %u bit\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "arrotondate a %u bit\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1689,7 +1728,7 @@ msgstr "" " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1705,30 +1744,30 @@ msgstr "" " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Chiave valida per? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Firma valida per? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valore non valido\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s non ha scadenza\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s scadrà il %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1736,11 +1775,11 @@ msgstr "" "Il tuo sistema non può mostrare date oltre il 2038.\n" "Comunque, sarà gestita correttamente fino al 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "È giusto (s/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1756,44 +1795,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nome e Cognome: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Carattere non valido nel nome\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Il nome non può iniziare con una cifra\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Il nome deve essere lungo almeno 5 caratteri\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Indirizzo di Email: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "L'indirizzo di email non è valido\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Commento: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Carattere non valido nel commento\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Stai usando il set di caratteri `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1804,27 +1843,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Per favore correggi prima l'errore\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1832,16 +1871,16 @@ msgstr "" "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1853,7 +1892,7 @@ msgstr "" "programma con l'opzione \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1865,53 +1904,53 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "La coppia DSA avrà 1024 bit.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Generazione della chiave annullata.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "scrittura della chiave pubblica in `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi segreto `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "chiavi marcate definitivamente affidabili.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1920,12 +1959,12 @@ msgstr "" "il comando \"--edit-key\" per generare una chiave secondaria per questo " "scopo.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1933,7 +1972,7 @@ msgstr "" "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1941,25 +1980,25 @@ msgstr "" "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NB: la creazione di sottochiavi per chiavi v3 non rispetta OpenPGP.\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Crea davvero? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output non funziona con questo comando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: impossibile aprire: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "errore nella creazione della passhprase: %s\n" @@ -1969,17 +2008,17 @@ msgid "can't use a symmetric ESK packet msgstr "" "impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' è già compresso\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ATTENZIONE: file vuoto\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "in modalità --pgp2 puoi cifrare solo per chiavi RSA non più lunghe di 2048 " @@ -1997,7 +2036,7 @@ msgstr "" "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n" "stai cifrando.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2016,430 +2055,420 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s cifrato per: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "errore leggendo il keyblock: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chiave %08lX: chiave non rfc2440 - saltata\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "chiave %08lX: non protetta - saltata\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ATTENZIONE: non è stato esportato nulla\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "troppe voci nella pk cache - disabilitata\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User ID non trovato]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "c'è una chiave segreta per la chiave pubblica \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "Per ora sono state esaminate %lu chiavi\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Numero totale esaminato: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " nuove chiavi saltate: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " senza user ID: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importate: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " non modificate: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nuovi user ID: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nuove subchiavi: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nuove firme: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr "nuove revoche di chiavi: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " chiavi segrete lette: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "chiavi segrete importate: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chiavi segrete non cambiate: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " importate: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTA: trovata una chiave primaria Elgamal - importarla può essere lungo\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "chiave %08lX: nessun user ID\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "chiave %08lX: riparati i danni di HKP alla sottochiave\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "chiave %08lX: nessun user ID valido\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "questo può essere causato da una autofirma mancante\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "chiave %08lX: nuova chiave - saltata\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "non è stato trovato un portachiavi scrivibile: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chiave %08lX: non corrisponde alla nostra copia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "chiave %08lX: \"%s\" una nuova firma\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "chiave %08lX: \"%s\" %d nuove firme\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "chiave %08lX: \"%s\" una nuova subchiave\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "chiave %08lX: \"%s\" non cambiata\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "nessun portachiavi segreto predefinito: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chiave %08lX: già nel portachiavi segreto\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n" "certificato di revoca\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "chiave %08lX: nessun user ID per la firma\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chiave %08lX: legame con la subchiave non valido:\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "chiave %08lX: revoca della subchiave non valida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "chiave %08lX: saltato l'user ID '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chiave %08lX: saltata la subchiave\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "chiave %08lX: firma della sottochiave nel posto sbagliato - saltata\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chiave %08lX: trovato un user ID duplicato - unito\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n" "di revoca %08lX.\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n" "revoca %08lX non è presente.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n" @@ -2452,29 +2481,29 @@ msgstr "[revoca]" msgid "[self-signature]" msgstr "[autofirma]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "una firma non corretta\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d firme non corrette\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "una firma non controllata per mancanza della chiave\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d firme non controllate per mancanza delle chiavi\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "una firma non controllata a causa di un errore\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d firme non controllate a causa di errori\n" @@ -2493,20 +2522,27 @@ msgstr "Trovati %d user ID senza autofir msgid "User ID \"%s\" is revoked." msgstr "L'user ID \"%s\" è stato revocato." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Sei ancora sicuro di volerla firmare? (s/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Impossibile firmarla.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "L'user ID \"%s\" è stato revocato." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "ATTENZIONE: l'user ID \"%s\" non è autofirmato.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2515,11 +2551,11 @@ msgstr "" "L'autofirma su \"%s\"\n" "è una firma in stile PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2528,13 +2564,13 @@ msgstr "" "La tua firma attuale su \"%s\"\n" "è scaduta\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2543,43 +2579,43 @@ msgstr "" "La tua firma attuale su \"%s\"\n" "è una firma locale.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Niente da firmare con la chiave %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Questa chiave è scaduta!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Questa chiave scadrà il %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2587,11 +2623,11 @@ msgstr "" "In modalità -pgp2 non è possibile fare firme OpenPGP su chiavi in stile PGP " "2.x.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2601,31 +2637,35 @@ msgstr "" "appartiene veramente alla persona indicata sopra?\n" "Se non sai cosa rispondere digita \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Preferisco non rispondere.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (predefinito)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Non l'ho controllata per niente.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) L'ho controllata superficialmente.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) L'ho controllata molto attentamente.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2633,7 +2673,7 @@ msgstr "" "Sei davvero sicuro di volere firmare questa chiave\n" "con la tua chiave: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2641,7 +2681,7 @@ msgstr "" "\n" "Questa sarà una autofirma.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2649,7 +2689,7 @@ msgstr "" "\n" "ATTENZIONE: la firma non sarà marcata come non esportabile.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2657,7 +2697,7 @@ msgstr "" "\n" "ATTENZIONE: la firma sarà marcata come irrevocabile.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2665,7 +2705,7 @@ msgstr "" "\n" "La firma sarà marcata come non esportabile.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2673,7 +2713,7 @@ msgstr "" "\n" "La firma sarà marcata come irrevocabile.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2681,7 +2721,7 @@ msgstr "" "\n" "Non ho controllato per niente questa chiave.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2689,7 +2729,7 @@ msgstr "" "\n" "Ho controllato questa chiave superficialmente.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2697,34 +2737,34 @@ msgstr "" "\n" "Ho controllato questa chiave molto attentamente.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Questa chiave non è protetta.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Parti della chiave segreta non sono disponibili.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "La chiave è protetta.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossibile modificare questa chiave: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2732,7 +2772,7 @@ msgstr "" "Inserisci la nuova passphrase per questa chiave segreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2740,493 +2780,493 @@ msgstr "" "Non vuoi una passphrase - questa è probabilmente una *cattiva* idea!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Vuoi veramente farlo?" -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "spostamento della firma di una chiave nel posto corretto\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "abbandona questo menù" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "salva ed esci" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "mostra le impronte digitali" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "elenca le chiavi e gli user ID" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "scegli l'user ID N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "firma la chiave localmente" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "firma la chiave irrevocabilmente" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "firma la chiave localmente e irrevocabilmente" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "aggiungi un user ID" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "aggiungi un ID fotografico" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "cancella un user ID" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "aggiungi una chiave di revoca" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsign" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "cancella le firme" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "cambia la data di scadenza" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "imposta l'user ID come primario" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "elenca le preferenze (per esperti)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "elenca le preferenze (prolisso)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "imposta la lista di preferenze" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferenze aggiornate" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoca firme" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revoca un user ID" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoca una chiave secondaria" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "disabilita una chiave" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "abilita" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "abilita una chiave" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "mostra l'ID fotografico" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "impossibile fare questo in modo batch\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "errore leggendo il keyblock segreto `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "È disponibile una chiave segreta.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Per favore usa prima il comando \"toggle\".\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "La chiave è stata revocata." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Firmo davvero tutti gli user ID? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Suggerimento: seleziona gli user ID da firmare\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Questo comando non è permesso in modalità %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Devi selezionare almeno un user ID.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Tolgo davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Tolgo davvero questo user ID? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Revoco davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Revoco davvero questo user ID? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Vuoi davvero revocare le chiavi selezionate? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Vuoi davvero revocare questa chiave? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Aggiorno davvero le preferenze? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Esco senza salvare? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Caratteristiche: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Questa chiave può essere revocata dalla chiave %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensibile)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX creata: %s scade: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Questa chiave è stata disabilitata" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! la subchiave è stata revocata: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- trovata una revoca falsificata\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problema controllando la revoca: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3235,7 +3275,13 @@ msgstr "" "corretta\n" "finchè non eseguirai di nuovo il programma.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3244,46 +3290,46 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Non è stato cancellato nulla.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3293,17 +3339,17 @@ msgstr "" " designato può causarne il rifiuto da parte di alcune versioni\n" " di PGP.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Inserisci l'user ID del revocatore designato: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" @@ -3311,72 +3357,72 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "impossibile nominare una chiave come revocatore designato di sè stessa\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "" "impossibile nominare una chiave come revocatore designato di sè stessa\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Devi selezionare esattamente un user ID.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "user ID: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3386,7 +3432,7 @@ msgstr "" "firmata con la tua chiave %08lX il %s\n" "\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3396,56 +3442,56 @@ msgstr "" "firmata localmente con la tua chiave %08lX il %s\n" "\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " firmata da %08lX il %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revocata da %08lX il %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Stai per revocare queste firme:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " firmata da %08lX il %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Creare davvero i certificati di revoca? (s/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "manca la chiave segreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" è già stato revocato\n" @@ -3454,70 +3500,70 @@ msgstr "l'user ID \"%s\" è già stato rev #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Politica critica di firma: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Politica di firma: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "ATTENZIONE: trovati dati di una nota non validi\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Annotazione critica della firma: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Annotazione della firma: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "non leggibile" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Portachiavi" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr "[scadenza: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Impronta digitale della chiave primaria:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Impronta digitale della sottochiave:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Impronta digitale della chiave primaria:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Impronta digitale della sottochiave:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Impronta digitale =" @@ -3601,101 +3647,110 @@ msgstr "NOTA: il mittente ha richiesto \ msgid "original file name='%.*s'\n" msgstr "nome del file originale='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Nota: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Policy: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verifica della firma soppressa\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "impossibile gestire queste firme multiple\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Non è disponibile un aiuto" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Firma scaduta da \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Firma valida da \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incerta]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "Firma %s da: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "versione sconosciuta" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "non è una firma separata\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "firma solitaria di classe 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "firma vecchio stile (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "individuato un pacchetto radice non valido in proc_tree()\n" @@ -3723,75 +3778,80 @@ msgstr "" "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea." "html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d \"%s\" è una opzione deprecata\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "usa al suo posto \"%s%s\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "questo messaggio può non essere utilizzabile da %s\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non è disponibile in questa sessione\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "impossibile impostare il pid del client dell'agent\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "impossibile ottenere il FD di lettura dell'agent\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "impossibile ottenere il FD di scrittura dell'agent\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versione %d del protocollo di gpg-agent non è gestita\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (key ID principale %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3802,32 +3862,32 @@ msgstr "" "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Ripeti la passphrase\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Inserisci la passphrase\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "passphrase troppo lunga\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3837,20 +3897,20 @@ msgstr "" "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -3944,8 +4004,8 @@ msgid "failed sending to `%s': status=%u msgstr "invio a `%s' fallito: status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "questo keyserver non è completamente compatibile con HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3987,11 +4047,11 @@ msgstr "" "genero il checksum a 16 bit deprecato per la protezione della chiave " "segreta\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4000,17 +4060,17 @@ msgstr "" "chiave %08lX: questa è una chiave ElGamal generata da PGP che NON è sicura " "per le firme!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4019,7 +4079,7 @@ msgstr "" "la chiave %08lX è stata creata %lu secondo nel futuro (salto nel tempo\n" "o problema con l'orologio)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4028,55 +4088,60 @@ msgstr "" "la chiave %08lX è stata creata %lu secondi nel futuro (salto nel tempo\n" "o problema con l'orologio)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "chiave %08lX: non c'è una subchiave per il pacchetto di revoca della " "subchiave\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata " "inespansa.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4106,12 +4171,12 @@ msgstr "" "nella modalità --pgp2 puoi fare firme separate solo con chiavi in stile PGP " "2.x\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "impossibile creare %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4126,7 +4191,7 @@ msgid "you can only clearsign with PGP 2 msgstr "" "In modalità -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "sarà usato il cifrario %s\n" @@ -4141,12 +4206,12 @@ msgstr "impossibile gestire linee di tes msgid "input line longer than %d characters\n" msgstr "linea di input più lunga di %d caratteri\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseek fallita: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n" @@ -4155,122 +4220,122 @@ msgstr "trustdb rec %lu: scrittura falli msgid "trustdb transaction too large\n" msgstr "transazione del trustdb troppo grande\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: impossibile acedere a: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: la directory non esiste!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: impossibile creare il lock\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: impossibile creare il lock\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossibile creare: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: creazione del record della versione fallita: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: è stato creato un trustdb non valido\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: creato il trustdb\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: il trustdb non è scrivibile\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: trustdb non valido\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: creazione della tabella hash fallita: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, 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:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, 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:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "trustdb: lseek fallita: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "trustdb: read fallita (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: non è un file di trustdb\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: record di versione con recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versione %d del file non valida\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: errore durante la lettura del record libero: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: errore durante la scrittura del dir record: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: azzeramento di un record fallito: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: accodatura a un record fallita: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n" @@ -4320,39 +4385,39 @@ msgstr "trust record %lu, req type %d: w msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync fallita: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "controllo il trustdb\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "chiave pubblica %08lX non trovata: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" @@ -4360,7 +4425,7 @@ msgstr "chiave pubblica definitivamente #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "controllo al livello %d firmato=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4930,17 +4995,17 @@ msgstr "Per favore risolvete questo poss msgid "checking keyring `%s'\n" msgstr "controllo il portachiavi `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "Per ora sono state controllate %lu chiavi (%lu firme)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "Sono state controllate %lu chiavi (%lu firme)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: portachiavi creato\n" @@ -5045,7 +5110,7 @@ msgstr "ATTENZIONE: impossibile cancella msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "mai " @@ -5142,33 +5207,33 @@ msgstr "" "disponibili\n" "ad altri!\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Per favore scegli il motivo della revoca:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Cancella" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probabilmente volevi scegliere %d)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Motivo della revoca: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(Non è stata data una descrizione)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Va bene così? " @@ -5212,3 +5277,6 @@ msgstr "errore cercando il record della #, c-format msgid "read error: %s\n" msgstr "errore di lettura: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "questo keyserver non è completamente compatibile con HKP\n" diff -urpP gnupg-1.2.2/po/ja.po gnupg-1.2.3/po/ja.po --- gnupg-1.2.2/po/ja.po 2003-05-01 14:38:20.000000000 +0000 +++ gnupg-1.2.3/po/ja.po 2003-08-21 20:05:21.000000000 +0000 @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-23 09:37+0900\n" +"Project-Id-Version: gnupg 1.2.1\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-07 22:57+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "quit" @@ -214,7 +214,7 @@ msgstr "ͽ´ü¤»¤Ì¥Ç¡¼¥¿¤Ç¤¹" #: util/errors.c:93 msgid "timestamp conflict" -msgstr "ÆüÉÕ¤¬Ì·½â¤·¤Æ¤¤¤Þ¤¹" +msgstr "Æü»þ¤¬Ì·½â¤·¤Æ¤¤¤Þ¤¹" #: util/errors.c:94 msgid "unusable pubkey algorithm" @@ -275,62 +275,62 @@ msgstr "... ¥Ð¥°¤Ç¤¹ (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "¥¨¥ó¥È¥í¥Ô¡¼¼ý½¸¥â¥¸¥å¡¼¥ë¤¬¡¢¸¡½Ð¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "¡Ö%s¡×¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "¡Ö%s¡×¤ÏÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Ï¶õ¤Ç¤¹\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "·Ù¹ð: ̵¸ú¤Ê¥µ¥¤¥º¤Î random_seed ¥Õ¥¡¥¤¥ë - »È¤¤¤Þ¤»¤ó\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "¡Ö%s¡×¤òÆɤá¤Þ¤»¤ó: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¤·¤Þ¤»¤ó\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "¡Ö%s¡×¤Ë½ñ¤±¤Þ¤»¤ó: %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "¡Ö%s¡×¤òÊĤ¸¤é¤ì¤Þ¤»¤ó: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "·Ù¹ð: ·õÆݤÊÍð¿ôÀ¸À®»Ò¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -358,6 +358,11 @@ msgstr "" #: cipher/md.c:140 #, c-format msgid "digest algorithm `%s' is read-only in this release\n" +msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n" + +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" msgstr "" #: cipher/rndegd.c:204 @@ -366,8 +371,10 @@ msgid "" "keep you from getting bored, because it will improve the quality\n" "of the entropy.\n" msgstr "" +"Í𻨤µ¤ò¼ý½¸¤·¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£Í𻨤µ¤Î¼Á¤¬¸þ¾å\n" +"¤·¤Þ¤¹¤Î¤Ç¡¢¤â¤·Ë°¤­¤¿¤é²¿¤«ºî¶È¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -375,165 +382,165 @@ msgstr "" "@¥³¥Þ¥ó¥É:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "ʬΥ½ð̾¤òºîÀ®" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤ò°Å¹æ²½" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "Êݸ¤Î¤ß" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤òÉü¹æ" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "½ð̾¤ò¸¡¾Ú" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "¸°¤Î°ìÍ÷" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "¸°¤È½ð̾¤Î°ìÍ÷" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "¸°¤Î½ð̾¤ò¸¡ºº" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "ÈëÌ©¸°¤Î°ìÍ÷" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "¸ø³«¸°Îؤ«¤é¸°·²¤òºï½ü" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "ÈëÌ©¸°Îؤ«¤é¸°·²¤òºï½ü" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "¸°¤Ë½ð̾" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" -msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ë½ð̾" +msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ë½ð̾" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" -msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" +msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" -msgstr "ÇË´þ¾ÚÌÀ½ñ¤òÀ¸À®" +msgstr "¼º¸ú¾ÚÌÀ½ñ¤òÀ¸À®" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "¸°¤ò½ñ¤­½Ð¤¹" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸°¤ò¸¡º÷¤¹¤ë" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÁ´Éô¹¹¿·¤¹¤ë" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "¼êÅö¤Æ¤·¤Æ¤Ê¤¤¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "" "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n" "ÊñÁõ½üµî" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -543,177 +550,177 @@ msgstr "" "¥ª¥×¥·¥ç¥ó:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "" "|̾Á°|´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ\n" "¡Ö̾Á°¡×¤ò»ÈÍÑ" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "´ûÄê¤Î¼õ¼è¿Í¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n" "¤ò»ÈÍÑ" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n" "(0¤ÏÈó°µ½Ì)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "¾éĹ" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "¤ä¤äÀŤ«" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "üËö¤òÉÔ»ÈÍÑ" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "¶¯À©Åª¤Ëv3½ð̾" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "v3½ð̾¤ò¶¯À©¤·¤Ê¤¤" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "¶¯À©Åª¤Ëv4½ð̾" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "v4½ð̾¤ò¶¯À©¤·¤Ê¤¤" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "°Å¹æ²½¤Ë¤ÏÀäÂФËMDC¤ò»ÈÍѤ·¤Ê¤¤" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "̵Êѹ¹" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "¾å½ñ¤­Á°¤Ë³Îǧ" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "gpg¥¨¡¼¥¸¥§¥ó¥È¤ò»ÈÍÑ" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "" "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n" "¤È¤ß¤Ê¤¹" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "" "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n" "¤È¤ß¤Ê¤¹" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "°ìÍ÷¤Î¸°¤¬¤¢¤ë¸°Îؤòɽ¼¨" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "" "|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n" "¡Ö̾Á°¡×¤ò»ÈÍÑ" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "" "|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n" "¤ËÀßÄê" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "" "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n" "Æɤ߹þ¤à" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "" "|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n" "½ñ¤­½Ð¤¹" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "" "|¥Õ¥¡¥¤¥ë|¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤ò¥Õ¥¡¥¤¥ë¤Ë\n" "½ñ¤­½Ð¤¹" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|¸°ID|¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "" "|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n" "Æɤ߹þ¤à" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "" "RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n" "»ÈÍÑ" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n" "¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n" @@ -773,7 +780,7 @@ msgstr "" "¥Õ¥©¥ÈID¤ò±ÜÍ÷¤¹¤ë¥³¥Þ¥ó¥É¹Ô\n" "¤òÀßÄê" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -782,7 +789,7 @@ msgstr "" "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n" "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -802,15 +809,15 @@ msgstr "" " --list-keys [̾Á°] ¸°¤òɽ¼¨\n" " --fingerprint [̾Á°] »ØÌæ¤òɽ¼¨\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -820,7 +827,7 @@ msgstr "" "½ð̾¡¢¸¡ºº¡¢°Å¹æ²½¤äÉü¹æ\n" "´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -828,357 +835,390 @@ msgstr "" "\n" "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "¸ø³«¸°: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "°Å¹æ: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "¥Ï¥Ã¥·¥å: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "°µ½Ì: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "=µ­¹æ¤¬¡¢¥°¥ë¡¼¥×ÄêµÁ¡Ö%s¡×Æâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Ãí°Õ: ÀΡ¢´ûÄê¤À¤Ã¤¿¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Ï¡¢Ìµ»ë¤µ¤ì¤Þ¤¹\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×: %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æ³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURI¤ò²òÀÏÉÔǽ\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æ¤¬É¬ÍפǤ¹ \n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢%s¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "̵¸ú¤Êdefault-check-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæ¤ÎÁª¹¥\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" "Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤òÍѤ¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "¥æ¡¼¥¶¡¼Ãí¼á̾¤Ï¡¢'@'ʸ»ú¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" #: g10/gpgv.c:68 -#, fuzzy msgid "take the keys from this keyring" -msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹" #: g10/gpgv.c:70 -#, fuzzy msgid "make timestamp conflicts only a warning" -msgstr "ÆüÉÕ¤¬Ì·½â¤·¤Æ¤¤¤Þ¤¹" +msgstr "Æü»þ¤ÎÌ·½â¤ò·Ù¹ð¤À¤±¤Ë¤·¤Þ¤¹" #: g10/gpgv.c:99 -#, fuzzy msgid "Usage: gpgv [options] [files] (-h for help)" -msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)" +msgstr "»È¤¤Êý: gpgv [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)" #: g10/gpgv.c:102 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" +"¹½Ê¸: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" +"¿®ÍѤ·¤¿¸°¤Ç½ð̾¤ò¸¡ºº\n" #: g10/armor.c:321 #, c-format @@ -1277,11 +1317,11 @@ msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó #: g10/pkclist.c:75 msgid "reason for revocation: " -msgstr "ÇË´þÍýͳ: " +msgstr "¼º¸úÍýͳ: " #: g10/pkclist.c:92 msgid "revocation comment: " -msgstr "ÇË´þ¤ÎŬÍ×: " +msgstr "¼º¸ú¤ÎŬÍ×: " #. a string with valid answers #: g10/pkclist.c:254 @@ -1297,7 +1337,7 @@ msgstr "" "¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ÊÌ̾ \"" @@ -1354,7 +1394,7 @@ msgstr " s = ¤³¤Î¸°¤Ï¤È¤Ð¤¹\n" msgid " q = quit\n" msgstr " q = ½ªÎ»\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "¤¢¤Ê¤¿¤Î·èÄê¤Ï? " @@ -1369,7 +1409,7 @@ msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤Ø¤Î¾ÚÌÀ½ñ:\n" #: g10/pkclist.c:436 #, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "¸°%08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" +msgstr "¸°%08lX: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹!\n" #: g10/pkclist.c:443 g10/pkclist.c:455 g10/pkclist.c:555 msgid "Use this key anyway? " @@ -1378,7 +1418,7 @@ msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? " #: g10/pkclist.c:448 #, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "¸°%08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" +msgstr "¸°%08lX: Éû¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹!\n" #: g10/pkclist.c:469 #, c-format @@ -1431,7 +1471,7 @@ msgstr "·Ù¹ð: ¿®ÍѤǤ­¤Ê¤¤¸°¤òÍѤ¤¤Æ¤¤¤Þ #: g10/pkclist.c:605 msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:606 msgid " This could mean that the signature is forgery.\n" @@ -1439,7 +1479,7 @@ msgstr " ½ð̾¤¬µ¶Êª¤Ê¤³¤È¤â¤¢¤ë¡¢¤È #: g10/pkclist.c:612 msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤ÏËܿͤˤè¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:617 msgid "Note: This key has been disabled.\n" @@ -1527,91 +1567,91 @@ msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍÑ¶Ø»ß¤Ç msgid "no valid addressees\n" msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "Áª¹¥%c%lu¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "Áª¹¥%c%lu¤Î½ÅÊ£\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "¿¤¹¤®¤ë¡Ö%c¡×Áª¹¥\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "ľÀܽð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "¸°Âбþ¤Ø¤Î½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA¤ÈElGamal (´ûÄê)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (½ð̾¤Î¤ß)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (½ð̾¤Î¤ß)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (½ð̾¤È°Å¹æ²½)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1622,15 +1662,15 @@ msgstr "" "¤Þ¤¿¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤ÏÈó¾ï¤ËÄ㮤ǡ¢Â¾¤ÎÁªÂò»è¤è¤ê¤â°ÂÁ´¤Ç\n" "¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "¤½¤ì¤Ç¤âºî¤ê¤Þ¤¹¤«? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1643,19 +1683,19 @@ msgstr "" " ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n" " ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n" @@ -1667,12 +1707,12 @@ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤ #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1680,11 +1720,11 @@ msgstr "" "2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n" "¿ä¾©¤·¤Þ¤»¤ó!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1692,17 +1732,17 @@ msgstr "" "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢\n" "¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1718,7 +1758,7 @@ msgstr "" " m = Í­¸ú´ü¸Â n ¤«·î´Ö\n" " y = Í­¸ú´ü¸Â n ǯ´Ö\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1734,30 +1774,30 @@ msgstr "" " m = Í­¸ú´ü¸Â n ¤«·î´Ö\n" " y = Í­¸ú´ü¸Â n ǯ´Ö\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "½ð̾¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "̵¸ú¤ÊÃÍ\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1765,11 +1805,11 @@ msgstr "" "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n" "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1785,44 +1825,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "ËÜ̾: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "¥³¥á¥ó¥È: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1833,27 +1873,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1861,16 +1901,16 @@ msgstr "" "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1882,7 +1922,7 @@ msgstr "" "¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1893,53 +1933,53 @@ msgstr "" "¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n" "Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "¡Ö%s¡×¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸ø³«¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤ÊÈëÌ©¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "¸ø³«¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "ÈëÌ©¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤È¤·¤Æµ­Ï¿¤·¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1947,42 +1987,42 @@ msgstr "" "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n" "¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "Ãí°Õ: v3¸°¤ÎÉû¸°¤ÎºîÀ®¤Ï¡¢OpenPGP¤ËŬ¹ç¤·¤Þ¤»¤ó\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: ³«¤±¤Þ¤»¤ó: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n" @@ -1991,17 +2031,17 @@ msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "S2K¥â¡¼¥É¤Î¤¿¤á¡¢ÂоÎESK¥Ñ¥±¥Ã¥È¤ò»È¤¨¤Þ¤»¤ó\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s'¤Ï´û¤Ë°µ½ÌºÑ¤ß¤Ç¤¹\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï2048¥Ó¥Ã¥È°Ê²¼¤ÎRSA¸°¤Ç°Å¹æ²½¤·¤«¤Ç¤­¤Þ¤»¤ó\n" @@ -2015,7 +2055,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "°Å¹æ²½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤ÏÁ´ÉôIDEA°Å¹æ¤ò»È¤¨¤Þ¤»¤ó¡£\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "ÂоΰŹ楢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" @@ -2030,457 +2070,447 @@ msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤ msgid "you may not use %s while in %s mode\n" msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "¸° %08lX: PGP 2.x·Á¼°¤Î¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "·Ù¹ð: ÈëÌ©¸°%08lX¤Ë¤Ï¡¢Ã±½ã¤ÊSK¥Á¥§¥Ã¥¯¥µ¥à¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%08lX¤Ç¤¹\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸°¡Ö%s¡×¤¬¤¢¤ê¤Þ¤¹!\n" +msgstr "¸ø³«Éû¸°%08lX¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "¥¿¥¤¥×%d¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu¸°¤Þ¤Ç½èÍý\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr " ½èÍý¿ô¤Î¹ç·×: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ¥¹¥­¥Ã¥×¤·¤¿¿·¤·¤¤¸°: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ¥æ¡¼¥¶¡¼ID¤Ê¤·: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " Æɹþ¤ß: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " Êѹ¹¤Ê¤·: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " ¿·¤·¤¤¥æ¡¼¥¶¡¼ID: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " ¿·¤·¤¤Éû¸°: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " ¿·¤·¤¤½ð̾: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" -msgstr " ¿·¤·¤¤¸°¤ÎÇË´þ: %lu\n" +msgstr " ¿·¤·¤¤¸°¤Î¼º¸ú: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " ÈëÌ©¸°¤ÎÆɽФ·: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " ̤Æɹþ¤ß: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "Ãí°Õ: ElGamal¤Î¼ç¸°¤ò¸¡½Ð - ±ý¡¹¤Ë¤·¤ÆÆɹþ¤ß¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "¸°%08lX: HKP¤ÎÉû¸°ÊѤ¤ò½¤Éü\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "¸°%08lX: Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "¡Ö%s¡×¤Ø¤Î½ñ½Ð¤·\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "¸°%08lX: ¸ø³«¸°¡Ö%s¡×¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤½ð̾¤ò1¸Ä\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤½ð̾¤ò%d¸Ä\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤Éû¸°¤ò1¸Ä\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤Éû¸°¤ò%d¸Ä\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "¸°%08lX: ¡Ö%s¡×Êѹ¹¤Ê¤·\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "¸°%08lX: ̵¸ú¤Ê°Å¹æ%d¤ÎÈëÌ©¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "´ûÄê¤ÎÈëÌ©¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" -msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¼º¸ú¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈÝ\n" +msgstr "¸°%08lX: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - µñÈÝ\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" -msgstr "¸°%08lX: \"%s\" ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%08lX: ¡Ö%s¡×¼º¸ú¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Î¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Î¼«¸Ê½ð̾¤¬¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "¸°%08lX: ¿½ÅÉû¸°¤ÎÂбþ¤òºï½ü¤·¤Þ¤¹\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" -msgstr "¸°%08lX: ¸°ÇË´þ¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¸°¼º¸ú¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°ÇË´þ¤Ç¤¹\n" +msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¼º¸ú¤Ç¤¹\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÇË´þ¤òºï½ü¤·¤Þ¤¹\n" +msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤Î¼º¸ú¤òºï½ü¤·¤Þ¤¹\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ¼º¸ú¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "¸°%08lX: Éû¸°½ð̾¤Î¾ì½ê¤¬¡¢¸í¤Ã¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "¸°%08lX: ͽ´ü¤»¤Ì½ð̾¥¯¥é¥¹ (0x%02X) - ¥¹¥­¥Ã¥×\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" -msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤Î°ú¤­½Ð¤·\n" +msgstr "·Ù¹ð: ¸°%08lX¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%08lX¤Î°ú¤­½Ð¤·\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" -msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤ÏÉԺߡ£\n" +msgstr "·Ù¹ð: ¸°%08lX¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%08lX¤ÏÉԺߡ£\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" -msgstr "¸°%08lX: \"%s\" ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n" +msgstr "¸°%08lX: ¡Ö%s¡×¼º¸ú¾ÚÌÀ½ñ¤ÎÄɲÃ\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "¸°%08lX: ľÀܸ°½ð̾¤òÄɲÃ\n" #: g10/keyedit.c:149 msgid "[revocation]" -msgstr "[ÇË´þ]" +msgstr "[¼º¸ú]" #: g10/keyedit.c:150 msgid "[self-signature]" msgstr "[¼«¸Ê½ð̾]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "̵¸ú¤Ê½ð̾1¸Ä\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "¸°¤¬¤Ê¤¤¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡ºº¤·¤Þ¤»¤ó\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "¸°¤¬¤Ê¤¤¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡ºº¤·¤Þ¤»¤ó\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "¥¨¥é¡¼¤Î¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡ºº¤·¤Þ¤»¤ó\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "¥¨¥é¡¼¤Î¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡ºº¤·¤Þ¤»¤ó\n" @@ -2497,22 +2527,29 @@ msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò #: g10/keyedit.c:362 #, c-format msgid "User ID \"%s\" is revoked." -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢ÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" +msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " ½ð̾ÉÔǽ¡£\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2521,27 +2558,26 @@ msgstr "" "\"%s\" ¤Ë¤¿¤¤¤¹¤ë¼«¸Ê½ð̾¤Ï¡¢\n" "PGP 2.x·Á¼°¤Î½ð̾¤Ç¤¹¡£\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "OpenPGP¤Î¼«¸Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:424 -#, fuzzy, c-format +#: g10/keyedit.c:460 +#, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -"\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n" -"ÆâÉô½ð̾¤Ç¤¹¡£\n" +"¡Ö%s¡×¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n" +"´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" -#: g10/keyedit.c:428 -#, fuzzy +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (Y/n) " +msgstr "´ü¸ÂÀÚ¤ì½ð̾¤ò¿·¤·¤¤½ð̾¤È¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2550,54 +2586,53 @@ msgstr "" "\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n" "ÆâÉô½ð̾¤Ç¤¹¡£\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "½ñ½Ð¤·²Äǽ¤Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦ÆâÉô½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/keyedit.c:483 -#, fuzzy +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " -msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " +msgstr "¤½¤ì¤Ç¤â½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "¤³¤Î¸°¤Ï%s¤Ç´ü¸Â¤¬ÀÚ¤ì¤Þ¤¹¡£\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (Y/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x¸°¤ÇOpenPGP½ð̾¤¬¤Ç¤­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "¤³¤Î¸°¤ÏPGP 2.x¤Ç»ÈÍѤǤ­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2606,37 +2641,41 @@ msgstr "" "½ð̾¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤¬¼ÂºÝ¤Ë¾åµ­¤Î̾Á°¤Î¿Í¤Î¤â¤Î¤«¤É¤¦¤«¡¢¤É¤ÎÄøÅÙ\n" "Ãí°Õ¤·¤Æ¸¡¾Ú¤·¤Þ¤·¤¿¤«? Åú¤¬¤ï¤«¤é¤Ê¤±¤ì¤Ð¡¢¡Ö0¡×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Åú¤¨¤Þ¤»¤ó¡£%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (´ûÄê)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Á´Á³¡¢¸¡ºº¤·¤Æ¤¤¤Þ¤»¤ó¡£%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) °ì±þ¡¢¸¡ºº¤·¤Þ¤·¤¿¡£%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) ¤«¤Ê¤êÃí°Õ¤·¤Æ¸¡ºº¤·¤Þ¤·¤¿¡£%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2644,7 +2683,7 @@ msgstr "" "\n" "¼«¸Ê½ð̾¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2652,15 +2691,15 @@ msgstr "" "\n" "·Ù¹ð: ½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" "\n" -"·Ù¹ð: ½ð̾¤Ï¡¢ÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" +"·Ù¹ð: ½ð̾¤Ï¡¢¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2668,15 +2707,15 @@ msgstr "" "\n" "½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" msgstr "" "\n" -"½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" +"½ð̾¤Ï¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2684,7 +2723,7 @@ msgstr "" "\n" "¤³¤Î¸°¤ÏÁ´Á³¡¢¸¡ºº¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2692,7 +2731,7 @@ msgstr "" "\n" "¤³¤Î¸°¤Ï°ì±þ¡¢¸¡ºº¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2700,34 +2739,34 @@ msgstr "" "\n" "¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ¸¡ºº¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "¤³¤Î¸°¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2735,7 +2774,7 @@ msgstr "" "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2744,493 +2783,491 @@ msgstr "" "¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "Êݸ¤·¤Æ½ªÎ»" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "»ØÌæ¤òɽ¼¨" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "Éû¸°N¤ÎÁªÂò" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "½ð̾¤Î°ìÍ÷" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "¸°¤Ø½ð̾" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" -msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾" +msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" -msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" +msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "Éû¸°¤ÎÄɲÃ" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "Éû¸°¤Îºï½ü" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" -msgstr "ÇË´þ¸°¤ÎÄɲÃ" +msgstr "¼º¸ú¸°¤ÎÄɲÃ" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "½ð̾¤Îºï½ü" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" -msgstr "½ð̾¤ÎÇË´þ" +msgstr "½ð̾¤Î¼º¸ú" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" -msgstr "¥æ¡¼¥¶¡¼ID¤ÎÇË´þ" +msgstr "¥æ¡¼¥¶¡¼ID¤Î¼º¸ú" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" -msgstr "Éû¸°¤ÎÇË´þ" +msgstr "Éû¸°¤Î¼º¸ú" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "¥Õ¥©¥ÈID¤òɽ¼¨" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡Ö%s¡×¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "¥³¥Þ¥ó¥É> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." -msgstr "¸°¤ÏÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" +msgstr "¸°¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " -msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " -msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " -msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " -msgstr "¤³¤Î¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Í×Ìó: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "µ¡Ç½: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " -msgstr "¤³¤Î¸°¤Ï¡¢%s¸°¤Ë¤è¤Ã¤ÆÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹ " +msgstr "¤³¤Î¸°¤Ï¡¢%s¸°¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹ " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (¥Ç¥ê¥±¡¼¥È)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX ºîÀ®: %s ´ü¸Â: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " trust: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "rev! Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹: %s\n" +msgstr "rev! Éû¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" -msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤ÎÇË´þ¤òȯ¸«\n" +msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤Î¼º¸ú¤òȯ¸«\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "rev? ÇË´þ¸¡ºº¾ã³²: %s\n" +msgstr "rev? ¼º¸ú¸¡ºº¾ã³²: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revkey" +msgstr "[¼º¸ú] " -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expire" +msgstr "[Ëþλ] " -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3238,7 +3275,13 @@ msgstr "" "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n" "¤È¤¤¤¦¤³¤È¤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3247,131 +3290,129 @@ msgstr "" "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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 "" -"·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾ÇË´þ¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" +"·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾ÇË´þ¼Ô¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" +msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " -msgstr "»Ø̾ÇË´þ¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " +msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾ÇË´þ¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" #. This actually causes no harm (after all, a key that #. designates itself as a revoker is the same as a #. regular key), but it's easy enough to check. -#: g10/keyedit.c:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" -msgstr "»Ø̾ÇË´þ¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "»Ø̾ÇË´þ¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "»Ø̾ÇË´þ¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤷ¤Þ¤¹¤«? (y/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "¥æ¡¼¥¶¡¼ID: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3380,7 +3421,7 @@ msgstr "" "\"\n" "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3389,126 +3430,126 @@ msgstr "" "\"\n" "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤ËÆâÉôŪ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " -msgstr "¤½¤ì¤Ç¤âÇË´þ¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " +msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " -msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) " +msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " %08lX¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" -msgstr " %08lX¤Ç%s¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr " %08lX¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" -msgstr "¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" +msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " %08lX¤Ç%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (½ñ½Ð¤·ÉÔ²Ä)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " -msgstr "ÇË´þ¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N) " +msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¤â¤¦ÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #. Okay, this is a problem. The user ID selfsig was #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "%s¤ò¥µ¥¤¥º%ld¤Î¸°0x%08lX (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "¥¯¥ê¥Æ¥£¥«¥ë¤Ê½ð̾¥Ý¥ê¥·¡¼: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "½ð̾¥Ý¥ê¥·¡¼: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "¥¯¥ê¥Æ¥£¥«¥ë¤Ê½ð̾Ãí¼á: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "½ð̾Ãí¼á: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "¿Í¤Ë¤ÏÆɤá¤Þ¤»¤ó" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "¸°ÎØ" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [Í­¸ú´ü¸Â: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr "Éû¸°¤Î»ØÌæ:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " ¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Éû¸°¤Î»ØÌæ:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " »ØÌæ =" @@ -3592,101 +3633,108 @@ msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦ msgid "original file name='%.*s'\n" msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n" +msgstr "ÆÈΩ¼º¸ú¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Ãí¼á: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "¥Ý¥ê¥·¡¼: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "½ð̾¤Î¸¡¾Ú¤ò¾Êά\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "¤³¤Î¿½Å½ð̾¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "ÉÔÀµ¤Ê ½ð̾: \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾: \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Àµ¤·¤¤½ð̾: \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[ÉÔ³ÎÄê]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" +msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾ %s\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" +msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s½ð̾¡£½ð̾¼Ô: \"%s\"\n" +msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primary" +msgstr "¥Ð¥¤¥Ê¥ê¡¼" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "̤ÃΤΥС¼¥¸¥ç¥ó¤Ç¤¹" +msgstr "̤ÃΤÎ" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "ʬΥ½ð̾¤Ç¤¢¤ê¤Þ¤»¤ó\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "·Ù¹ð: ¿½Å½ð̾¤Î¸¡½Ð¡£ºÇ½é¤Î¤â¤Î¤À¤±¸¡ºº¤·¤Þ¤¹¡£\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n" @@ -3714,75 +3762,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "¾ÜºÙ¤Ï¡¢http://www.gnupg.org/why-not-idea.html¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¡Ö%s¡×\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "·Ù¹ð: ¡Ö%s¡×¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "¡Ö%s%s¡×¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢%s¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg¥¨¡¼¥¸¥§¥ó¥È¤Ï̵¸ú¤Ç¤¹\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Î¥¯¥é¥¤¥¢¥ó¥Èpid¤òÀßÄê¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼ÆɽФ·FD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼½ñ¹þ¤ßFD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (¼ç¸°ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3793,32 +3846,32 @@ msgstr "" "\"%.*s\"\n" "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹²á¤®¤Þ¤¹\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3828,20 +3881,20 @@ msgstr "" "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -3907,7 +3960,7 @@ msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤ #: g10/pubkey-enc.c:249 msgid "NOTE: key has been revoked" -msgstr "Ãí°Õ: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹" +msgstr "Ãí°Õ: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹" #: g10/hkp.c:71 #, c-format @@ -3935,8 +3988,8 @@ msgid "failed sending to `%s': status=%u msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "¤³¤Î¸°¥µ¡¼¥Ð¡¼¤Ë¤Ï¡¢´°Á´¤ÊHKP¸ß´¹À­¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3974,11 +4027,11 @@ msgstr "·Ù¹ð: ¼å¤¤¸°¤ò¸¡½Ð¤·¤Þ¤·¤¿¡£¥Ñ¥¹ msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "ÌäÂê»ë¤µ¤ì¤¿16¥Ó¥Ã¥È¤Î¥Á¥§¥Ã¥¯¥µ¥à¤òÈëÌ©¸°¤ÎÊݸî¤ËÀ¸À®\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "·Ù¹ð: ½ð̾¤ÎÍ×Ì󤬡¢¥á¥Ã¥»¡¼¥¸¤ÈÌ·½â¤·¤Þ¤¹\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -3987,70 +4040,72 @@ msgstr "" "¸°%08lX: ¤³¤ì¤Ï¡¢PGP¤ÎÀ¸À®¤·¤¿ElGamal¤Ç¤¹¡£\n" "½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "¸ø³«¸°%08lX¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "¸ø³«¸°%08lX¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " "problem)\n" msgstr "¸°%08lX¤Ï¡¢%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " "problem)\n" msgstr "¸°%08lX¤Ï¡¢%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "Ãí°Õ: ½ð̾¸°%08lX¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤Ë¤è¤ê¡¢¸°%08lX¤Î½ð̾¤òÉÔÀµ¤È¤ß¤Ê¤·¤Þ¤¹\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" -msgstr "¸°%08lX: ¸°ÇË´þ¥Ñ¥±¥Ã¥È¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¸°¼º¸ú¥Ñ¥±¥Ã¥È¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾ÇË´þ¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "Ãí¼á¥Ç¡¼¥¿¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾ÇË´þ¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "Ãí¼á¥Ç¡¼¥¿¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3¸°½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "·Ù¹ð: ɽµ­¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Èó³ÈÄ¥¤ò»ÈÍÑ¡£\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾ÇË´þ¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¥Ý¥ê¥·¡¼URL¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "" +msgstr "¥Ý¥ê¥·¡¼URL¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3¸°½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4075,12 +4130,12 @@ msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï¡¢PGP 2.x·Á¼°¤Î¸°¤ÇʬΥ½ð̾¤Ç¤­¤ë¤À¤±¤Ç¤¹\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" @@ -4093,7 +4148,7 @@ msgstr "½ð̾:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¥¯¥ê¥¢½ð̾¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s°Å¹æ²½¤ò»ÈÍѤ·¤Þ¤¹\n" @@ -4108,12 +4163,12 @@ msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»È msgid "input line longer than %d characters\n" msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n" @@ -4122,122 +4177,122 @@ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ msgid "trustdb transaction too large\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: ¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤¢¤ê¤Þ¤»¤ó!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: ̵¸ú¤Ê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤òºîÀ®\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¤Ç¤­¤Þ¤·¤¿\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "·Ù¹ð: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ̵¸ú¤Ê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ%luÈ֤ΥС¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: ¥ì¥³¡¼¥É¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ögpg --fix-trustdb¡×¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" @@ -4287,39 +4342,38 @@ msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥¿¥¤¥×%d: ½ñ¹þ¤ msgid "trustdb: sync failed: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¼¡²ó¤Î¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "¸ø³«¸°%08lX¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%08lX¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%08lX¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" @@ -4327,7 +4381,7 @@ msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%08lX¤Î¸ø³«¸°¤ #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "¿¼¤µ%d¤Ç¸¡ºº¡¢½ð̾ºÑ¤ß=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4504,7 +4558,7 @@ msgstr "" #: g10/helptext.c:60 msgid "If you want to use this revoked key anyway, answer \"yes\"." -msgstr "¤³¤ÎÇË´þ¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" +msgstr "¤³¤Î¼º¸ú¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:64 msgid "If you want to use this untrusted key anyway, answer \"yes\"." @@ -4757,7 +4811,7 @@ msgid "" "self-signatures will be advanced by one second.\n" msgstr "" "Á´Éô (¤Þ¤¿¤ÏÁªÂò¤·¤¿) ¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤ò¡¢¸½ºß¤ÎÁª¹¥°ìÍ÷¤ËÊѹ¹\n" -"¤·¤Þ¤¹¡£´Ø·¸¤¹¤ë¼«¸Ê½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¢1É乤¹¤ß¤Þ¤¹¡£\n" +"¤·¤Þ¤¹¡£´Ø·¸¤¹¤ë¼«¸Ê½ð̾¤ÎÆü»þ¤Ï¡¢1É乤¹¤ß¤Þ¤¹¡£\n" #: g10/helptext.c:244 msgid "Please enter the passhrase; this is a secret sentence \n" @@ -4818,7 +4872,7 @@ msgid "" "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" -"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼ÇË´þ¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë¥Æ\n" +"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼¼º¸ú¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë¥Æ\n" "¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n" @@ -4869,17 +4923,17 @@ msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ msgid "checking keyring `%s'\n" msgstr "¸°ÎØ¡Ö%s¡×¤ò¸¡ºº¤·¤Æ¤¤¤Þ¤¹\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "¤³¤ì¤Þ¤Ç¤Ë%lu¸Ä¤Î¸°¤Þ¤Ç¸¡ºº (%lu¸Ä¤Î½ð̾)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¸¡ºº (%lu¸Ä¤Î½ð̾)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n" @@ -4892,169 +4946,168 @@ msgid "" "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" msgstr "" +"\n" +"¤¢¤Ê¤¿¤Î¥Õ¥©¥ÈID¤Ë»È¤¦²èÁü¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£²èÁü¤ÏJPEG¥Õ¥¡¥¤¥ë¤Ç¤¢¤ëɬ\n" +"Íפ¬¤¢¤ê¤Þ¤¹¡£²èÁü¤Ï¸ø³«¸°¤È¤¤¤Ã¤·¤ç¤Ë³ÊǼ¤µ¤ì¤ë¡¢¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª\n" +"¤¤¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£¤â¤·Â礭¤Ê¼Ì¿¿¤ò»È¤¦¤È¡¢¤¢¤Ê¤¿¤Î¸°¤âƱÍͤËÂ礭¤¯¤Ê¤ê\n" +"¤Þ¤¹! ¤¯¤é¤¤¤Ë¤ª¤µ¤Þ¤ëÂ礭¤µ¤Î²èÁü¤Ï¡¢»È¤¤¤è¤¤¤Ç¤·¤ç¤¦¡£\n" #: g10/photoid.c:79 msgid "Enter JPEG filename for photo ID: " -msgstr "" +msgstr "¥Õ¥©¥ÈIDÍѤÎJPEG¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " #: g10/photoid.c:87 -#, fuzzy, c-format +#, c-format msgid "Unable to open photo \"%s\": %s\n" -msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" +msgstr "¼Ì¿¿¤ò¡Ö%s¡×¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/photoid.c:97 -#, fuzzy msgid "Are you sure you want to use it (y/N)? " -msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " +msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë»ÈÍѤ·¤¿¤¤¤Ç¤¹¤« (y/N)? " #: g10/photoid.c:112 -#, fuzzy, c-format +#, c-format msgid "\"%s\" is not a JPEG file\n" -msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¡Ö%s¡×¤Ï¡¢JPEG¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/photoid.c:129 -#, fuzzy msgid "Is this photo correct (y/N/q)? " -msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? " +msgstr "¤³¤Î¼Ì¿¿¤ÏÀµ¤·¤¤¤Ç¤¹¤« (y/N/q)? " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" +msgstr "¥Õ¥©¥ÈID¤¬É½¼¨ÉÔǽ!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" -msgstr "" +msgstr "±ó³Ö¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤Ï¡¢¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/exec.c:184 -#, fuzzy, c-format +#, c-format msgid "can't create directory `%s': %s\n" -msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/exec.c:325 msgid "" "external program calls are disabled due to unsafe options file permissions\n" msgstr "" +"¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¤Îµö²Ä¥â¡¼¥É¤¬¡¢°ÂÁ´¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢\n" +"³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ï¡¢»ÈÍѶػߤǤ¹¡£\n" #: g10/exec.c:355 msgid "this platform requires temp files when calling external programs\n" msgstr "" +"¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤À¤È¡¢³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ë¤Ï¡¢°ì»þ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹\n" #. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 -#, fuzzy, c-format +#, c-format msgid "unable to execute %s \"%s\": %s\n" -msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" +msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó %s \"%s\": %s\n" #: g10/exec.c:513 -#, fuzzy, c-format +#, c-format msgid "system error while calling external program: %s\n" -msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" +msgstr "³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ç¥·¥¹¥Æ¥à¡¦¥¨¥é¡¼: %s\n" #: g10/exec.c:524 g10/exec.c:583 msgid "unnatural exit of external program\n" -msgstr "" +msgstr "³°Éô¥×¥í¥°¥é¥à¤¬¡¢ÉÔ¼«Á³¤Ë½ªÎ»\n" #: g10/exec.c:539 -#, fuzzy msgid "unable to execute external program\n" -msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" +msgstr "³°Éô¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" #: g10/exec.c:548 -#, fuzzy, c-format +#, c-format msgid "unable to read external program response: %s\n" -msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" +msgstr "³°Éô¥×¥í¥°¥é¥à¤Î±þÅú¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" #: g10/exec.c:594 g10/exec.c:601 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "" +msgstr "·Ù¹ð: °ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Þ¤»¤ó (%s) `%s': %s\n" #: g10/exec.c:606 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" +msgstr "·Ù¹ð: °ì»þ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " -msgstr "" +msgstr "̵´ü¸Â " #: g10/revoke.c:92 msgid "key incomplete\n" -msgstr "" +msgstr "ÉÔ´°Á´¤Ê¸°\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 #: g10/revoke.c:186 g10/revoke.c:568 -#, fuzzy, c-format +#, c-format msgid "build_packet failed: %s\n" -msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "build_packet ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/revoke.c:145 -#, fuzzy, c-format +#, c-format msgid "key %08lX incomplete\n" -msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ÉÔ´°Á´\n" #: g10/revoke.c:214 g10/revoke.c:433 -#, fuzzy msgid "sorry, can't do this in batch mode\n" -msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" #: g10/revoke.c:281 msgid "To be revoked by:\n" -msgstr "" +msgstr "¼º¸ú¼Ô:\n" #: g10/revoke.c:293 msgid "(This is a sensitive revocation key)\n" -msgstr "" +msgstr "(¤³¤ì¤Ï¡¢¥Ç¥ê¥±¡¼¥È¤Ê¼º¸ú¸°¤Ç¤¹)\n" #: g10/revoke.c:297 g10/revoke.c:503 -#, fuzzy msgid "Create a revocation certificate for this key? " -msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) " +msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? " #: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "" +msgstr "ASCIIÊñÁõ½ÐÎϤò¶¯À©¤·¤Þ¤¹¡£\n" #: g10/revoke.c:324 g10/revoke.c:548 -#, fuzzy, c-format +#, c-format msgid "make_keysig_packet failed: %s\n" -msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "make_keysig_packet ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #. and issue a usage notice #: g10/revoke.c:387 -#, fuzzy msgid "Revocation certificate created.\n" -msgstr "¸°%08lX: \"%s\" ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n" +msgstr "¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¡£\n" #: g10/revoke.c:393 #, c-format msgid "no revocation keys found for `%s'\n" -msgstr "" +msgstr "¡Ö%s¡×ÍѤμº¸ú¸°¤Ï¡¢¤¢¤ê¤Þ¤»¤ó\n" #: g10/revoke.c:447 -#, fuzzy, c-format +#, c-format msgid "secret key `%s' not found: %s\n" -msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "ÈëÌ©¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/revoke.c:485 -#, fuzzy, c-format +#, c-format msgid "no corresponding public key: %s\n" -msgstr "¡Ö%s¡×¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "Âбþ¤¹¤ë¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó: %s\n" #: g10/revoke.c:496 msgid "public key does not match secret key!\n" -msgstr "" +msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬¾È¹ç¤·¤Þ¤»¤ó!\n" #: g10/revoke.c:519 -#, fuzzy msgid "unknown protection algorithm\n" -msgstr "̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" +msgstr "̤ÃΤÎÊݸ¥ë¥´¥ê¥º¥à¤Ç¤¹\n" #: g10/revoke.c:523 -#, fuzzy msgid "NOTE: This key is not protected!\n" -msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" +msgstr "Ãí°Õ: ¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" #. and issue a usage notice #: g10/revoke.c:574 @@ -5067,41 +5120,43 @@ msgid "" "your media become unreadable. But have some caution: The print system of\n" "your machine might store the data and make it available to others!\n" msgstr "" +"¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤·¤¿¡£\n" +"\n" +"¸«¤Ä¤«¤é¤Ê¤¤¤è¤¦¤ÊÇÞÂΤ˰ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¥ï¥ë¤¬¤³¤Î¾ÚÌÀ½ñ¤Ø¤Î¥¢\n" +"¥¯¥»¥¹¤òÆÀ¤ë¤È¡¢¤½¤¤¤Ä¤¬¤¢¤Ê¤¿¤Î¾ÚÌÀ½ñ¤ò»È¤¨¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" +"ÇÞÂΤ¬ÆɽФ·ÉÔǽ¤Ë¤Ê¤Ã¤¿¾ì¹ç¤ËÈ÷¤¨¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò°õºþ¤·¤ÆÊݴɤ¹¤ë¤Î\n" +"¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n" +"¤À¤ì¤Ç¤â¸«¤¨¤ë¾ì½ê¤Ë¥Ç¡¼¥¿¤ò¤ª¤¯¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/revoke.c:614 -#, fuzzy +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" -msgstr "ÇË´þÍýͳ: " +msgstr "¼º¸ú¤ÎÍýͳ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" -msgstr "" +msgstr "¥­¥ã¥ó¥»¥ë" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "" +msgstr "(¤³¤³¤Ç¤Ï¤­¤Ã¤È%d¤òÁª¤Ó¤Þ¤¹)\n" -#: g10/revoke.c:667 -#, fuzzy +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "" -"\n" -"¥æ¡¼¥¶¡¼ID¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»: " +msgstr "ͽÈ÷¤ÎÀâÌÀ¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»:\n" -#: g10/revoke.c:695 -#, fuzzy, c-format +#: g10/revoke.c:696 +#, c-format msgid "Reason for revocation: %s\n" -msgstr "ÇË´þÍýͳ: " +msgstr "¼º¸úÍýͳ: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" -msgstr "" +msgstr "(ÀâÌÀ¤Ï¤¢¤ê¤Þ¤»¤ó)\n" -#: g10/revoke.c:702 -#, fuzzy +#: g10/revoke.c:703 msgid "Is this okay? " -msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? " +msgstr "¤è¤í¤·¤¤¤Ç¤¹¤«? " #: g10/tdbdump.c:104 #, c-format @@ -5109,38 +5164,46 @@ msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" +"# Sitei sareta sin'you no atai itiran %s\n" +"# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n" #: g10/tdbdump.c:140 -#, fuzzy, c-format +#, c-format msgid "can't open file: %s\n" -msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s\n" #: g10/tdbdump.c:151 -#, fuzzy msgid "line too long\n" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹²á¤®¤Þ¤¹\n" +msgstr "¹Ô¤¬Ä¹²á¤®¤Þ¤¹\n" #: g10/tdbdump.c:159 msgid "error: missing colon\n" -msgstr "" +msgstr "¥¨¥é¡¼: ¥³¥í¥ó¤¬È´¤±¤Æ¤¤¤Þ¤¹\n" #: g10/tdbdump.c:164 -#, fuzzy msgid "error: invalid fingerprint\n" -msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d\n" +msgstr "¥¨¥é¡¼: ̵¸ú¤Ê»ØÌæ\n" #: g10/tdbdump.c:168 -#, fuzzy msgid "error: no ownertrust value\n" -msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹" +msgstr "¥¨¥é¡¼: ½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤ¬¤¢¤ê¤Þ¤»¤ó\n" #. error #: g10/tdbdump.c:204 -#, fuzzy, c-format +#, c-format msgid "error finding trust record: %s\n" -msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É¤Î¸¡º÷¥¨¥é¡¼: %s\n" #: g10/tdbdump.c:208 -#, fuzzy, c-format +#, c-format msgid "read error: %s\n" -msgstr "ÊñÁõ: %s\n" +msgstr "Æɹþ¤ß¥¨¥é¡¼: %s\n" + +#, fuzzy +#~ msgid "The use of this algorithm is deprecated - create anyway? " +#~ msgstr "" +#~ "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +#~ "¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "¤³¤Î¸°¥µ¡¼¥Ð¡¼¤Ë¤Ï¡¢´°Á´¤ÊHKP¸ß´¹À­¤¬¤¢¤ê¤Þ¤»¤ó\n" diff -urpP gnupg-1.2.2/po/nl.po gnupg-1.2.3/po/nl.po --- gnupg-1.2.2/po/nl.po 2003-05-01 14:38:21.000000000 +0000 +++ gnupg-1.2.3/po/nl.po 2003-08-21 20:05:22.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2000-02-20 21:30+01:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" @@ -48,7 +48,7 @@ msgstr "nee" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "einde" @@ -276,63 +276,63 @@ msgstr "... dit is een programmeerfout ( msgid "you found a bug ... (%s:%d)\n" msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "kan `%s' niet openen: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, fuzzy, c-format msgid "can't stat `%s': %s\n" msgstr "kan `%s' niet openen: %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "" -#: cipher/random.c:401 +#: cipher/random.c:407 #, fuzzy msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "LET OP: ongeldige aantekeningen gevonden\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, fuzzy, c-format msgid "can't read `%s': %s\n" msgstr "kan `%s' niet openen: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "kan %s niet aanmaken: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, fuzzy, c-format msgid "can't write `%s': %s\n" msgstr "kan `%s' niet openen: %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, fuzzy, c-format msgid "can't close `%s': %s\n" msgstr "kan `%s' niet openen: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -363,6 +363,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -370,7 +375,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -378,170 +383,170 @@ msgstr "" "@Opdrachten:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[bestand]|maak een ondertekening" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[bestand]|maak een niet versleutelde ondertekening" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "maak een losstaande ondertekening" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "versleutel gegevens" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "versleutel slechts met een symmetrische versleutelmethode" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "alleen bewaren" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "gegevens decoderen (standaard)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "ondertekening controleren" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "lijst van sleutels genereren" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "sleutels en ondertekeningen opnoemen" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "sleutelverificaties controleren" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "sleutels en vingerafdrukken opnoemen" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "geheime sleutels opnoemen" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "nieuw sleutelpaar genereren" -#: g10/g10.c:327 +#: g10/g10.c:325 #, fuzzy msgid "remove keys from the public keyring" msgstr "sleutel weghalen uit de publieke sleutelbos" -#: g10/g10.c:329 +#: g10/g10.c:327 #, fuzzy msgid "remove keys from the secret keyring" msgstr "sleutel weghalen uit de geheime sleutelbos" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "onderteken een sleutel" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "onderteken een sleutel lokaal" -#: g10/g10.c:332 +#: g10/g10.c:330 #, fuzzy msgid "sign a key non-revocably" msgstr "onderteken een sleutel lokaal" -#: g10/g10.c:333 +#: g10/g10.c:331 #, fuzzy msgid "sign a key locally and non-revocably" msgstr "onderteken een sleutel lokaal" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "onderteken of bewerk een sleutel" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "genereer een terugtrekkings-certificaat" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exporteer sleutels" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exporteer sleutels naar een sleutelserver" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importeer sleutels van een sleutelserver" -#: g10/g10.c:341 +#: g10/g10.c:339 #, fuzzy msgid "search for keys on a key server" msgstr "exporteer sleutels naar een sleutelserver" -#: g10/g10.c:343 +#: g10/g10.c:341 #, fuzzy msgid "update all keys from a keyserver" msgstr "importeer sleutels van een sleutelserver" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "sleutels importeren/samenvoegen" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "noem alleen de volgorde van pakketten" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exporteer het vertrouwen in de eigenaars" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importeer het vertrouwen in de eigenaars" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "werk de vertrouwensdatabase bij" -#: g10/g10.c:357 +#: g10/g10.c:355 #, fuzzy msgid "unattended trust database update" msgstr "werk de vertrouwensdatabase bij" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "repareer een beschadigde vertrouwensdatabase" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Verwijder de beveiliging op bestand of standaard invoer" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Voeg beveiliging toe aan bestad of standaard invoer" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [bestanden]|geef controlegetal van berichten weer" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -551,157 +556,157 @@ msgstr "" "Opties:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "genereer beveiliging in ASCII" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAAM|versleutel voor NAAM" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAAM|gebruik NAAM als standaard ontvanger" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "gebruik de standaard sleutel als standaard ontvanger" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|stel compressieniveau in op N (uitzetten met 0)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "gebruik de verkorte tekstmodus" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "gebruik als uitvoerbestand" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "geef meer informatie" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "wees iets stiller" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "gebruik de terminal helemaal niet" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forcees v3 ondertekening" -#: g10/g10.c:398 +#: g10/g10.c:396 #, fuzzy msgid "do not force v3 signatures" msgstr "forcees v3 ondertekening" -#: g10/g10.c:399 +#: g10/g10.c:397 #, fuzzy msgid "force v4 key signatures" msgstr "forcees v3 ondertekening" -#: g10/g10.c:400 +#: g10/g10.c:398 #, fuzzy msgid "do not force v4 key signatures" msgstr "forcees v3 ondertekening" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "gebruik altijd een MDC voor versleuteling" -#: g10/g10.c:403 +#: g10/g10.c:401 #, fuzzy msgid "never use a MDC for encryption" msgstr "gebruik altijd een MDC voor versleuteling" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "maak geen enkele verandering" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "doorlopende modus: vraag nooit" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "veronderstel ja als antwoord op de meeste vragen" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "veronderstel nee als antwoord op de meeste vragen" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "voeg deze geheime sleutelbos toe aan de lijst" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAAM|zet tekenverzameling van terminal op NAAM" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "lees opties uit bestand" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|BB|schrijf status naar deze bestandsbeschrijver" -#: g10/g10.c:428 +#: g10/g10.c:426 #, fuzzy msgid "|[file]|write status info to file" msgstr "|BB|schrijf status naar deze bestandsbeschrijver" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|BESTAND|laad extensiemodule BESTAND" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "doe als RFC1991 voorschrijft" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag" -#: g10/g10.c:444 +#: g10/g10.c:448 #, fuzzy msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag" @@ -746,13 +751,13 @@ msgstr "" msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -772,17 +777,17 @@ msgstr "" " --list-keys [namen] toon sleutels\n" " --fingerprints [namen] toon vingerafdrukken\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Meld fouten in het programma a.u.b. aan ;\n" "fouten in de vertaling aan .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -792,7 +797,7 @@ msgstr "" "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n" "standaardactie hangt af van de gegevens\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -800,327 +805,361 @@ msgstr "" "\n" "Ondersteunde algoritmes:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 #, fuzzy msgid "Compression: " msgstr "Kommentaar: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "gebruik: gpg [opties] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "tegenstrijdige commando's\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "LET OP: geen bestand `%s' met standaardopties\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "LET OP: geen bestand `%s' met standaardopties\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "optiebestand `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "opties inlezen van `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s is een onbekende tekenverzameling\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "LET OP: `%s' is een leeg bestand\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 #, fuzzy msgid "invalid import options\n" msgstr "ongeldige versleuteling" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "LET OP: `%s' is een leeg bestand\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 #, fuzzy msgid "invalid export options\n" msgstr "ongeldige sleutelbos" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "LET OP: programma zou een geheugendump kunnen maken!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "LET OP: %s is niet voor gewoon gebruik!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s is niet toegestaan met deze %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s heeft geen betekenis met %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "geselecteerd versleutelalgoritme is ongeldig\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "geselecteerd controle-algoritme is ongeldig\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "geselecteerd controle-algoritme is ongeldig\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed(?) moet groter zijn dan 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed(?) moet groter zijn dan 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 #, fuzzy msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 #, fuzzy msgid "invalid default preferences\n" msgstr "toon voorkeuren" -#: g10/g10.c:1948 +#: g10/g10.c:1927 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "toon voorkeuren" -#: g10/g10.c:1952 +#: g10/g10.c:1931 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "toon voorkeuren" -#: g10/g10.c:1956 +#: g10/g10.c:1935 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "toon voorkeuren" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [bestandsnaam]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [bestandsnaam]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [bestandsnaam]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [bestandsnaam]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [bestandsnaam]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [bestandsnaam]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [bestandsnaam]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [bestandsnaam]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key gebruikersidentificatie" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key gebruikers-identificatie" -#: g10/g10.c:2175 +#: g10/g10.c:2214 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key gebruikersidentificatie" -#: g10/g10.c:2183 +#: g10/g10.c:2222 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key gebruikersidentificatie" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key gebruikersidentificatie [opdrachten]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "kan %s niet openen: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Sleutelgeneratie is mislukt: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "nummeren van de geheime sleutels mislukte: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Sleutelgeneratie is mislukt: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record mislukte: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "nummeren van de geheime sleutels mislukte: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "opheffen van beveiliging mislukt: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "beveiligen mislukt: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ongeldig frommelalgoritme `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[bestandsnaam]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Gaat uw gang, type het bericht ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan `%s' niet openen\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1129,21 +1168,21 @@ msgstr "" "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten " "en eindig met een =\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "een notitienaam mag geen controletekens bevatten\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "een notitienaam mag geen controletekens bevatten\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "de gegeven beleids-URL is ongeldig\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "de gegeven beleids-URL is ongeldig\n" @@ -1292,7 +1331,7 @@ msgstr "" "Geen vertrouwenswaarde toegekend aan %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1356,7 +1395,7 @@ msgstr "" msgid " q = quit\n" msgstr " q = beëindigen\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Uw keuze? " @@ -1545,109 +1584,109 @@ msgstr "%s: overgeslagen: openbare sleut msgid "no valid addressees\n" msgstr "geen geldige adressen\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, fuzzy, c-format msgid "preference %c%lu duplicated\n" msgstr "`%s' overgeslagen: dubbel\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, fuzzy, c-format msgid "too many `%c' preferences\n" msgstr "toon voorkeuren" -#: g10/keygen.c:273 +#: g10/keygen.c:278 #, fuzzy msgid "invalid character in preference string\n" msgstr "Ongeldig teken in naam\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 #, fuzzy msgid "writing direct signature\n" msgstr "zelfondertekening wegschrijven\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "zelfondertekening wegschrijven\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "schrijven van sleutelbindingsondertekening\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "Gevraagde sleutellengte is %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "afgerond naar %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Selecteer aub wat voor sleutel u wilt:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA en ElGamal (standaard)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (alleen ondertekenen)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (alleen versleutelen)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, fuzzy, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) DSA (alleen ondertekenen)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (alleen versleutelen)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, fuzzy, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Uw keuze? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 #, fuzzy msgid "Create anyway? " msgstr "Deze sleutel toch gebruiken? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Ongeldige keuze.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1660,20 +1699,20 @@ msgstr "" " standaard sleutellengte is 1024 bits\n" " hoogste aan te raden sleutellengte is 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Hoe lang wil je de sleutel maken? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 #, fuzzy msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n" @@ -1685,12 +1724,12 @@ msgstr "sleutel te kort; 768 is de klein #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "sleutel te lang; %d is de maximumlengte.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1698,11 +1737,11 @@ msgstr "" "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n" "lang duren!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1710,17 +1749,17 @@ msgstr "" "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook " "erg vatbaar zijn voor aanvallen!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Gevraagde sleutellengte is %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "afgerond naar %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1736,7 +1775,7 @@ msgstr "" " m = sleutel verloopt over n maanden\n" " y = sleutel verloopt over n jaar\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 #, fuzzy msgid "" "Please specify how long the signature should be valid.\n" @@ -1753,32 +1792,32 @@ msgstr "" " m = sleutel verloopt over n maanden\n" " y = sleutel verloopt over n jaar\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Sleutel is geldig gedurende? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 #, fuzzy msgid "Signature is valid for? (0) " msgstr "Sleutel is geldig gedurende? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "ongeldige waarde\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, fuzzy, c-format msgid "%s does not expire at all\n" msgstr "Sleutel verloopt nooit\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, fuzzy, c-format msgid "%s expires at %s\n" msgstr "Sleutel verloopt op %s\n" # fixme -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1786,11 +1825,11 @@ msgstr "" "Uw systeem kan geen data weergeven van na 2038.\n" "Desondanks wordt het goed behandeld tot 2106.\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Klopt dit (j/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1806,44 +1845,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Echte naam: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ongeldig teken in naam\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Naam mag niet beginnen met een cijfer\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Naam moet ten minste 5 tekens lang zijn\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Email Adres: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Ongeldig email adres\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Kommentaar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Ongeldig teken in kommentaar\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Je gebruik tekenverzameling `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1854,28 +1893,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkEeOoEe" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 #, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1883,17 +1922,17 @@ msgstr "" "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1905,7 +1944,7 @@ msgstr "" "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1918,54 +1957,54 @@ msgstr "" "dit geeft de generator een grotere kans om genoeg entropie te\n" "verzamelen.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Sleutelgeneratie afgebroken.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "Openbaar certificaat wordt geschreven naar `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, fuzzy, c-format msgid "no writable public keyring found: %s\n" msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fout bij schrijven van de sleutelbos `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fout bij schrijven van de sleutelbos `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 #, fuzzy msgid "key marked as ultimately trusted.\n" msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1974,12 +2013,12 @@ msgstr "" "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n" "sleutel te maken hiervoor.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Sleutelgeneratie is mislukt: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1987,7 +2026,7 @@ msgstr "" "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1995,25 +2034,25 @@ msgstr "" "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Echt maken? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kon niet openen: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "fout tijdens aanmake sleuteltekst: %s\n" @@ -2022,17 +2061,17 @@ msgstr "fout tijdens aanmake sleutelteks msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, fuzzy, c-format msgid "`%s' already compressed\n" msgstr "%lu sleutels verwerkt\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: LET OP: leeg bestand\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" @@ -2046,7 +2085,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2061,438 +2100,428 @@ msgstr "LET OP: versleutelalgoritme %d n msgid "you may not use %s while in %s mode\n" msgstr "" -#: g10/encode.c:753 +#: g10/encode.c:748 #, fuzzy, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s versleuteld voor: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, fuzzy, c-format msgid "key `%s' not found: %s\n" msgstr "gebruiker `%s' niet gevonden: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, fuzzy, c-format msgid "error reading keyblock: %s\n" msgstr "fout bij lezen `%s': %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n" -#: g10/export.c:238 +#: g10/export.c:205 #, fuzzy, c-format msgid "key %08lX: not protected - skipped\n" msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n" -#: g10/export.c:246 +#: g10/export.c:213 #, fuzzy, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "LET OP: er is niets geëxporteerd\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "te veel ingangen in de pk cache - uitgezet\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 #, fuzzy msgid "[User id not found]" msgstr "[gebruiker niet gevonden]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "er is een geheime sleutel voor deze openbare sleutel!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "blok van type %d wordt overgeslagen\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu sleutels zijn tot nu toe behandeld\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "fout bij lezen `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Totaal aantal behandeld: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, fuzzy, c-format msgid " skipped new keys: %lu\n" msgstr "nieuwe subsleutels: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " zonder identificatie: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr "geïmporteerd: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr "onveranderd: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr "nieuwe gebruikers: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr "nieuwe subsleutels: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr "nieuwe ondertekeningen: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr "nieuwe sleutelterugtrekkingen: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr "geheime sleutels gelezen: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "geheime sleutels geïmporteerd: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "onveranderde geheime sleutels: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr "geïmporteerd: %lu" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "sleutel %08lX: geen gebruikersidentificatie\n" -#: g10/import.c:634 +#: g10/import.c:587 #, fuzzy, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n" -#: g10/import.c:649 +#: g10/import.c:602 #, fuzzy, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "" "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, fuzzy, c-format msgid "key %08lX: new key - skipped\n" msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n" -#: g10/import.c:683 +#: g10/import.c:634 #, fuzzy, c-format msgid "no writable keyring found: %s\n" msgstr "fout bij schrijven van de sleutelbos `%s': %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "schrijven naar `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fout bij schrijven van de sleutelbos `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, fuzzy, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "sleutel %08lX: openbare sleutel geïmporteerd\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "sleutel %08lX: komt niet overeen met onze kopie\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "sleutel %08lX: 1 nieuwe gebruiker\n" -#: g10/import.c:788 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "sleutel %08lX: %d nieuwe gebruikers\n" -#: g10/import.c:791 +#: g10/import.c:742 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "sleutel %08lX: 1 nieuwe ondertekening\n" -#: g10/import.c:794 +#: g10/import.c:745 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n" -#: g10/import.c:797 +#: g10/import.c:748 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "sleutel %08lX: 1 nieuwe subsleutel\n" -#: g10/import.c:800 +#: g10/import.c:751 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "sleutel %08lX: %d nieuwe subsleutels\n" -#: g10/import.c:819 +#: g10/import.c:770 #, fuzzy, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "sleutel %08lX: niet veranderd\n" -#: g10/import.c:881 +#: g10/import.c:832 #, fuzzy, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n" -#: g10/import.c:896 +#: g10/import.c:847 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "geen standaard openbare sleutelbos\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "sleutel %08lX: geheime sleutel geïmporteerd\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet " "toepassen\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "sleutel %08lX: terugtrekkingscertificaat geïmporteerd\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, fuzzy, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, fuzzy, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "sleutel %08lX: ongeldige eigen ondertekening\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "sleutel %08lX: ongeldige subsleutelbinding\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "sleutel %08lX: ongeldige subsleutelbinding\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, fuzzy, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "sleutel %08lX: ongeldige subsleutelbinding\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "sleutel %08lX: subsleutel overgeslagen\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "" "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - " "overgeslagen\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - " "overgeslagen\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, fuzzy, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "" "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - " "overgeslagen\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, fuzzy, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "" "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - " "overgeslagen\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "" "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -#: g10/import.c:1535 +#: g10/import.c:1500 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %08lX: direct key signature added\n" msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n" @@ -2505,29 +2534,29 @@ msgstr "[terugtrekking]" msgid "[self-signature]" msgstr "[zelfondertekening]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 ongeldige ondertekening\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d ongeldige ondertekeningen\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 ondertekening niet gecontroleerd wegens een fout\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n" @@ -2547,132 +2576,143 @@ msgstr "" msgid "User ID \"%s\" is revoked." msgstr "Sleutel is beveiligd.\n" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "" #: g10/keyedit.c:382 #, fuzzy, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +msgid "User ID \"%s\" is expired." +msgstr "Sleutel is beveiligd.\n" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "LET OP: `%s' is een leeg bestand\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, fuzzy, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "Reeds ondertekend met sleutel %08lx\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, fuzzy, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "Reeds ondertekend met sleutel %08lx\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Niets te tekenen met sleutel %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 #, fuzzy msgid "This key has expired!" msgstr "Let op: Deze sleutel is verlopen!\n" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, fuzzy, c-format msgid "This key is due to expire on %s.\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 #, fuzzy msgid " (default)" msgstr "(standaard is 1)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr "" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr "" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr "" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2680,7 +2720,7 @@ msgstr "" "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n" "met uw sleutel: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 #, fuzzy msgid "" "\n" @@ -2688,7 +2728,7 @@ msgid "" msgstr "" "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 #, fuzzy msgid "" "\n" @@ -2697,7 +2737,7 @@ msgstr "" "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n" "\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 #, fuzzy msgid "" "\n" @@ -2706,7 +2746,7 @@ msgstr "" "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n" "\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 #, fuzzy msgid "" "\n" @@ -2715,7 +2755,7 @@ msgstr "" "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n" "\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 #, fuzzy msgid "" "\n" @@ -2724,53 +2764,53 @@ msgstr "" "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n" "\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" msgstr "" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" msgstr "" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Echt tekenen? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "ondertekening mislukt: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 #, fuzzy msgid "Secret parts of primary key are not available.\n" msgstr "geheime sleutel niet beschikbaar" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Sleutel is beveiligd.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Kan deze sleutel niet bewerken: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2778,7 +2818,7 @@ msgstr "" "Geef de sleuteltekst voor deze geheime sleutel.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2786,652 +2826,658 @@ msgstr "" "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Wilt u dit echt? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "sleutelondertekening naar de juiste plaats schuiven\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "beëindig dit menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "bewaar" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "opslaan en beëindigen" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "hulp" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "geef deze hulp" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "toon vingerafdruk" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "lijst" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lijst van sleutel- en gebruikersidentificaties" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "gebruikersidentificatie" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "selecteer gebruikersidentificatie N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "sleutel" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "selecteer subsleutel N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "controleer" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "toon ondertekeningen" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "onderteken" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "onderteken de sleutel" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lteken" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "teken de sleutel lokaal" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "nrsign" msgstr "onderteken" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "sign the key non-revocably" msgstr "teken de sleutel lokaal" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "nrlsign" msgstr "onderteken" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "sign the key locally and non-revocably" msgstr "teken de sleutel lokaal" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "voeg een gebruikersidentificatie toe" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 #, fuzzy msgid "add a photo ID" msgstr "voeg een gebruikersidentificatie toe" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "verwijder gebruikersidentificatie" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "voeg een secundaire sleutel toe" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "verwijder een secundaire sleutel" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "addrevoker" msgstr "revkey" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "add a revocation key" msgstr "voeg een secundaire sleutel toe" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "verwijder ondertekeningen" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "verander de vervaldatum" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "wissel" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "wissel tussen geheime en openbare sleutels" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 #, fuzzy msgid "list preferences (expert)" msgstr "toon voorkeuren" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "list preferences (verbose)" msgstr "toon voorkeuren" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "setpref" msgstr "pref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "set preference list" msgstr "toon voorkeuren" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updpref" msgstr "pref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updated preferences" msgstr "toon voorkeuren" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "verander de sleuteltekst" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "verander het vertrouwen in de eigenaar" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "roep ondertekeningen terug" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revuid" msgstr "revsig" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revoke a user ID" msgstr "voeg een gebruikersidentificatie toe" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "trek secundaire sleutel in" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "sta het gebruik van een sleutel niet toe" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "sta gebruik van een sleutel toe" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "kan dat niet doen in lopende band-modus\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, fuzzy, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "fout bij lezen `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Geheime sleutel is beschikbaar.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Commando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 #, fuzzy msgid "Key is revoked." msgstr "Sleutel is beveiligd.\n" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Echt alle gebruikers tekenen? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "U kunt de laatste gebruiker niet verwijderen!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Al deze gebruikers echt verwijderen? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Deze gebruiker echt verwijderen? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "U moet op zijn minst een sleutel selecteren.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Wilt u deze sleutel echt verwijderen? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 #, fuzzy msgid "Really revoke all selected user IDs? " msgstr "Al deze gebruikers echt verwijderen? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 #, fuzzy msgid "Really revoke this user ID? " msgstr "Deze gebruiker echt verwijderen? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Wilt u echt alle geselecteerde sleutels intrekken? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Wilt u deze sleutel echt intrekken? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 #, fuzzy msgid "Really update the preferences for the selected user IDs? " msgstr "Al deze gebruikers echt verwijderen? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 #, fuzzy msgid "Really update the preferences? " msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Veranderingen bewaren? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Beëindigen zonder te bewaren? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "bijwerken ging niet: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "bijwerken van de geheime sleutel mislukte: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Foutief commando (probeer \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, fuzzy, c-format msgid "This key may be revoked by %s key " msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Deze sleutel is niet beschikbaar" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! subsleutel is teruggeroepen: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 #, fuzzy msgid "rev- faked revocation found\n" msgstr "rev- vervalste sleutelterugtrekking gevonden\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Verwijder deze goede ondertekening? (j/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Verwijder deze onbekende ondertekening? (j/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Deze zelfondertekening echt verwijderen? (j/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d ondertekening verwijderd.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d ondertekeningen verwijderd.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Niets verwijderd.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Geef de sleutelgrootte" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Vervaldatum voor secundaire sleutel instellen.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Vervaldatum voor primaire sleutel instellen.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, fuzzy, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "sleutel %08lX: ongeldige eigen ondertekening\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Geen gebruikersidentificatie met index %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Geen secundaire sleutel met index %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "gebruikersidentificatie: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3440,7 +3486,7 @@ msgstr "" "\"\n" "tekende met uw sleutel %08lX op %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, fuzzy, c-format msgid "" "\"\n" @@ -3449,59 +3495,59 @@ msgstr "" "\"\n" "tekende met uw sleutel %08lX op %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "U heeft deze gebruikers ondertekend:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, fuzzy, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " getekend door %08lX op %s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " ingetrokken door %08lX op %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, fuzzy, c-format msgid " signed by %08lX at %s%s\n" msgstr " getekend door %08lX op %s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "geen geheime sleutel\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Sleutel is beveiligd.\n" @@ -3510,76 +3556,76 @@ msgstr "Sleutel is beveiligd.\n" #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 #, fuzzy msgid "Critical signature policy: " msgstr "%s ondertekening van: %s\n" -#: g10/keylist.c:93 +#: g10/keylist.c:114 #, fuzzy msgid "Signature policy: " msgstr "%s ondertekening van: %s\n" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "LET OP: ongeldige aantekeningen gevonden\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 #, fuzzy msgid "Critical signature notation: " msgstr "Aantekening: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 #, fuzzy msgid "Signature notation: " msgstr "Aantekening: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, fuzzy, c-format msgid " [expires: %s]" msgstr "Sleutel verloopt op %s\n" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 #, fuzzy msgid "Primary key fingerprint:" msgstr "sleutels en vingerafdrukken opnoemen" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 #, fuzzy msgid " Subkey fingerprint:" msgstr " Vingerafdruk:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 #, fuzzy msgid " Primary key fingerprint:" msgstr " Vingerafdruk:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 #, fuzzy msgid " Subkey fingerprint:" msgstr " Vingerafdruk:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 #, fuzzy msgid " Key fingerprint =" msgstr " Vingerafdruk:" @@ -3666,103 +3712,112 @@ msgstr "LET OP: afzender vroeg om \"for- msgid "original file name='%.*s'\n" msgstr "originele bestandsnaam='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Aantekening: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Beleid: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "controle van de ondertekening overgeslagen\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 #, fuzzy msgid "can't handle these multiple signatures\n" msgstr "maak een losstaande ondertekening" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Geen hulp beschikbaar" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "FOUTE ondertekening van \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 #, fuzzy msgid "Expired signature from \"" msgstr "Correcte ondertekening van \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Correcte ondertekening van \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Deze sleutel is niet beveiligd.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s ondertekening van: %s\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 msgid "binary" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "onbekende versie" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan ondertekening niet controleren: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 #, fuzzy msgid "not a detached signature\n" msgstr "maak een losstaande ondertekening" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "losstaande ondertekening van type 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "oude stijl (PGP 2.x) ondertekening\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n" @@ -3789,75 +3844,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "" -#: g10/misc.c:509 +#: g10/misc.c:533 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "LET OP: `%s' is een leeg bestand\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "LET OP: `%s' is een leeg bestand\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "kan openbare sleutel-algoritme %d niet behandelen\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpakket type %d heeft kritische bit gezet\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "beschermingsalgoritme %d wordt niet ondersteund\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan geen verbinding maken met `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (hoofdsleutelnummer %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3869,34 +3929,34 @@ msgstr "" "sleutel op te heffen voor gebruiker \"%.*s\"\n" "%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 #, fuzzy msgid "Repeat passphrase\n" msgstr "Herhaal de sleuteltekst: " -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 #, fuzzy msgid "Enter passphrase\n" msgstr "Geef de sleuteltekst: " -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3906,20 +3966,20 @@ msgstr "" "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n" "sleutel voor gebruiker op te heffen: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "kan niet om wachtwoord vragen in lopende band-modus\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Geef de sleuteltekst: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Herhaal de sleuteltekst: " @@ -4014,7 +4074,7 @@ msgid "failed sending to `%s': status=%u msgstr "fout bij versturen naar `%s': status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" +msgid "this keyserver does not support --search-keys\n" msgstr "" #: g10/hkp.c:519 @@ -4057,11 +4117,11 @@ msgstr "" msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4070,17 +4130,17 @@ msgstr "" "dit is een ElGamal sleutel van PGP, die NIET veilig is voor " "ondertekeningen!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, fuzzy, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, fuzzy, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, fuzzy, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4089,7 +4149,7 @@ msgstr "" "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, fuzzy, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4098,43 +4158,48 @@ msgstr "" "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, fuzzy, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, fuzzy, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4159,12 +4224,12 @@ msgstr "LET OP: `%s' is een leeg bestand msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "kan %s niet aanmaken: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, fuzzy, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n" @@ -4177,7 +4242,7 @@ msgstr "ondertekenen:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, fuzzy, c-format msgid "%s encryption will be used\n" msgstr "ontsleuteling mislukte: %s\n" @@ -4193,12 +4258,12 @@ msgid "input line longer than %d charact msgstr "invoerregel langer dan %d tekens\n" # Untranslated. -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "trustdb rec %lu: lseed failed: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "trustdb rec %lu: write failed (n=%d): %s\n" @@ -4207,123 +4272,123 @@ msgstr "trustdb rec %lu: write failed (n msgid "trustdb transaction too large\n" msgstr "transactie naar vertrouwensdatabase te groot\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: kan er niet bij: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: map bestaat niet!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: kan hem niet vergrendelen\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, fuzzy, c-format msgid "%s: can't make lock\n" msgstr "%s: kan hem niet vergrendelen\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kan hem niet aanmaken: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: aanmaken van versieveld lukte niet: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: foutieve vertrouwensdatabase aangemaakt\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: vertrouwensdatabase aangemaakt\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: ongeldige vertrouwensdatabase\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: kon frommeltabel niet aanmaken: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: fout bij het bijwerken van versieveld: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: fout bij het lezen van het versieveld: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: fout bij het schrijven van het versieveld: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "vertrouwensdatabase: lseek mislukte: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "vertrouwensdatabase: lezen mislukte (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: is geen vertrouwensdatabasebestand\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versieveld met recnr %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ongeldige bestandsversie %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: fout bij het lezen van een beschikbaar veld: %s\n" # dir? -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: fout bij het schrijven van indexveld: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: veld met nullen vullen lukte niet: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: kon geen veld toevoegen: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n" @@ -4373,42 +4438,42 @@ msgstr "vertrouwensveld %lu, type %d: sc msgid "trustdb: sync failed: %s\n" msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: is geen vertrouwensdatabasebestand\n" # Untranslated. -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, fuzzy, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb rec %lu: lseed failed: %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 #, fuzzy msgid "checking the trustdb\n" msgstr "verander het vertrouwen in de eigenaar" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, fuzzy, c-format msgid "public key %08lX not found: %s\n" msgstr "publieke sleutel niet gevonden" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4416,7 +4481,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4927,17 +4992,17 @@ msgstr "Dicht dit mogelijke beveiligings msgid "checking keyring `%s'\n" msgstr "fout bij schrijven van de sleutelbos `%s': %s\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, fuzzy, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu sleutels zijn tot nu toe behandeld\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, fuzzy, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "sleutels en ondertekeningen opnoemen" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: sleutelbos aangemaakt\n" @@ -5032,7 +5097,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -5125,34 +5190,34 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "rev- vervalste sleutelterugtrekking gevonden\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "rev- vervalste sleutelterugtrekking gevonden\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Deze sleutel toch gebruiken? " @@ -5343,9 +5408,6 @@ msgstr "beveiliging: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "fout tijdens het lezen van primaire sleutel voor LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record mislukte: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "sleutel %08lX: opvragen van veld mislukte\n" @@ -5358,9 +5420,6 @@ msgstr "beveiliging: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "nummeren van de geheime sleutels mislukte: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n" diff -urpP gnupg-1.2.2/po/pl.po gnupg-1.2.3/po/pl.po --- gnupg-1.2.2/po/pl.po 2003-05-01 14:38:23.000000000 +0000 +++ gnupg-1.2.3/po/pl.po 2003-08-21 20:05:25.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-01-13 22:15+0100\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-06-19 18:58+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "obja¶nienie mo¿na przeczytaæ tut #: util/secmem.c:326 msgid "operation is not possible without initialized secure memory\n" -msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n" +msgstr "bez zabezpieczenia pamiêci nie mo¿na wykonaæ tej operacji\n" #: util/secmem.c:327 msgid "(you may have used the wrong program for this task)\n" @@ -55,7 +55,7 @@ msgstr "nie" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "wyj¶cie" @@ -69,7 +69,7 @@ msgstr "b³±d ogólny" #: util/errors.c:55 msgid "unknown packet type" -msgstr "nieznany rodzaj pakietu" +msgstr "nieznany typ pakietu" #: util/errors.c:56 msgid "unknown version" @@ -77,7 +77,7 @@ msgstr "nieznana wersja" #: util/errors.c:57 msgid "unknown pubkey algorithm" -msgstr "nieznany algorytm klucza publicznego" +msgstr "nieznany algorytm asymetryczny" #: util/errors.c:58 msgid "unknown digest algorithm" @@ -89,7 +89,7 @@ msgstr "niepoprawny klucz publiczny" #: util/errors.c:60 msgid "bad secret key" -msgstr "niepoprawny klucz tajny" +msgstr "niepoprawny klucz prywatny" #: util/errors.c:61 msgid "bad signature" @@ -101,11 +101,11 @@ msgstr "b³±d sumy kontrolnej" #: util/errors.c:63 msgid "bad passphrase" -msgstr "niepoprawne d³ugie has³o." +msgstr "niepoprawne has³o" #: util/errors.c:64 msgid "public key not found" -msgstr "brak klucza publicznego." +msgstr "brak klucza publicznego" #: util/errors.c:65 msgid "unknown cipher algorithm" @@ -121,7 +121,7 @@ msgstr "niepoprawny pakiet" #: util/errors.c:68 msgid "invalid armor" -msgstr "b³±d w opakowaniu ASCII." +msgstr "b³±d w opakowaniu ASCII" #: util/errors.c:69 msgid "no such user id" @@ -129,11 +129,11 @@ msgstr "brak takiego identyfikatora u¿yt #: util/errors.c:70 msgid "secret key not available" -msgstr "brak klucza tajnego." +msgstr "brak klucza prywatnego" #: util/errors.c:71 msgid "wrong secret key used" -msgstr "zosta³ u¿yty niew³a¶ciwy klucz tajny" +msgstr "zosta³ u¿yty niew³a¶ciwy klucz prywatny" #: util/errors.c:72 msgid "not supported" @@ -141,15 +141,15 @@ msgstr "nie jest obs³ugiwany" #: util/errors.c:73 msgid "bad key" -msgstr "niepoprawny klucz." +msgstr "niepoprawny klucz" #: util/errors.c:74 msgid "file read error" -msgstr "b³±d przy odczycie pliku." +msgstr "b³±d przy odczycie pliku" #: util/errors.c:75 msgid "file write error" -msgstr "b³±d przy zapisie pliku." +msgstr "b³±d przy zapisie pliku" #: util/errors.c:76 msgid "unknown compress algorithm" @@ -181,7 +181,7 @@ msgstr "nieznana klasa podpisu" #: util/errors.c:83 msgid "trust database error" -msgstr "b³±d w bazie zaufania." +msgstr "b³±d w bazie zaufania" #: util/errors.c:84 msgid "bad MPI" @@ -221,11 +221,11 @@ msgstr "nieoczekiowane dane" #: util/errors.c:93 msgid "timestamp conflict" -msgstr "konflikt znaczników czasu" +msgstr "konflikt datowników" #: util/errors.c:94 msgid "unusable pubkey algorithm" -msgstr "nieu¿yteczny algorytm z kluczem publicznym" +msgstr "nieu¿yteczny algorytm asymetryczny" #: util/errors.c:95 msgid "file exists" @@ -266,7 +266,7 @@ msgstr "bezu¿yteczny klucz publiczny" #: util/errors.c:106 msgid "unusable secret key" -msgstr "bezu¿yteczny klucz tajny" +msgstr "bezu¿yteczny klucz prywatny" #: util/errors.c:107 msgid "keyserver error" @@ -275,72 +275,72 @@ msgstr "b³±d serwera kluczy" #: util/logger.c:249 #, c-format msgid "... this is a bug (%s:%d:%s)\n" -msgstr "... to jest b³±d w programie (%s:%d:%s)\n" +msgstr "... to jest b³±d programu (%s:%d:%s)\n" #: util/logger.c:255 #, c-format msgid "you found a bug ... (%s:%d)\n" msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "modu³ gromadzenia entropii nie zosta³ wykryty\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" -msgstr "nie mo¿na otworzyæ %s: %s\n" +msgstr "nie mo¿na otworzyæ ,,%s'': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" -msgstr "nie mo¿na sprawdziæ %s: %s\n" +msgstr "nie mo¿na sprawdziæ ,,%s'': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" -msgstr "'%s' nie jest zwyk³ym plikiem - zostaje pominiêty\n" +msgstr ",,%s'' nie jest zwyk³ym plikiem - zostaje pominiêty\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "uwaga: plik random_seed jest pusty\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "OSTRZE¯ENIE: niew³a¶ciwy rozmiar pliku random_seed - nie zostanie u¿yty\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" -msgstr "nie mo¿na odczytaæ %s: %s\n" +msgstr "nie mo¿na odczytaæ ,,%s'': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "uwaga: plik random_seed nie jest uaktualniony\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" -msgstr "nie mo¿na stworzyæ %s: %s\n" +msgstr "nie mo¿na utworzyæ ,,%s'': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" -msgstr "nie mo¿na zapisaæ %s: %s\n" +msgstr "nie mo¿na zapisaæ ,,%s'': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" -msgstr "nie mo¿na zamkn±æ %s: %s\n" +msgstr "nie mo¿na zamkn±æ ,,%s'': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "" "OSTRZE¯ENIE: u¿ywany generator liczb losowych\n" "nie jest kryptograficznie bezpieczny!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -369,7 +369,14 @@ msgstr "" #: cipher/md.c:140 #, c-format msgid "digest algorithm `%s' is read-only in this release\n" +msgstr "w tej wersji algorytm skrótu ,,%s'' jest tylko do odczytu\n" + +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" msgstr "" +"OSTRZE¯ENIE: algorytm skrótu ,,%s'' nie jest czê¶ci± standardu OpenPGP.\n" +" U¿ywasz go na w³asn± odpowiedzialno¶æ!\n" #: cipher/rndegd.c:204 msgid "" @@ -377,8 +384,14 @@ msgid "" "keep you from getting bored, because it will improve the quality\n" "of the entropy.\n" msgstr "" +"Proszê czekaæ, prowadzona jest zbiórka losowo¶ci. ¯eby siê nie nudziæ, " +"mo¿esz\n" +"popracowaæ w systemie, przy okazji dostarczy to systemowi wiêcej entropii " +"do\n" +"tworzenia liczb losowych.\n" +"\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -386,167 +399,167 @@ msgstr "" "@Polecenia:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[plik]|z³o¿enie podpisu" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" -msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie" +msgstr "|[plik]|z³o¿enie podpisu pod dokumentem" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "z³o¿enie podpisu oddzielonego od dokumentu" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[pliki]|szyfrowanie plików" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" -msgstr "tylko zapis danych w formacie OpenPGP" +msgstr "zapis danych w formacie OpenPGP" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" -msgstr "odszyfrowywanie danych (domy¶lnie)" +msgstr "odszyfrowywanie danych (domy¶lne)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[pliki]|odszyfrowywanie plików" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "lista kluczy i podpisów" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "sprawdzenie podpisów kluczy" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odcisków" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" -msgstr "lista kluczy tajnych" +msgstr "lista kluczy prywatnych" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "generacja nowej pary kluczy" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "usuniêcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" -msgstr "usuniêcie klucza ze zbioru kluczy tajnych" +msgstr "usuniêcie klucza ze zbioru kluczy prywatnych" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "z³o¿enie podpisu na kluczu" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "z³o¿enie prywatnego podpisu na kluczu" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "" "z³o¿enie na kluczu podpisu nie podlegaj±cego \n" "uniewa¿nieniu" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "" "z³o¿enie na kluczu podpisu prywatnego,\n" "nie podlegaj±cego uniewa¿nieniu" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "tworzenie certyfikatu uniewa¿nienia klucza" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "szukanie kluczy na serwerze" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" -msgstr "od¶wie¿enie kluczy z serwera" +msgstr "od¶wie¿enie wszystkich kluczy z serwera" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "import/do³±czenie kluczy" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietów" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "eksport warto¶ci zaufania" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "wczytanie warto¶æi zaufania" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "uaktualnienie bazy zaufania" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" -msgstr "automatyczne uaktualnienie bazy zaufania" +msgstr "bezobs³ugowe uaktualnienie bazy zaufania" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "naprawa uszkodzonej bazy zaufania" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "zdjêcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "opakowanie ASCII pliku lub potoku" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skróty wiadomo¶ci" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -556,151 +569,151 @@ msgstr "" "Opcje:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" -msgstr "plik wynikowy w opakowaniu ASCII" +msgstr "opakowanie ASCII pliku wynikowego" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "domy¶lny klucz jest domy¶lnym adresatem" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" -msgstr "|N|poziom kompresji N (0 - brak)" +msgstr "|N|poziom kompresji N (0 - bez)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "plik wyj¶ciowy" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" -msgstr "z informacjami dodatkowymi" +msgstr "z dodatkowymi informacjami" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "mniej komunikatóww" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "bez odwo³añ do terminala" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "wymuszenie trzeciej wersji formatu podpisów" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "bez wymuszania trzeciej wersji formatu podpisów" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "wymuszenie czwartej wersji formatu podpisów" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "bez wymuszania czwartej wersji formatu podpisów" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "do szyfrowania bêdzie u¿ywany MDC" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "do szyfrowania nie zostanie u¿yty MDC" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "pozostawienie bez zmian" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "pytanie przed nadpisaniem plików" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" -msgstr "wykorzystanie gpg-agenta" +msgstr "wykorzystanie agenta zarz±dzania has³ami" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "tryb wsadowy: ¿adnych pytañ" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" -msgstr "dodaæ zbiór kluczy do listy u¿ywanych" +msgstr "dodanie zbioru kluczy do u¿ywanych" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" -msgstr "dodaæ zbiór kluczy tajnych do listy" +msgstr "dodanie zbioru kluczy tajnych do u¿ywanych" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" -msgstr "okazanie, w którym zbiorze kluczy znajduje siê dany klucz" +msgstr "okazanie, w którym zbiorze znajduje siê dany klucz" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" -msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego" +msgstr "|NAZWA|ustawienie NAZWA jako domy¶lnego klucza prywatnego" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" -msgstr "|NAZWA|zestaw znaków terminala NAZWA" +msgstr "|NAZWA| strona kodowa wy¶wietlanego tekstu" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" -msgstr "|FD|zapisaæ opis stanu do FD" +msgstr "|FD|pisanie opisu stanu do deskryptora FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" -msgstr "|[plik]|zapisaæ opis stanu do pliku" +msgstr "|[plik]|pisanie opisu stanu do pliku" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" -msgstr "|KLUCZ|klucz ca³kowicie zaufany" +msgstr "|KLUCZ|ustawienie klucza jako ca³kowicie zaufanego" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "tryb zgodno¶ci formatu pakietów, szyfrów i skrótów z OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "tryb zgodno¶ci formatów, szyfrów i skrótów z PGP 2.x" @@ -710,31 +723,31 @@ msgstr "|N|N-ty tryb obliczania has³a" #: g10/g10.c:454 msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|ALG|algorytm skrótu dla has³a ALG" +msgstr "|ALG|wymuszenie algorytmu skrótu has³a ALG" #: g10/g10.c:456 msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a" +msgstr "|ALG|wymuszenie algorytmu szyfruj±cego ALG dla has³a" #: g10/g10.c:458 msgid "|NAME|use cipher algorithm NAME" -msgstr "|NAZWA|algorytm szyfruj±cy NAZWA" +msgstr "|NAZWA|wymuszenie algorytmu szyfruj±cego NAZWA" #: g10/g10.c:459 msgid "|NAME|use message digest algorithm NAME" -msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA" +msgstr "|NAZWA|wymuszenie algorytmu skrótu NAZWA" #: g10/g10.c:461 msgid "|N|use compress algorithm N" -msgstr "|N|algorytm kompresji N" +msgstr "|N|wymuszenie algorytmu kompresji N" #: g10/g10.c:462 msgid "throw keyid field of encrypted packets" -msgstr "usuniêcie numerów kluczy adresatów z zaszyfrowanych pakietów" +msgstr "usuniêcie numerów kluczy adresatów z szyfrogramów" #: g10/g10.c:463 msgid "Show Photo IDs" -msgstr "okazanie identyfikatora - zdjêcia u¿ytkownika" +msgstr "okazywanie zdjêcia - identyfikatora u¿ytkownika" #: g10/g10.c:464 msgid "Don't show Photo IDs" @@ -742,9 +755,9 @@ msgstr "bez pokazywania zdjêæ" #: g10/g10.c:465 msgid "Set command line to view Photo IDs" -msgstr "polecenie wywo³ania przegl±darki do zdjêæ" +msgstr "polecenie wywo³uj±ce przegl±darkê do zdjêæ" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -752,7 +765,7 @@ msgstr "" "@\n" "(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -773,15 +786,15 @@ msgstr "" " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "B³êdy prosimy zg³aszaæ na adres .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -791,7 +804,7 @@ msgstr "" "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n" "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -799,372 +812,400 @@ msgstr "" "\n" "Obs³ugiwane algorytmy:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " -msgstr "" +msgstr "Asymetryczne: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " -msgstr "" +msgstr "Symetryczne: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " -msgstr "" +msgstr "Skrótów: " -#: g10/g10.c:673 g10/keyedit.c:1577 -#, fuzzy +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " -msgstr "Komentarz: " +msgstr "Kompresji: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "wywo³anie: gpg [opcje]" -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" -msgstr "w definicji grupy ,,%s'' brak znaku ,='\n" +msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" -msgstr "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do %s \"%s\".\n" +msgstr "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do %s ,,%s''.\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do %s ,,%s''.\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do katalogu\n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do katalogu \n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "UWAGA: stary domy¶lny plik opcji ,,%s'' zosta³ zignorowany\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji ,,%s''\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" -msgstr "plik opcji '%s': %s\n" +msgstr "plik opcji ,,%s'': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" -msgstr "odczyt opcji z '%s'\n" +msgstr "odczyt opcji z ,,%s''\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "modu³ szyfru ,,%s'' nie zosta³ za³adowany z powodu niebezpiecznych praw " "dostêpu\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u¿ywaæ %s z %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po³±czeniu z %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do " "tekstu\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "tej wiadomo¶ci mo¿e nie daæ siê odczytaæ za pomoc± %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" -msgstr "wybrany algorytm tworzenia skrótów wiadomo¶ci jest niepoprawny\n" +msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" -msgstr "wybrany algorytm tworzenia skrótów po¶wiadczeñ jest niepoprawny\n" +msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" -msgstr "ustawienie algortytmu kompresji musi pochodziæ z zakresu %d..%d\n" +msgstr "ustawienie kompresji musi pochodziæ z zakresu %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "" "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "niew³a¶ciwe domy¶lne ustawienia\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "niew³a¶ciwe ustawienia szyfrów\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "niew³a¶ciwe ustawienia skrótów\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "szyfr ,,%s'' nie jest dostêpny w trybie %s\n" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "skrót ,,%s'' nie jest dostêpny w trybie %s\n" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "kompresja ,,%s'' nie jest dostêpna w trybie %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" -msgstr "" -"OSTRZE¯ENIE: podano adresatów (-r) ale klucze publiczne nie s± u¿ywane\n" +msgstr "OSTRZE¯ENIE: podano adresatów (-r) w dzia³aniu które ich nie dotyczy\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, c-format +msgid "keyserver send failed: %s\n" +msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" + +#: g10/g10.c:2341 +#, c-format +msgid "keyserver receive failed: %s\n" +msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" + +#: g10/g10.c:2343 +#, c-format +msgid "key export failed: %s\n" +msgstr "eksport kluczy nie powiód³ siê: %s\n" + +#: g10/g10.c:2355 +#, c-format +msgid "keyserver search failed: %s\n" +msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n" + +#: g10/g10.c:2365 +#, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" -msgstr "nie mo¿na otworzyæ ,%s'\n" +msgstr "nie mo¿na otworzyæ ,,%s''\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki i podkre¶lenia, \n" -"i musi koñczyæ siê ,='\n" +"i musi koñczyæ siê ,,=''\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "adnotacja u¿ytkownika musi zawieraæ znak '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" -msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" +msgstr "tre¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" -msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n" +msgstr "podany URL regulaminu po¶wiadczania jest niepoprawny\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" #: g10/gpgv.c:68 -#, fuzzy msgid "take the keys from this keyring" -msgstr "Usun±æ ten klucz ze zbioru? " +msgstr "pobieranie kluczy z tego zbioru" #: g10/gpgv.c:70 -#, fuzzy msgid "make timestamp conflicts only a warning" -msgstr "konflikt znaczników czasu" +msgstr "nie traktowaæ konfliktu datowników jako b³êdu" #: g10/gpgv.c:99 -#, fuzzy msgid "Usage: gpgv [options] [files] (-h for help)" -msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)" +msgstr "Wywo³anie: gpgv [opcje] [pliki] (-h podaje pomoc)" #: g10/gpgv.c:102 -#, fuzzy msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sk³adnia: gpgm [opcje] [pliki]\n" -"GnuPG program obs³uguj±cy\n" +"Sprawdzanie podpisów ze znanych zaufanych kluczy\n" #: g10/armor.c:321 #, c-format @@ -1181,11 +1222,11 @@ msgstr "nag³ówek opakowania: " #: g10/armor.c:368 msgid "invalid clearsig header\n" -msgstr "niew³a¶ciwy nag³ówek czytelnego podpisanego dokumentu\n" +msgstr "niew³a¶ciwy nag³ówek dokumentu z podpisem na koñcu\n" #: g10/armor.c:420 msgid "nested clear text signatures\n" -msgstr "zagnie¿d¿one podpisy na czytelnym dokumencie\n" +msgstr "zagnie¿d¿one podpisy na koñcu dokumentu\n" #: g10/armor.c:544 msgid "invalid dash escaped line: " @@ -1198,7 +1239,7 @@ msgstr "nieoczekiwane opakowanie:" #: g10/armor.c:682 g10/armor.c:1258 #, c-format msgid "invalid radix64 character %02x skipped\n" -msgstr "niew³a¶ciwy znak formatu radix64 %02x zosta³ pominiêty\n" +msgstr "niew³a¶ciwy znak formatu radix64: ,,%02x'', zosta³ pominiêty\n" #: g10/armor.c:725 msgid "premature eof (no CRC)\n" @@ -1239,27 +1280,27 @@ msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n" -"przek³amanie wprowadzone przez program transportowy poczty\n" +"przek³amanie wprowadzone przez serwer pocztowy\n" #: g10/pkclist.c:63 g10/revoke.c:603 msgid "No reason specified" -msgstr "Nie podano przyczyny" +msgstr "nie podano przyczyny" #: g10/pkclist.c:65 g10/revoke.c:605 msgid "Key is superseded" -msgstr "Klucz zosta³ zast±piony" +msgstr "klucz zosta³ zast±piony" #: g10/pkclist.c:67 g10/revoke.c:604 msgid "Key has been compromised" -msgstr "Klucz zosta³ skompromitowany" +msgstr "klucz zosta³ skompromitowany" #: g10/pkclist.c:69 g10/revoke.c:606 msgid "Key is no longer used" -msgstr "Klucz nie jest ju¿ u¿ywany" +msgstr "klucz nie jest ju¿ u¿ywany" #: g10/pkclist.c:71 g10/revoke.c:607 msgid "User ID is no longer valid" -msgstr "Identyfikator u¿ytkownika przesta³ byæ poprawny" +msgstr "identyfikator u¿ytkownika przesta³ byæ poprawny" #: g10/pkclist.c:75 msgid "reason for revocation: " @@ -1283,7 +1324,7 @@ msgstr "" "Brak warto¶ci zaufania dla:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1295,8 +1336,9 @@ msgid "" "\n" msgstr "" "Zastanów siê jak bardzo ufasz temu u¿ytkownikowi w kwestii sprawdzania\n" -"to¿samo¶ci innych w³a¶cicieli kluczy (czy sprawdzi on odciski klucza \n" -"pobrane z ró¿nych ¼róde³, dokumenty potwierdzaj±ce to¿samo¶æ, itd.)?\n" +"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" +"\n" #: g10/pkclist.c:304 #, c-format @@ -1340,7 +1382,7 @@ msgstr " p = pominiêcie klucza\n" msgid " q = quit\n" msgstr " w = wyj¶cie\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Twoja decyzja? " @@ -1407,7 +1449,7 @@ msgid "" msgstr "" "NIE MA pewno¶ci, czy klucz nale¿y do osoby wymienionej w identyfikatorze.\n" "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" +"mo¿esz odpowiedzieæ ,,tak'' na nastêpne pytanie.\n" "\n" #: g10/pkclist.c:564 g10/pkclist.c:594 @@ -1450,13 +1492,13 @@ msgstr "OSTRZE¯ENIE: NIE UFAMY temu kluc #: g10/pkclist.c:644 msgid " The signature is probably a FORGERY.\n" -msgstr " Ten podpis prawdopodobnie jest FA£SZERSTWEM.\n" +msgstr " Ten podpis prawdopodobnie jest FA£SZYWY.\n" #: g10/pkclist.c:652 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -"OSTRZE¯ENIE: Tego klucza nie po¶wiadczaj± wystarczaj±c zaufane podpisy!\n" +"OSTRZE¯ENIE: Tego klucza nie po¶wiadczaj± wystarczaj±co zaufane podpisy!\n" #: g10/pkclist.c:654 msgid " It is not certain that the signature belongs to the owner.\n" @@ -1472,7 +1514,7 @@ msgstr "%s: pominiêty: %s\n" #: g10/pkclist.c:818 g10/pkclist.c:1022 #, c-format msgid "%s: skipped: public key already present\n" -msgstr "%s: pominiêty: zosta³ ju¿ wybrany\n" +msgstr "%s: pominiêty: zosta³ ju¿ wybrany w innej opcji\n" #: g10/pkclist.c:849 msgid "You did not specify a user ID. (you may use \"-r\")\n" @@ -1496,131 +1538,130 @@ msgstr "pominiêty: klucz publiczny ju¿ j #: g10/pkclist.c:901 msgid "Public key is disabled.\n" -msgstr "Klucz publiczny wy³±czony z uzycia.\n" +msgstr "Klucz publiczny wy³±czony z u¿ycia.\n" #: g10/pkclist.c:908 msgid "skipped: public key already set\n" -msgstr "pominiêty: zosta³ ju¿ wybrany\n" +msgstr "pominiêty: zosta³ ju¿ wybrany w innej opcji\n" #: g10/pkclist.c:957 #, c-format msgid "unknown default recipient `%s'\n" -msgstr "nieznany domy¶lny adresat '%s'\n" +msgstr "nieznany domy¶lny adresat ,,%s''\n" #: g10/pkclist.c:1002 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n" +msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ytku\n" #: g10/pkclist.c:1057 msgid "no valid addressees\n" msgstr "brak poprawnych adresatów\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "ustawienie %c%lu jest niepoprawne\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "ustawienie %c%lu powtarza siê\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "zbyt wiele `%c' ustawieñ\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "niew³a¶ciwy znak w tek¶cie ustawieñ\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "zapis podpisu bezpo¶redniego\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "zapis podpisu klucza nim samym\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "zapis podpisu wi±¿±cego klucz\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "niew³a¶ciwa d³ugo¶æ klucza; wykorzystano %u bitów\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "rozmair klucza zaokr±glony do %u bitów\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Proszê wybraæ rodzaj klucza:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (tylko do podpisywania)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (tylko do podpisywania)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (tylko do szyfrowania)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Twój wybór? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -"Ten algorytm szyfruj±cy jest wspierany tylko przez GnuPG. Tego klucza nie " +"Ten algorytm szyfruj±cy jest u¿ywany tylko przez GnuPG. Tego klucza nie " "bêdzie\n" -"mo¿na u¿yæ do ³±czno¶ci z u¿ytkownikami PGP. Wybrany algorytm jest tak¿e " -"bardzo \n" -"powolny, oraz mo¿e nie byæ tak bezpieczny jak pozosta³e dostêpne.\n" +"mo¿na u¿yæ do ³±czno¶ci z u¿ytkownikami PGP. Wybrany algorytm jest tak¿e\n" +"bardzo powolny, oraz mo¿e nie byæ tak bezpieczny jak pozosta³e dostêpne.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Stworzyæ klucz pomimo to? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Niew³a¶ciwy wybór.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1633,20 +1674,20 @@ msgstr "" " domy¶lny rozmiar klucza wynosi 1024 bity\n" " najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n" @@ -1658,24 +1699,24 @@ msgstr "D³ugo¶æ klucza zbyt ma³a; minima #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -"Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n" -"trwaj± wtedy BARDZO d³ugo!\n" +"Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ potrzebne\n" +"obliczenia trwaj± wtedy BARDZO d³ugo!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1683,17 +1724,17 @@ msgstr "" "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n" "komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" -msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n" +msgstr "¯±dana d³ugo¶æ klucza to %u bitów.\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokr±glono do %u bitów\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1709,7 +1750,7 @@ msgstr "" " 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:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1725,30 +1766,30 @@ msgstr "" " 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:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Okres wa¿no¶ci klucza ? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Okres wa¿no¶ci podpisu? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "niepoprawna warto¶æ\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" -msgstr "%s nie ma daty wa¿no¶ci (nie traci wa¿no¶ci z up³ywem czasu).\n" +msgstr "%s nie ma daty wa¿no¶ci\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s traci wa¿no¶æ: %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1756,11 +1797,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " -msgstr "Dane poprawne (t/n)? " +msgstr "Czy wszystko siê zgadza (t/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1770,50 +1811,50 @@ msgid "" "\n" msgstr "" "\n" -"Musisz okre¶liæ identyfikator u¿ytkownika aby mo¿na by³o rozpoznaæ twój\n" -"klucz; program z³o¿y go z twojego imienia i nazwiska, komentarza i adresu\n" -"poczty elektronicznej. Bêdzie on mia³ tak± postaæ:\n" -" \"Tadeusz ¯eleñski (Boy) \"\n" +"Musisz podaæ identyfikator u¿ytkownika aby mo¿na by³o rozpoznaæ twój klucz;\n" +"program z³o¿y go z twojego imienia i nazwiska, komentarza i adresu poczty\n" +"elektronicznej. Bêdzie on mia³, na przyk³ad, tak± postaæ:\n" +" \"Tadeusz ¯eleñski (Boy) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Imiê i nazwisko: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 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:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Adres poczty elektronicznej: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "To nie jest poprawny adres poczty elektronicznej\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Komentarz: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Niew³a¶ciwy znak w komentarzu\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "U¿ywasz zestawu znaków %s.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1824,49 +1865,47 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Nie nalezy umieszczaæ adresu poczty elektronicznej w polu nazwiska czy\n" "komentarza.\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "IiKkEeDdWw" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -msgstr "" -"Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n" -"czy (W)yj¶æ? " +msgstr "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj¶æ? " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" -"Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n" -"przej¶æ (D)alej czy (W)yj¶æ z programu ? " +"Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, przej¶æ (D)alej,\n" +"czy (W)yj¶æ z programu ? " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Najpierw trzeba poprawiæ ten b³±d\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 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:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1878,80 +1917,82 @@ msgstr "" "\"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"Musimy wygenerowaæ du¿o losowych bajtów. Dobrym pomys³em podczas " -"generowania\n" -"liczb pierszych jest wykonanywanie w tym czasie innych dzia³añ (pisanie na\n" -"klawiaturze, poruszanie myszk±, odwo³anie siê do dysków); dziêki temu\n" -"generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci " +"Musimy wygenerowaæ du¿o losowych bajtów. Dobrym pomys³em aby pomóc " +"komputerowi\n" +"podczas generowania liczb pierszych jest wykonywanie w tym czasie innych\n" +"dzia³añ (pisanie na klawiaturze, poruszanie myszk±, odwo³anie siê do " +"dysków);\n" +"dziêki temu generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej " +"ilo¶ci\n" "entropii.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Procedura generacji klucza zosta³a anulowana.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujê klucz publiczny w '%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" -msgstr "b³±d podczas zapisu zbioru kluczy publicznych `%s': %s\n" +msgstr "b³±d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" -msgstr "b³±d podczas zapisu zbioru kluczy tajnych `%s': %s\n" +msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "klucz publiczny i prywatny (tajny) zosta³y utworzone i podpisane.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "klucz zosta³ oznaczony jako obdarzony absolutnym zaufaniem.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\"\n" -"mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n" +"mo¿na dodaæ do niego podklucz szyfruj±cy.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1959,7 +2000,7 @@ msgstr "" "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1967,26 +2008,26 @@ msgstr "" "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " -msgstr "Na pewno utworzyæ? " +msgstr "Czy na pewno utworzyæ? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: nie mo¿na otworzyæ: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "b³±d podczas tworzenia has³a: %s\n" @@ -1996,17 +2037,17 @@ msgid "can't use a symmetric ESK packet msgstr "" "ustawiony tryb S2K nie pozwala u¿yæ pakietu ESK dla szyfru symetrycznego\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" -msgstr "`%s' ju¿ jest spakowany\n" +msgstr ",,%s'' ju¿ jest skompresowany\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo¿na szyfrowaæ dla kluczy RSA krótszych od 2048 bitów\n" @@ -2022,7 +2063,7 @@ msgid "" msgstr "" "nie mo¿na u¿yæ szyfru IDEA z wszystkimi kluczami dla których szyfrujesz.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "wymuszone u¿ycie szyfru %s (%d) k³óci siê z ustawieniami adresata\n" @@ -2037,435 +2078,423 @@ msgstr "wymuszone u¿ycie kompresji %s (% msgid "you may not use %s while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s zaszyfrowany dla: ,,%s''\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" -msgstr "klucz `%s' nie zosta³ odaleziony: %s\n" +msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "b³±d odczytu bloku kluczy: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "klucz %08lX: nie jest chroniony - pominiêty\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "OSTRZE¯ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[brak identyfikatora u¿ytkownika]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -"Niepoprawny klucz %08lX uznany za poprawny przez --allow non-selfsigned-" -"uid.\n" +"Opcja --allow-non-selfsigned-uid wymusi³a uznanie za poprawny klucza %08lX.\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n" +msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pominiêty\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d zostaje pominiêty\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu kluczy przetworzonych do tej chwili\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" -msgstr "b³±d odczytu '%s': %s\n" +msgstr "b³±d odczytu ,,%s'': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Ogó³em przetworzonych kluczy: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " pominiêtych nowych kluczy: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identyfikatora: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " do³±czono do zbioru: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " bez zmian: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nowych identyfikatorów: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nowych podkluczy: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nowych podpisów: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nowych uniewa¿nieñ kluczy: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " tajnych kluczy wczytanych: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " tajnych kluczy dodanych: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " tajnych kluczy bez zmian: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" -msgstr " nie do³±czono do zbioru: %lu\n" +msgstr " nie w³±czono do zbioru: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "UWAGA: Wykryto klucz g³ówny algorytmu ElGamala. Jego import potrwa jaki¶ " "czas.\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" -msgstr "klucz %08lX: klucz uszkodzony przez serwer zosta³ naprawiony\n" +msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta³ naprawiony\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" -msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym '%s'\n" +msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym ,,%s''\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" -msgstr "to mo¿e byæ spowodowane brakiem podpisu w³a¶ciciela klucza\n" +msgstr "to mo¿e byæ spowodowane brakiem podpisu klucza nim samym\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "klucz %08lX: brak klucza publicznego: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "klucz %08lX: nowy klucz - pominiêty\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "b³±d zapisu zbioru kluczy '%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" -msgstr "klucz %08lX: nie zgadza siê z lokalnie posiadan± kopi±\n" +msgstr "klucz %08lX: nie zgadza siê z lokaln± kopi±\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "klucz %08lX: nie mo¿na odczytaæ oryginalnego bloku klucza; %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u¿ytkownika\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "klucz %08lX: ,,%s'' %d nowych identyfikatorów u¿ytkownika\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "klucz %08lX: ,,%s'' %d nowych podpisów\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "klucz %08lX: ,,%s'' bez zmian\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pominiêty\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "brak domy¶lego zbioru kluczy tajnych: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "klucz %08lX: brak klucza tajnego: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -"klucz %08lX: brak klucza publicznego - wczytany certyfikat \n" -"uniwa¿nienia nie mo¿e byæ zastosowany\n" +"klucz %08lX: brak klucza publicznego którego dotyczy wczytany certyfikat\n" +" uniwa¿nienia\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - odrzucony\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "klucz %08lX: ,,%s'' certyfikat uniewa¿nienia zosta³ ju¿ wczytany\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" -msgstr "klucz %08lX: algorytm klucza publicznego \"%s\" nie jest obs³ugiwany\n" +msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs³ugiwany\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "klucz %08lX: brak podklucza do dowi±zania\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" -msgstr "" -"klucz %08lX: nie obs³ugiwany algorytm szyfrowania z kluczem publicznym\n" +msgstr "klucz %08lX: nie obs³ugiwany algorytm asymetryczny\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "klucz %08lX: usuniêto wielokrotne dowi±zanie podklucza\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "klucz %08lX: brak podklucza, którego dotyczy uniewa¿nienie\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "klucz %08lX: nieoprawne uniewa¿nienie podklucza\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "klucz %08lX: usuniêto wielokrotne uniewa¿nienie podklucza\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "klucz %08lX: pominiêto identyfikator u¿ytkownika '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "klucz %08lX: podklucz pominiêty\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiêty\n" +msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pominiêty\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -"klucz %08lX: certyfikat uniewa¿nienia umieszczony w niew³a¶ciwym \n" -"miejscu - zosta³ pominiêty\n" +"klucz %08lX: pominiêto certyfikat uniewa¿nienia umieszczony \n" +" w niew³a¶ciwym miejscu\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - pominiêty\n" +msgstr "klucz %08lX: pominiêto - niepoprawny certyfikat uniewa¿nienia: %s\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" -msgstr "klucz %08lX: podpis na podkluczu w niew³a¶ciwym miejscu - pominiêty\n" +msgstr "klucz %08lX: pominiêto - podpis na podkluczu w niew³a¶ciwym miejscu\n" -#: g10/import.c:1307 -#, fuzzy, c-format +#: g10/import.c:1270 +#, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" -msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiêty\n" +msgstr "klucz %08lX: pominiêto - nieoczekiwana klasa podpisu (%02x)\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "key %08lX: powtórzony identyfikator u¿ytkownika - do³±czony\n" +msgstr "key %08lX: do³±czono powtórzony identyfikator u¿ytkownika\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "OSTRZE¯ENIE: klucz %08lX móg³ zostaæ uniewazniony:\n" " zapytanie o uniewa¿niaj±cy klucz %08lX w serwerze kluczy\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "OSTRZE¯ENIE: klucz %08lX móg³ zostaæ uniewa¿niony:\n" " brak uniewa¿niaj±cego klucza %08lX.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa¿nienia\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "klucz %08lX: dodano bezpo¶redni podpis\n" @@ -2478,63 +2507,69 @@ msgstr "[uniewa¿nienie]" msgid "[self-signature]" msgstr "[podpis klucza nim samym]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 niepoprawny podpis\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d niepoprawnych podpisów\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 podpis nie zosta³ sprawdzony z powodu braku klucza\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d podpisów nie zosta³o sprawdzonych z powodu braku kluczy\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 podpis nie zosta³ sprawdzony z powodu b³êdu\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d podpisów nie sprawdzonych z powodu b³êdów\n" #: g10/keyedit.c:233 msgid "1 user ID without valid self-signature detected\n" -msgstr "wykryto 1 identyfikator u¿ytkownika bez podpisu w³a¶ciciela klucza\n" +msgstr "wykryto 1 identyfikator u¿ytkownika niepodpisany tym samym kluczem\n" #: g10/keyedit.c:235 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "" -"wykryto %d identyfikatorów u¿ytkownika bez podpisów w³a¶ciciela klucza\n" +"wykryto %d identyfikatorów u¿ytkownika niepodpisanych tym samym kluczem\n" #: g10/keyedit.c:362 #, c-format msgid "User ID \"%s\" is revoked." -msgstr "Identyfikator u¿ytkownika \"%s\" zosta³ uniewa¿niony." +msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ uniewa¿niony." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Czy na pewno chcesz podpisaæ? (t/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Nie da siê z³o¿yæ podpisu.\n" #: g10/keyedit.c:382 #, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" -msgstr "" -"OSTRZE¯ENIE: identyfikator '%s' nie jest podpisany tym samym kluczem.\n" +msgid "User ID \"%s\" is expired." +msgstr "Identyfikator u¿ytkownika ,,%s'' przekroczy³ swój termin wa¿no¶ci." -#: g10/keyedit.c:401 +#: g10/keyedit.c:402 +#, c-format +msgid "User ID \"%s\" is not self-signed." +msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem." + +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2543,28 +2578,26 @@ msgstr "" "Podpis klucza nim samym na ,,%s''\n" "jest podpisem z³o¿onym przez PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Czy chcesz zamieniæ go na podpis OpenPGP? (t/N) " -#: g10/keyedit.c:424 -#, fuzzy, c-format +#: g10/keyedit.c:460 +#, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" "Twój podpis na \"%s\"\n" -"jest podpisem prywatnym (lokalnym).\n" +"przekroczy³ datê wa¿no¶ci.\n" -#: g10/keyedit.c:428 -#, fuzzy +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "" -"Czy chcesz ¿eby wa¿no¶æ Twojego podpisu wygasa³a w tej samej chwili? (T/n) " +msgstr "Czy chcesz zast±piæ przeterminowany podpis nowym? (t/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2573,89 +2606,93 @@ msgstr "" "Twój podpis na \"%s\"\n" "jest podpisem prywatnym (lokalnym).\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" "Czy chcesz zamieniæ go na pe³ny, publiczny, eksportowalny podpis? (t/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" jest ju¿ lokalnie podpisany kluczem %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" jest ju¿ podpisany kluczem %08lX\n" -#: g10/keyedit.c:483 -#, fuzzy +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " -msgstr "Czy na pewno chcesz podpisaæ? (t/N) " +msgstr "Czy na pewno chcesz to podpisaæ? (t/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nie ma nic do podpisania kluczem %08lX.\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Data wa¿no¶ci tego klucza up³ynê³a!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Wa¿no¶æ tego klucza wygasa %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" "Czy chcesz ¿eby wa¿no¶æ Twojego podpisu wygasa³a w tej samej chwili? (T/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" -msgstr "W trybie --pgp2 nie mo¿na podpisywaæ w formacie OpenPGP.\n" +msgstr "" +"W trybie --pgp2 nie mo¿na podpisywaæ kluczy PGP 2.x podpisami OpenPGP.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" "Jak dok³adnie zosta³a przez Ciebie sprawdzona to¿samo¶æ tej osoby?\n" -"Je¶li nie wiesz co odpowiedzieæ, podaj \"0\".\n" +"Je¶li nie wiesz co odpowiedzieæ, podaj ,,0''.\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Nie odpowiem na to pytanie. %s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "(domy¶lnie)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) W ogóle nie.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Pobie¿nie.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Bardzo dok³adnie.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2663,7 +2700,7 @@ msgstr "" "Czy jeste¶ naprawdê pewien ¿e chcesz podpisaæ ten klucz \n" "swoim kluczem: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2671,15 +2708,15 @@ msgstr "" "\n" "To bêdzie podpis klucza nim samym.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" "\n" -"OSTRZE¯ENIE: podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n" +"OSTRZE¯ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2687,15 +2724,15 @@ msgstr "" "\n" "OSTRZE¯ENIE: podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" msgstr "" "\n" -"Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n" +"Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2703,7 +2740,7 @@ msgstr "" "\n" "Podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2711,7 +2748,7 @@ msgstr "" "\n" "To¿samo¶æ u¿ytkownika nie zosta³a w ogóle sprawdzona.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2719,7 +2756,7 @@ msgstr "" "\n" "To¿samo¶æ u¿ytkownika zosta³a sprawdzona pobie¿nie.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2727,42 +2764,42 @@ msgstr "" "\n" "To¿samo¶æ u¿ytkownika zosta³a dok³adnie sprawdzona.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Czy na pewno podpisaæ? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Ten klucz nie jest chroniony.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Klucz jest chroniony.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Tego klucza nie mo¿na edytowaæ: %s.\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -"Wprowad¼ nowe d³ugie has³o dla tego klucza tajnego.\n" +"Wprowad¼ nowe d³ugie, skomplikowane has³o dla tego klucza tajnego.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2770,499 +2807,492 @@ msgstr "" "Nie chcesz has³a - to *z³y* pomys³!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Czy na pewno chcesz to zrobiæ? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "wyj¶cie z tego menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "w" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "zapis" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "zapis zmian i wyj¶cie" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "pomoc" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "odc" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "okazanie odcisku klucza" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "lista" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lista kluczy i identyfikatorów u¿ytkowników" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "id" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "wybór identyfikatora u¿ytkownika N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "klucz" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "wybór podklucza N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "lista" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "lista podpisów" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "l" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "podpis" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "z³o¿enie podpisu na kluczu" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "p" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lpodpis" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" -msgstr "z³o¿enie lokalnego podpisu na kluczu" +msgstr "z³o¿enie prywatnego (lokalnego) podpisu na kluczu" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nupodpis" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nulpodpis" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" -msgstr "z³o¿enie na kluczu lokalnego podpisu nie podlegaj±cego uniewa¿nieniu" +msgstr "z³o¿enie na kluczu prywatnego podpisu nie podlegaj±cego uniewa¿nieniu" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "¶ledzenia" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "dodid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "dodfoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "dodanie zdjêcia u¿ytkownika do klucza" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "usid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "usuniêcie identyfikatora u¿ytkownika z klucza" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "usfoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "dodkl" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "dodanie podklucza" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "uskl" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "usuniêcie podklucza" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "dodun" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "wyznaczenie klucza uniewa¿niaj±cego" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "uspod" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "usuniêcie podpisów" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "data" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "zmiana daty wa¿no¶ci klucza" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "g³ówny" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "prze³" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" -msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i tajnych" +msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i prywatnych" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "p" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "opcje" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "ustawienia (zaawansowane)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "opcje" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "rozbudowana lista ustawieñ" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "ustaw" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "ustawienie opcji klucza" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "aktopc" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "aktualizacja ustawieñ klucza" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "has³o" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "zmiana has³a klucza" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "zaufanie" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "zmiana zaufania w³a¶ciciela" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "unpod" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "uniewa¿nienie podpisu" -#: g10/keyedit.c:980 -#, fuzzy +#: g10/keyedit.c:1017 msgid "revuid" msgstr "unpod" -#: g10/keyedit.c:980 -#, fuzzy +#: g10/keyedit.c:1017 msgid "revoke a user ID" -msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza" +msgstr "uniewa¿nienie identyfikatora u¿ytkownika" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "unpkl" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "uniewa¿nienie podklucza" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "wy³kl" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "wy³±czyæ klucz z u¿ycia" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "w³kl" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "w³±czyæ klucz do u¿ycia" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "foto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "okazanie identyfikatora - zdjêcia" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "nie dzia³a w trybie wsadowym\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Dostêpny jest klucz tajny.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Polecenie> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Klucz uniewa¿niony." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "To polecenie nie jest dostêpne w trybie %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Musisz wybraæ co najmniej jeden klucz.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Czy na pewno chcesz usun±æ wybrane klucze? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Czy na pewno chcesz usun±æ ten klucz? " -#: g10/keyedit.c:1325 -#, fuzzy +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " -msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? " +msgstr "Czy na pewno uniewa¿niæ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1326 -#, fuzzy +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " -msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " +msgstr "Czy na pewno uniewa¿niæ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Czy na pewno zaktualizowaæ ustawienia klucza dla wybranych identyfikatorów? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Czy na pewno usaktualniæ ustawienia? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Zapisaæ zmiany? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Wyj¶æ bez zapisania zmian? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" -msgstr "naniesienie poprawek nie powiod³o siê: %s\n" +msgstr "zapis zmian nie powiód³ siê: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" -msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n" +msgstr "zapis zmian na kluczu prywatnym nie powiód³ siê: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" -msgstr "" -"Klucz nie zosta³ zmieniony wiêc naniesienie poprawek nie jest konieczne.\n" +msgstr "Klucz nie zosta³ zmieniony wiêc zapis zmian nie jest konieczny.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (spróbuj \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " -msgstr "" +msgstr "Skrót: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " -msgstr "" +msgstr "Ustawienia: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (poufne)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "%s%c %4u%c/%08lX stworzony: %s, wygasa: %s" +msgstr "%s%c %4u%c/%08lX utworzony: %s, wygasa: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Ten klucz zosta³ wy³±czony z u¿ytku" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "podklucz zosta³ uniewa¿niony: %s\n" +msgstr "un! podklucz zosta³ uniewa¿niony: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" -msgstr "fa³szywy certyfikat uniewa¿nienia\n" +msgstr "un- fa³szywy certyfikat uniewa¿nienia\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "problem przy sprawdzaniu uniewa¿nienia: %s\n" +msgstr "un? problem przy sprawdzaniu uniewa¿nienia: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "unpkl" +msgstr "[uniewa¿niony]" -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "data" +msgstr "[przeterminowany]" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3270,143 +3300,149 @@ msgstr "" "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n" "dopóki program nie zostanie uruchomiony ponownie.\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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 "" +"OSTRZE¯ENIE: ¿aden identyfikator u¿ytkownika nie zosta³ oznaczony explicite\n" +" 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:2166 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 "" -"OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e " -"niektóre \n" -" wersje przestan± go rozumieæ.\n" +"OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n" +" niektóre wersje przestan± go rozumieæ.\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Czy dalej chcesz je dodaæ? (t/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "Do klucza dla wersji 2 PGP nie mo¿na dodaæ zdjêcia.\n" +msgstr "Do klucza dla PGP 2.x nie mo¿na dodaæ zdjêcia.\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Usun±æ ten poprawny podpis? (t/N/w) " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) " -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Usun±æ ten nieznany podpis? (t/N/w) " -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) " -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d podpis usuniêty.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d podpisów usuniêtych.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nic nie zosta³o usuniête.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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 "" -"OSTRZE¯ENIE: To jest klucz PGP wersji 2. Wyznaczenie mu " -"kluczauniewa¿niaj±cego, \n" -" spowoduje ¿e niektóre wersje wersje przestan± go rozumieæ.\n" +"OSTRZE¯ENIE: To jest klucz PGP wersji 2.x. Wyznaczenie mu klucza\n" +" uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n" +" go rozumieæ.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" -msgstr "" -"Do klucza dla wersji 2 PGP nie mo¿na wyznaczyæ klucza uniewa¿niaj±cego.\n" +msgstr "Do klucza dla PGP 2.x nie mo¿na wyznaczyæ klucza uniewa¿niaj±cego.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " -msgstr "Podaj indentyfikator klucza uniewa¿niaj±cego: " +msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "nie mo¿na wyznaczuæ klucza do uniewa¿niania jego samego\n" +msgstr "" +"OSTRZE¯ENIE: nie mo¿na cofn±æ wyznaczenia klucza jako uniewa¿niaj±cego!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "nie mo¿na wyznaczuæ klucza do uniewa¿niania jego samego\n" +msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" -msgstr "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n" +msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Proszê wybraæ tylko jeden podklucz.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa¿no¶ci podklucza.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" -msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n" +msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o numerze %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "Identyfikator u¿ytkownika: " -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3415,7 +3451,7 @@ msgstr "" "\"\n" "podpisano Twoim kluczem %08lX w %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3424,126 +3460,128 @@ msgstr "" "\"\n" "lokalnie podpisano Twoim kluczem %08lX w %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" -msgstr "Te identyfikatory u¿ytkowników s± podpisane przez Ciebie:\n" +msgstr "Te identyfikatory s± podpisane przez Ciebie:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr "podpisany przez %08lX w %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr "uniewa¿niony przez %08lX w %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr "podpisany przez %08lX w %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "brak klucza tajnego\n" -#: g10/keyedit.c:3243 -#, fuzzy, c-format +#: g10/keyedit.c:3319 +#, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "Identyfikator u¿ytkownika \"%s\" zosta³ uniewa¿niony." +msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n" #. Okay, this is a problem. The user ID selfsig was #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 -#, fuzzy, c-format +#: g10/keyedit.c:3336 +#, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" -msgstr "OSTRZE¯ENIE: konflikt skrótów podpisów w wiadomo¶ci\n" +msgstr "" +"OSTRZE¯ENIE: identyfikator u¿ytkownika podpisany za %d sekund (w " +"przysz³o¶ci)\n" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Krytyczny regulamin podpisu: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Regulamin podpisu: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Krytyczne adnotacje podpisu: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Adnotacje podpisu: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "nieczytelne dla cz³owieka" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Zbiór kluczy" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [wygasa :%s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Odcisk klucza g³ównego:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Odcisk klucza g³ównego:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Odcisk klucza =" @@ -3599,16 +3637,15 @@ msgstr "przyjmuj±c ¿e dane zosta³y zaszy #: g10/mainproc.c:474 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" -msgstr "szyfr IDEA nie jest dostêpny, %s zostanie wykorzystany zamiast niego\n" +msgstr "szyfr IDEA nie jest dostêpny, próba u¿ycia %s zamiast\n" #: g10/mainproc.c:504 msgid "decryption okay\n" msgstr "odszyfrowanie poprawne\n" #: g10/mainproc.c:508 -#, fuzzy msgid "WARNING: message was not integrity protected\n" -msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n" +msgstr "OSTRZE¯ENIE: wiadomo¶æ nie by³a zabezpieczona przed manipulacj±\n" #: g10/mainproc.c:511 msgid "WARNING: encrypted message has been manipulated!\n" @@ -3628,103 +3665,109 @@ msgstr "UWAGA: nadawca zaznaczy³ ¿e wiad msgid "original file name='%.*s'\n" msgstr "pierwotna nazwa pliku='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -"osobny certyfikat uniewa¿nienia - u¿yj ,,gpg --import'' aby go przyj±æ\n" +"osobny certyfikat uniewa¿nienia - u¿yj ,,gpg --import'' aby go wczytaæ\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Adnotacja: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Regulamin: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "wymuszono pominiêcie sprawdzenia podpisu\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "nie mo¿na obs³uzyæ tych wielokrotnych podpisów\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +msgid "Key available at: " +msgstr "Klucz dostêpny w: " + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "NIEPOPRAWNY podpis z³o¿ony przez \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Przeterminowany podpis z³o¿ony przez \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Poprawny podpis z³o¿ony przez \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[niepewne]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" +msgstr "Wa¿no¶æ podpisu wygas³a %s.\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" +msgstr "Wa¿no¶æ podpisu wygasa %s.\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s podpis z³o¿ony przez: ,,%s''\n" +msgstr "podpis %s, skrót %s\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "g³ówny" +msgstr "binarny" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "tekstowy" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "nieznana wersja" +msgstr "nieznany" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Nie mo¿na sprawdziæ podpisu: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "nie jest oddzielonym podpisem.\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "oddzielony podpis klasy 0x%02x.\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starego typu (PGP 2.x).\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" @@ -3751,75 +3794,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "wiêcej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d jest przestarza³± opcj± ,,%s''\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "OSTRZE¯ENIE: ,,%s'' jest przestarza³± opcj±.\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "w jej miejsce nale¿y u¿yæ ,,%s%s''\"\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, 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/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie jest dostêpny w tej sesji\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "nie mo¿na ustawiæ numeru procesu klienckiego agenta\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "serwer nie chce czytaæ deskryptora dla agenta\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "serwer nie chce pisaæ deskryptora dla agenta\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "z³y format zmiennej GPG_AGENT_INFO\n" +msgstr "z³y format zmiennej ¶rodowiskowej GPG_AGENT_INFO\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" -msgstr "problem z porozumiewaniem siê z gpg-agentem\n" +msgstr "problem z porozumiewaniem siê z agentem\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy³±czony\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (podklucz %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3830,55 +3878,55 @@ msgstr "" "\"%.*s\".\n" "Klucz o d³ugo¶ci %u bitów, typ %s, numer %08lX, stworzony %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Powtórzone has³o\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Has³o\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "has³o zbyt d³ugie\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "b³êdna odpowied¼ agenta\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "anulowano przez u¿ytkownika\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" "\n" -"Musisz podaæ has³o aby odbezpieczyæ klucz tajny u¿ytkownika:\n" +"Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n" "\"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Podaj has³o: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Powtórz has³o: " @@ -3911,7 +3959,7 @@ msgstr "brak podpisanych danych\n" #: g10/plaintext.c:406 #, c-format msgid "can't open signed data `%s'\n" -msgstr "nie mo¿na otworzyæ podpisanego pliku '%s'\n" +msgstr "nie mo¿na otworzyæ podpisanego pliku ,,%s''\n" #: g10/pubkey-enc.c:101 #, c-format @@ -3929,7 +3977,7 @@ msgstr "stary, nie obs³ugiwany algorytm #: g10/pubkey-enc.c:178 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "algorytm szyfruj±cy %d%s jest nieznany, b±d¼ te¿ zosta³ wy³±czony\n" +msgstr "algorytm szyfruj±cy %d%s jest nieznany, lub zosta³ wy³±czony\n" #: g10/pubkey-enc.c:221 #, c-format @@ -3958,26 +4006,26 @@ msgstr "nie mo¿na pobraæ klucza z serwer #: g10/hkp.c:179 #, c-format msgid "error sending to `%s': %s\n" -msgstr "b³±d przy wysy³aniu do '%s': %s\n" +msgstr "b³±d przy wysy³aniu do ,,%s'': %s\n" #: g10/hkp.c:194 #, c-format msgid "success sending to `%s' (status=%u)\n" -msgstr "wysy³anie do '%s' powiod³o siê (status=%u)\n" +msgstr "wysy³anie do ,,%s'' powiod³o siê (status=%u)\n" #: g10/hkp.c:197 #, c-format msgid "failed sending to `%s': status=%u\n" -msgstr "wysy³anie do '%s' nie powiod³o siê (status=%u)\n" +msgstr "wysy³anie do ,,%s'' nie powiod³o siê (status=%u)\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "serwer kluczy nie jest w pe³ni zgodny z HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "ten serwer kluczy nie umo¿liwia przeszukiwania\n" #: g10/hkp.c:519 #, c-format msgid "searching for \"%s\" from HKP server %s\n" -msgstr "zapytanie o \"%s\" w serwerze HKP %s\n" +msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" #: g10/hkp.c:571 #, c-format @@ -4012,11 +4060,11 @@ msgid "generating the deprecated 16-bit msgstr "" "tworzenie przestarza³ej 16-bitowej sumy kontrolnej dla ochrony klucza\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "OSTRZE¯ENIE: konflikt skrótów podpisów w wiadomo¶ci\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4025,17 +4073,17 @@ msgstr "" "klucz %08lX: Klucz algorytmu ElGamala wygenerowany przez PGP \n" " - podpisy nim sk³adane nie zapewniaj± bezpieczeñstwa!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "klucz publiczny %08lX jest o %lu sekundê m³odszy od podpisu\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "klucz publiczny %08lX jest o %lu sekund(y) m³odszy od podpisu\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4044,7 +4092,7 @@ msgstr "" "klucz %08lX zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4053,56 +4101,61 @@ msgstr "" "klucz %08lX zosta³ stworzony %lu sekund(y) w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "UWAGA: klucz podpisuj±cy %08lX przekroczy³ datê wa¿no¶ci %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "podpis z³o¿ony kluczem %08lX uznany za niewa¿ny z powodu nieznanego bitu " "krytycznego\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "klucz %08lX: brak podklucza, którego dotyczy uniewa¿nienie\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "klucz %08lX: brak podklucza dowi±zywanego podpisem\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" +msgstr "nie mo¿na umie¶ciæ adnotacji w podpisach sk³adanych kluczami PGP 2.x\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" +msgstr "" +"nie mo¿na umie¶ciæ adnotacji w podpisach kluczy sk³adanych kluczami PGP 2.x\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "OSTRZE¯ENIE: nie mo¿na rozwin±æ %% w URL adnotacji (jest zbyt d³ugi).\n" " U¿yty zostanie nie rozwiniêty.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" +msgstr "" +"nie mo¿na umie¶ciæ URL-a regulaminu w podpisach sk³adanych kluczami PGP 2.x\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" +"w podpisach dla PGP 2.x nie mo¿na umie¶ciæ URL-a do regulaminu podpisu\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" msgstr "" -"OSTRZE¯ENIE: nie mo¿na rozwin±æ %% w URL regulaminu (jest zbyt d³ugi).\n" -" U¿yty zostanie nie rozwiniêty.\n" +"OSTRZE¯ENIE: nie mo¿na rozwin±æ znaczników %% w URL regulaminu\n" +" (jest zbyt d³ugi). U¿yty zostanie nie rozwiniêty.\n" #: g10/sign.c:307 #, c-format @@ -4117,20 +4170,20 @@ msgstr "%s podpis z³o¿ony przez: ,,%s''\ #: g10/sign.c:465 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n" +msgstr "OSTRZE¯ENIE: plik ,,%s'' jest pusty\n" #: g10/sign.c:648 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -"kluczami PGP 2.x w trybie --pgp2 mo¿na podpisywaæ tylko do oddzielonych " +"kluczami PGP 2 w trybie --pgp2 mo¿na podpisywaæ tylko do oddzielonych " "podpisów\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "nie mo¿na utworzyæ %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "wymuszone u¿ycie skrótu %s (%d) k³óci siê z ustawieniami adresata\n" @@ -4143,7 +4196,7 @@ msgstr "podpis:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "w trybie --pgp2 mo¿na podpisywaæ tylko za pomoc± kluczy z wersji 2.x\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "zostanie u¿yty szyfr %s\n" @@ -4158,12 +4211,12 @@ msgstr "nie mo¿na obs³u¿yæ linii tekstu msgid "input line longer than %d characters\n" msgstr "linia d³u¿sza ni¿ %d znaków\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "baza zaufania, wpis %lu: lseek() nie powiod³a siê: %s\n" +msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod³a siê: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4172,130 +4225,130 @@ msgstr "baza zaufania, wpis %lu: zapis n msgid "trustdb transaction too large\n" msgstr "zbyt du¿e zlecenie dla bazy zaufania\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: dostêp niemo¿liwy: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: katalog nie istnieje!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: nie mo¿na utworzyæ blokady\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: nie mo¿na utworzyæ blokady\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: nie mo¿na utworzyæ: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: stworzenie zapisu o wersji nie powiod³o siê: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: stworzony niepoprawny plik bazy zaufania\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: baza zaufania utworzona\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "UWAGA: nie mo¿na zapisywaæ bazy zaufania\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: niepoprawny plik bazy zaufania\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, 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:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: b³±d przy uaktualnianiu numeru wersji: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: b³±d odczytu numeru wersji: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: b³±d zapisu numeru wersji: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "baza zaufania: procedura lseek() zawiod³a: %s\n" +msgstr "baza zaufania: funkcja lseek() zawiod³a: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "baza zaufania: procedura read() (n=%d) zawiod³a: %s\n" +msgstr "baza zaufania: funkcja read() (n=%d) zawiod³a: %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: to nie jest plik bazy zaufania\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: wpis wersji z numerem %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: niew³a¶ciwa wersja pliku %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: b³±d odczytu pustego wpisu: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: b³±d zapisu wpisu katalogowego: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: zerowanie rekordu nie powiod³o siê: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: dopisanie rekordu nie powiod³o siê: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"Baza zaufania jest uszkodzona; proszê uruchomiæ \"gpg --fix-trustdb\".\n" +"Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n" #: g10/trustdb.c:201 #, c-format msgid "`%s' is not a valid long keyID\n" -msgstr "`%s' nie jest poprawnym d³ugim numerem klucza\n" +msgstr ",,%s'' nie jest poprawnym d³ugim numerem klucza\n" #: g10/trustdb.c:236 #, c-format @@ -4338,39 +4391,38 @@ msgstr "wpis zaufania %lu, typ zapytania msgid "trustdb: sync failed: %s\n" msgstr "baza zaufania: synchronizacja nie powiod³a siê %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "nastêpne sprawdzanie bazy odbêdzie siê %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "sprawdzanie bazy zaufania\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "klucz publiczny %08lX nie odnaleziony: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" +msgstr "brak absolutnie zaufanych kluczy\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" @@ -4378,7 +4430,7 @@ msgstr "klucz publiczny absolutnie zaufa #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4409,16 +4461,16 @@ msgstr "" #: g10/skclist.c:157 #, c-format msgid "skipped `%s': duplicated\n" -msgstr "pominiêty '%s': duplikat\n" +msgstr "pominiêty ,,%s'': duplikat\n" #: g10/skclist.c:164 g10/skclist.c:172 #, c-format msgid "skipped `%s': %s\n" -msgstr "pominiêty '%s': %s\n" +msgstr "pominiêty ,,%s'': %s\n" #: g10/skclist.c:168 msgid "skipped: secret key already present\n" -msgstr "pominiêty: klucz tajny ju¿ znajduje siê w bazie\n" +msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n" #: g10/skclist.c:179 #, c-format @@ -4426,14 +4478,14 @@ msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"pominiêty '%s': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n" +"pominiêty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n" "podpisy sk³adane tym kluczem nie zapewniaj± bezpieczeñstwa!\n" #. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " -msgstr "Plik '%s' ju¿ istnieje. " +msgstr "Plik ,,%s'' ju¿ istnieje. " #: g10/openfile.c:86 msgid "Overwrite (y/N)? " @@ -4442,7 +4494,7 @@ msgstr "Nadpisaæ (t/N)? " #: g10/openfile.c:119 #, c-format msgid "%s: unknown suffix\n" -msgstr "%s: nieznana koñcówka\n" +msgstr "%s: nieznana koñcówka nazwy\n" #: g10/openfile.c:141 msgid "Enter new filename" @@ -4465,7 +4517,7 @@ msgstr "nowy plik ustawieñ ,,%s'' zosta³ #: g10/openfile.c:354 #, c-format msgid "WARNING: options in `%s' are not yet active during this run\n" -msgstr "OSTRZE¯ENIE: opcje w '%s' nie s± jeszcze uwzglêdnione.\n" +msgstr "OSTRZE¯ENIE: opcje w ,,%s'' nie s± jeszcze uwzglêdnione.\n" #: g10/openfile.c:383 #, c-format @@ -4531,7 +4583,7 @@ msgstr "informacja o zaufaniu dla w³a¶ci #: g10/delkey.c:206 #, c-format msgid "there is a secret key for public key \"%s\"!\n" -msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n" +msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n" #: g10/delkey.c:208 msgid "use option \"--delete-secret-keys\" to delete it first.\n" @@ -4557,20 +4609,20 @@ msgid "" msgstr "" "Aby zbudowaæ Sieæ Zaufania, GnuPG potrzebuje znaæ klucze do których\n" "masz absolutne zaufanie. Zwykle s± to klucze do których masz klucze\n" -"tajne. Odpowiedz \"tak\", je¶li chcesz okre¶liæ ten klucz jako klucz\n" +"tajne. Odpowiedz ,,tak'', je¶li chcesz okre¶liæ ten klucz jako klucz\n" "do którego masz absolutne zaufanie.\n" #: g10/helptext.c:60 msgid "If you want to use this revoked key anyway, answer \"yes\"." msgstr "" -"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz \"tak" -"\"." +"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz ,," +"tak''." #: g10/helptext.c:64 msgid "If you want to use this untrusted key anyway, answer \"yes\"." msgstr "" "Je¶li mimo wszystko chcesz u¿yæ tego klucza, klucza, co do którego nie ma\n" -"¿adnej pewno¶ci do kogo nale¿y, odpowiedz \"tak\"." +"¿adnej pewno¶ci do kogo nale¿y, odpowiedz ,,tak''." #: g10/helptext.c:68 msgid "" @@ -4600,17 +4652,17 @@ msgstr "" "Wybór algorytmu.\n" "\n" "DSA (zwany te¿ DSS) to algorytm podpisu cyfrowego i tylko do sk³adania\n" -"podpisów mo¿e byæ u¿ywany. Jest to preferowany algorytm poniewa¿\n" +"podpisów mo¿e byæ u¿ywany. Jest to algorytm preferowany, gdy¿\n" "sk³adane nim podpisy sprawdza siê du¿o szybciej ni¿ te sk³adane\n" "algorytmem ElGamala.\n" "\n" -"Algorytm ElGamala mo¿e byæ u¿ywany zarówno do podpisów jak i do\n" -"szyfrowania. Standard OpenPGP rozró¿nia dwa typy tego algorytmu -\n" -"tylko do szyfrowania, oraz do szyfrowania i podpisywania. Faktycznie\n" -"algorytm pozostaje bez zmian ale pewne parametry musz± byæ odpowiednio\n" -"dobrane aby stworzyæ klucz którym mo¿na sk³adaæ bezpieczne\n" -"podpisy. Ten program obs³uguje oba typy ale inne implementacje nnie\n" -"musz± rozumieæ kluczy do podpisów i szyfrowania\n" +"Algorytm ElGamala mo¿e byæ u¿ywany zarówno do podpisów jak i do " +"szyfrowania.\n" +"Standard OpenPGP rozró¿nia dwa typy tego algorytmu - tylko do szyfrowania,\n" +"oraz do szyfrowania i podpisywania. Algorytm pozostaje bez zmian ale pewne\n" +"parametry musz± byæ odpowiednio dobrane aby stworzyæ klucz którym mo¿na\n" +"sk³adaæ bezpieczne podpisy. Ten program obs³uguje oba typy ale inne\n" +"implementacje nnie musz± rozumieæ kluczy do podpisów i szyfrowania\n" "\n" "G³ówny klucz musi byæ kluczem podpisuj±cym, jest to powodem dla\n" "którego w tym menu nie ma mo¿no¶ci wyboru klucza ElGamala do\n" @@ -4622,8 +4674,10 @@ msgid "" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -"Ten typ klucza jest zdefiniowany w RFC2440, jednak¿e jest on odradzany\n" -"gdy¿ nie jest obs³ugiwany przez wszystkie programy, a podpisy nim\n" +"Ten typ klucza jest zdefiniowany w RFC2440, jednak¿e jest on odradzany, " +"gdy¿\n" +"nie jest obs³ugiwany przez wszystkie programy zgodne z OpenPGP, a podpisy " +"nim\n" "sk³adane s± du¿e i ich sprawdzanie trwa d³ugo." #: g10/helptext.c:98 @@ -4737,7 +4791,7 @@ msgstr "" "\n" "\"0\" oznacza, ¿e nie podajesz ¿adnych informacji na temat tego jak " "dog³êbnie\n" -" sprawdzi³a¶/e¶ to¿samo¶æ u¿ytkownika.\n" +" to¿samo¶æ u¿ytkownika zosta³a przez Ciebie potwierdzona.\n" "\n" "\"1\" oznacza, ¿e masz przekonanie, ¿e to¿samo¶æ u¿ytkownka odpowiada\n" " identyfikatorowi klucza, ale nie by³o mo¿liwo¶ci sprawdzenia tego.\n" @@ -4770,7 +4824,7 @@ msgid "" "All certificates are then also lost!" msgstr "" "Aby skasowaæ ten identyfikator u¿ytkownika (co wi±¿e siê ze utrat±\n" -"wszystkich jego po¶wiadczeñ!) nale¿y odpowiedzieæ \"tak\"." +"wszystkich jego po¶wiadczeñ!) nale¿y odpowiedzieæ ,,tak''." #: g10/helptext.c:209 msgid "Answer \"yes\" if it is okay to delete the subkey" @@ -4803,7 +4857,7 @@ msgstr "" msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." -msgstr "Ten podpis jest niepoprawny. Mo¿na usuni±æ go z bazy kluczy." +msgstr "Ten podpis jest niepoprawny. Mo¿na usuni±æ go ze zbioru kluczy." #: g10/helptext.c:229 msgid "" @@ -4831,7 +4885,7 @@ msgstr "" #: g10/helptext.c:244 msgid "Please enter the passhrase; this is a secret sentence \n" -msgstr "Podaj d³ugie, skomplikowane has³o, np ca³e zdanie.\n" +msgstr "Podaj d³ugie, skomplikowane has³o, np. ca³e zdanie.\n" #: g10/helptext.c:250 msgid "Please repeat the last passphrase, so you are sure what you typed in." @@ -4896,7 +4950,7 @@ msgstr "Pomoc niedostêpna" #: g10/helptext.c:309 #, c-format msgid "No help available for `%s'" -msgstr "Brak pomocy o '%s'" +msgstr "Brak pomocy o ,,%s''" #: g10/keydb.c:185 #, c-format @@ -4906,7 +4960,7 @@ msgstr "b³±d tworzenia zbioru kluczy `%s #: g10/keydb.c:192 #, c-format msgid "keyring `%s' created\n" -msgstr "zbiór kluczy `%s' utworzony\n" +msgstr "zbiór kluczy ,,%s'' zosta³ utworzony\n" #: g10/keydb.c:582 #, c-format @@ -4934,19 +4988,19 @@ msgstr "Proszê usun±æ to naruszenie zasa #: g10/keyring.c:1350 #, c-format msgid "checking keyring `%s'\n" -msgstr "sprawdzanie zbioru kluczy `%s'\n" +msgstr "sprawdzanie zbioru kluczy ,,%s''\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu kluczy do tej chwili (%lu podpisów)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu kluczy (%lu podpisów)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: zbiór kluczy utworzony\n" @@ -4959,173 +5013,168 @@ msgid "" "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" msgstr "" +"\n" +"Wybierz zdjêcie które chcesz do³±czyæ do swojego klucza jako identyfikator.\n" +"Musi to byæ plik w formacie JPEG. Zostanie on zapisany w Twoim kluczu\n" +"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:79 msgid "Enter JPEG filename for photo ID: " -msgstr "" +msgstr "Nazwa pliku ze zdjêciem w formacie JPEG: " #: g10/photoid.c:87 -#, fuzzy, c-format +#, c-format msgid "Unable to open photo \"%s\": %s\n" -msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" +msgstr "Nie mo¿na otworzyæ zdjêcia ,,%s'': %s.\n" #: g10/photoid.c:97 -#, fuzzy msgid "Are you sure you want to use it (y/N)? " -msgstr "Czy na pewno chcesz podpisaæ? (t/N) " +msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " #: g10/photoid.c:112 -#, fuzzy, c-format +#, c-format msgid "\"%s\" is not a JPEG file\n" -msgstr "%s: to nie jest plik bazy zaufania\n" +msgstr ",,%s'' nie jest plikiem JPEG\n" #: g10/photoid.c:129 -#, fuzzy msgid "Is this photo correct (y/N/q)? " -msgstr "Dane poprawne (t/n)? " +msgstr "Czy zdjêcie jest w porz±dku? (t/N/w) " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" +msgstr "nie mo¿na wy¶wietliæ zdjêcia!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" -msgstr "" +msgstr "odwo³ania do zewnêtrznych programów s± wy³±czone\n" #: g10/exec.c:184 -#, fuzzy, c-format +#, c-format msgid "can't create directory `%s': %s\n" -msgstr "%s: nie mo¿na utworzyæ katalogu: %s\n" +msgstr "nie mo¿na utworzyæ katalogu ,,%s'': %s\n" #: g10/exec.c:325 msgid "" "external program calls are disabled due to unsafe options file permissions\n" msgstr "" +"nieszczelne uprawnienia ustawieñ - wo³anie zewnêtrznych programów wy³±czone\n" #: g10/exec.c:355 msgid "this platform requires temp files when calling external programs\n" msgstr "" +"platforma wymaga u¿ycia plików tymczasowych do wo³ania zewnêtrznych " +"programów\n" #. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 -#, fuzzy, c-format +#, c-format msgid "unable to execute %s \"%s\": %s\n" -msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" +msgstr "nie mo¿na wykonaæ %s ,,%s'': %s\n" #: g10/exec.c:513 -#, fuzzy, c-format +#, c-format msgid "system error while calling external program: %s\n" -msgstr "%s: b³±d odczytu numeru wersji: %s\n" +msgstr "b³±d systemu podczas wo³ania programu zewnêtrznego: %s\n" #: g10/exec.c:524 g10/exec.c:583 msgid "unnatural exit of external program\n" -msgstr "" +msgstr "nienaturalne zakoñczenie pracy zewnêtrznego programu\n" #: g10/exec.c:539 -#, fuzzy msgid "unable to execute external program\n" -msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" +msgstr "nie mo¿na uruchomiæ zewnêtrznego programu\n" #: g10/exec.c:548 -#, fuzzy, c-format +#, c-format msgid "unable to read external program response: %s\n" -msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" +msgstr "nie mo¿na odczytaæ odpowiedzi programu zewnêtrznego: %s\n" #: g10/exec.c:594 g10/exec.c:601 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "" +msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ pliku tymczasowego (%s) ,,%s'': %s.\n" #: g10/exec.c:606 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" -msgstr "" -"OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do katalogu\n" -" zawieraj±cego %s ,,%s''\n" +msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ tymczasowego katalogu ,,%s'': %s.\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " -msgstr "" +msgstr "nigdy " #: g10/revoke.c:92 -#, fuzzy msgid "key incomplete\n" -msgstr "Komentarz (opcjonalny)" +msgstr "klucz jest niekompletny\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 #: g10/revoke.c:186 g10/revoke.c:568 -#, fuzzy, c-format +#, c-format msgid "build_packet failed: %s\n" -msgstr "naniesienie poprawek nie powiod³o siê: %s\n" +msgstr "wywo³anie funkcji build_packet nie powiod³o siê: %s\n" #: g10/revoke.c:145 -#, fuzzy, c-format +#, c-format msgid "key %08lX incomplete\n" -msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" +msgstr "klucz %08lX nie jest kompletny\n" #: g10/revoke.c:214 g10/revoke.c:433 -#, fuzzy msgid "sorry, can't do this in batch mode\n" -msgstr "nie dzia³a w trybie wsadowym\n" +msgstr "niestety, to nie dzia³a w trybie wsadowym\n" #: g10/revoke.c:281 msgid "To be revoked by:\n" -msgstr "" +msgstr "Zostanie uniewa¿niony przez:\n" #: g10/revoke.c:293 msgid "(This is a sensitive revocation key)\n" -msgstr "" +msgstr "(to jest czu³y klucz uniewazniaj±cy)\n" #: g10/revoke.c:297 g10/revoke.c:503 -#, fuzzy msgid "Create a revocation certificate for this key? " -msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " +msgstr "Stworzyæ certyfikat uniewa¿nienia tego klucza? (t/N) " #: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "" +msgstr "wymuszono opakowanie ASCII wyniku.\n" #: g10/revoke.c:324 g10/revoke.c:548 -#, fuzzy, c-format +#, c-format msgid "make_keysig_packet failed: %s\n" -msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n" +msgstr "wywo³anie funkcji make_keysig_packet nie powiod³o siê: %s\n" #. and issue a usage notice #: g10/revoke.c:387 -#, fuzzy msgid "Revocation certificate created.\n" -msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa¿nienia\n" +msgstr "Certyfikat uniewa¿nienia zosta³ utworzony.\n" #: g10/revoke.c:393 #, c-format msgid "no revocation keys found for `%s'\n" -msgstr "" +msgstr "brak kluczy uniewa¿niaj±cych dla ,,%s''\n" #: g10/revoke.c:447 -#, fuzzy, c-format +#, c-format msgid "secret key `%s' not found: %s\n" -msgstr "klucz `%s' nie zosta³ odaleziony: %s\n" +msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n" #: g10/revoke.c:485 -#, fuzzy, c-format +#, c-format msgid "no corresponding public key: %s\n" -msgstr "zapisujê klucz publiczny w '%s'\n" +msgstr "brak odpowiadaj±cego klucza publicznego: %s\n" #: g10/revoke.c:496 -#, fuzzy msgid "public key does not match secret key!\n" -msgstr "lid %lu nie ma klucza\n" +msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n" #: g10/revoke.c:519 -#, fuzzy msgid "unknown protection algorithm\n" -msgstr "nieznany algorytm kompresji" +msgstr "nieznany algorytm ochrony\n" #: g10/revoke.c:523 -#, fuzzy msgid "NOTE: This key is not protected!\n" -msgstr "Ten klucz nie jest chroniony.\n" +msgstr "UWAGA: Ten klucz nie jest chroniony!\n" #. and issue a usage notice #: g10/revoke.c:574 @@ -5138,50 +5187,58 @@ msgid "" "your media become unreadable. But have some caution: The print system of\n" "your machine might store the data and make it available to others!\n" msgstr "" +"Certyfikat uniewa¿nienia zosta³ utworzony.\n" +"\n" +"Nale¿y przenie¶æ go na no¶nik który mo¿na bezpiecznie ukryæ; je¶li ¼li " +"ludzie\n" +"dostan± ten certyfikat w swoje rêce, mog± u¿yæ go do uczynienia klucza\n" +"nieu¿ytecznym.\n" +"\n" +"Niez³ym pomys³em jest wydrukowanie certyfikatu uniewa¿nienia i schowanie\n" +"wydruku w bezpiecznym miejscu, na wypadek gdyby no¶nik z certyfikatem sta³ " +"siê\n" +"nieczytelny. Ale nale¿y zachowaæ ostro¿no¶æ, systemy drukowania ró¿nych\n" +"komputerów mog± zachowaæ tre¶æ wydruku i udostêpniæ j± osobom " +"nieupowa¿nionym.\n" -#: g10/revoke.c:614 -#, fuzzy +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" -msgstr "powód uniewa¿nienia: " +msgstr "Proszê wybraæ powód uniewa¿nienia:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" -msgstr "" +msgstr "Anuluj" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "" +msgstr "(Prawdopodobnie chcesz tu wybraæ %d)\n" -#: g10/revoke.c:667 -#, fuzzy +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "" -"\n" -"Identyfikator u¿ytkownika (pusta linia oznacza koniec): " +msgstr "Wprowad¼ opis (nieobowi±zkowy) i zakoñcz go pust± lini±:\n" -#: g10/revoke.c:695 -#, fuzzy, c-format +#: g10/revoke.c:696 +#, c-format msgid "Reason for revocation: %s\n" -msgstr "powód uniewa¿nienia: " +msgstr "Powód uniewa¿nienia: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" -msgstr "" +msgstr "(nie podano)\n" -#: g10/revoke.c:702 -#, fuzzy +#: g10/revoke.c:703 msgid "Is this okay? " -msgstr "U¿yæ tego klucza pomimo to? " +msgstr "Informacje poprawne? " #: g10/tdbdump.c:104 -#, fuzzy, c-format +#, c-format msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" "# Lista przypisanych warto¶ci zaufania, stworzona %s\n" -"# (u¿yj \"gpgm --import-ownertrust\" aby j± przywróciæ)\n" +"# (u¿yj \"gpg --import-ownertrust\" aby j± wczytaæ)\n" #: g10/tdbdump.c:140 #, c-format @@ -5189,9 +5246,8 @@ msgid "can't open file: %s\n" msgstr "nie mo¿na otworzyæ pliku: %s\n" #: g10/tdbdump.c:151 -#, fuzzy msgid "line too long\n" -msgstr "has³o zbyt d³ugie\n" +msgstr "linia zbyt d³uga\n" #: g10/tdbdump.c:159 msgid "error: missing colon\n" @@ -5207,15 +5263,18 @@ msgstr "b³±d: brak warto¶æi zaufania w³a #. error #: g10/tdbdump.c:204 -#, fuzzy, c-format +#, c-format msgid "error finding trust record: %s\n" -msgstr "b³±d podczas odczytu wpisu katalogowego: %s\n" +msgstr "b³±d podczas odczytu zapisu warto¶ci zaufania: %s\n" #: g10/tdbdump.c:208 #, c-format msgid "read error: %s\n" msgstr "b³±d odczytu: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "serwer kluczy nie jest w pe³ni zgodny z HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "U¿ywanie tego algorytmu jest odradzane - tworzyæ mimo to? " @@ -5396,9 +5455,6 @@ msgstr "b³±d odczytu: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "b³±d odczytu g³ównego klucza dla LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: funkcja search_record zawiod³a: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "klucz %08lX: wyszukanie zapisu nie powiod³o siê\n" @@ -5411,9 +5467,6 @@ msgstr "b³±d odczytu: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "wyliczenie kluczy tajnych nie powiod³o siê %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "klucz %08lX.%lu Dobre dowi±zanie podklucza\n" diff -urpP gnupg-1.2.2/po/pt.po gnupg-1.2.3/po/pt.po --- gnupg-1.2.2/po/pt.po 2003-05-01 14:38:27.000000000 +0000 +++ gnupg-1.2.3/po/pt.po 2003-08-21 20:05:29.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -48,7 +48,7 @@ msgstr "não" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "sair" @@ -275,63 +275,63 @@ msgstr "... isto é um bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "você encontrou um bug ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "nenhum módulo de recolha de entropia detectado\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "impossível 'stat' a `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' não é um ficheiro normal - ignorado\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "nota: random_seed está vazia\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "" "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "impossível ler `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "nota: ficheiro random_seed não actualizado\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "impossível escrever `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "impossível fechar `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -361,6 +361,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -368,7 +373,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -376,163 +381,163 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[ficheiro]|fazer uma assinatura" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[ficheiro]|fazer uma assinatura em texto puro" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "fazer uma assinatura separada" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "cifrar dados" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[ficheiros]|cifrar ficheiros" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "cifrar apenas com cifra simétrica" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "apenas armazenar" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "decifrar dados (acção por omissão)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[ficheiros]|decifrar ficheiros" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verificar uma assinatura" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "listar as chaves" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "listar as chaves e as assinaturas" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "verificar as assinaturas das chaves" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "listar as chaves e as impressões digitais" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "listar as chaves secretas" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "gerar um novo par de chaves" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "remover chaves do porta-chaves público" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "remover chaves do porta-chaves secreto" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "assinar uma chave" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "assinar uma chave localmente" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "assinar uma chave de forma não revocável" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "assinar uma chave localmente e de forma não revocável" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "assinar ou editar uma chave" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "gerar um certificado de revogação" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportar chaves para um servidor de chaves" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importar chaves de um servidor de chaves" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "procurar chaves num servidor de chaves" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "actualizar todas as chaves a partir de um servidor de chaves" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importar/fundir chaves" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "listar apenas as sequências de pacotes" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exportar os valores de confiança" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importar os valores de confiança" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "actualizar a base de dados de confiança" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "actualizar automaticamente a base de dados de confiança" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "consertar uma base de dados de confiança" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "retirar armadura de um ficheiro ou do \"stdin\"" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "criar armadura para um ficheiro ou \"stdin\"" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -542,163 +547,163 @@ msgstr "" "Opções:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "criar saída com armadura ascii" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifrar para NOME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usar NOME como destinatário por omissão" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usar a chave por omissão como destinatário por omissão" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "usar este identificador de utilizador para\n" "assinar ou decifrar" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|estabelecer nível de compressão N\n" "(0 desactiva)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usar modo de texto canônico" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "usar como ficheiro de saída" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "nunca usar o terminal" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forçar assinaturas v3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "não forçar assinaturas v3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "forçar assinaturas v4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "não forçar assinaturas v4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "sempre usar um MDC para cifrar" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "nunca usar um MDC para cifrar" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "não fazer alterações" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "perguntar antes de sobrepôr" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "utilizar o gpg-agent" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "modo não-interactivo: nunca perguntar" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "assumir não para a maioria das perguntas" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "" "adicionar este porta-chaves\n" "à lista de porta-chaves" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "adicionar este porta-chaves secreto à lista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "mostrar em que porta-chave a chave está" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usar NOME como chave secreta por omissão" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ENDEREÇO|usar este servidor para buscar chaves" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "" "|NOME|definir mapa de caracteres do terminal como\n" "NOME" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "ler opções do ficheiro" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "" "|DF|escrever informações de estado para o\n" "descritor de ficheiro DF" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[ficheiro]|escrever ifnroamções de estado para o ficheiro" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|confiar totalmente nesta chave" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emular o modo descrito no RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "configurar todas as opções de pacote, cifragem e \"digest\"\n" "para comportamento OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "configurar todas as opções de pacote, cifragem e \"digest\"\n" @@ -748,7 +753,7 @@ msgstr "Não mostrar IDs Fotográficos" msgid "Set command line to view Photo IDs" msgstr "Configurar linha de comandos para ver fotografias" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -756,7 +761,7 @@ msgstr "" "@\n" "(Veja a página man para uma lista completa de comandos e opções)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -776,15 +781,15 @@ msgstr "" " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impressões digitais\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -794,7 +799,7 @@ msgstr "" "assina, verifica, cifra ou decifra\n" "a operação por omissão depende dos dados de entrada\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -802,319 +807,353 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Chave pública: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Dispersão: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Compressão: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "comandos em conflito\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opções `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "a extensão de cifra \"%s\" não foi carregada devido às suas permissões " "inseguras\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "não foi possível alterar o exec-path para %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrepõe %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "não pode assinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, 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/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado é inválido\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "preferências por omissão inválidas\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "preferências pessoais de cifra inválidas\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "preferências pessoais de 'digest' inválidas\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "preferências pessoais de compressão inválidas\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "não pode utilizar %s enquanto estiver no modo %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "não pode utilizar %s enquanto estiver no modo %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "não pode utilizar %s enquanto estiver no modo %s\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizador" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizador" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "actualização da chave secreta falhou: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispersão inválido `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1122,19 +1161,19 @@ msgstr "" "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e " "terminar com um '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "a URL de política de certificação dada é inválida\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" @@ -1276,7 +1315,7 @@ msgstr "" "Nenhum valor de confiança designado para:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ou \"" @@ -1334,7 +1373,7 @@ msgstr " s = saltar esta chave\n" msgid " q = quit\n" msgstr " q = sair\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Decisão? " @@ -1510,91 +1549,91 @@ msgstr "%s: ignorado: a chave pública es msgid "no valid addressees\n" msgstr "nenhum endereço válido\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "preferência %c%lu não é válida\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "preferência %c%lu duplicada\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "demasiadas preferências `%c'\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "caracter inválido na cadeia de caractéres da preferência\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "a escrever a assinatura directa\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "a escrever a auto-assinatura\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "a escrever a assinatura ligada a uma chave\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamanho de chave inválido; a utilizar %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamanho da chave arredondado para %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA e ElGamal (por omissão)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas cifragem)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (assinatura e cifragem)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (apenas assinatura)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (assinatura e cifragem)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Opção? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1605,15 +1644,15 @@ msgstr "" "esta chave para comunicar com utilizadores do PGP. Este algoritmo é para\n" "além disto muito lento, e pode não ser tão seguro como as outras opções.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Criar mesmo assim?" -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1626,19 +1665,19 @@ msgstr "" " tamanho por omissão é 1024 bits\n" " tamanho máximo sugerido é 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Qual o tamanho de chave desejado? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permite apenas tamanhos de 512 a 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "tamanho muito pequeno; 1024 é o valor mínimo permitido para RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" @@ -1650,12 +1689,12 @@ msgstr "tamanho muito pequeno; 768 é o v #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1663,11 +1702,11 @@ msgstr "" "Tamanhos de chave maiores que 2048 não são recomendados\n" "porque o tempo de computação é REALMENTE longo!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1675,17 +1714,17 @@ msgstr "" "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também " "é extremamente vulnerável a ataques!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1701,7 +1740,7 @@ msgstr "" " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1717,30 +1756,30 @@ msgstr "" " m = assinatura expira em n meses\n" " y = assinatura expira em n anos\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "A assinatura é valida por? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "A %s não expira nunca\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s expira em %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1748,11 +1787,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1769,44 +1808,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Caracter inválido no nome\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 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:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Endereço de correio eletrónico: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Endereço eletrónico inválido\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Caracter inválido no comentário\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1817,29 +1856,29 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor não coloque o endereço de email no nome verdadeiro ou no " "comentário\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Por favor corrija primeiro o erro\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1847,16 +1886,16 @@ msgstr "" "Você precisa de uma frase secreta para proteger a sua chave.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1868,7 +1907,7 @@ msgstr "" "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1880,53 +1919,53 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "O par de chaves DSA terá 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "a escrever chave pública para `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, 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:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "chave marcada como de confiança absoluta\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1934,12 +1973,12 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1947,7 +1986,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1955,25 +1994,25 @@ msgstr "" "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Realmente criar? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output não funciona para este comando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: impossível abrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro na criação da frase secreta: %s\n" @@ -1982,17 +2021,17 @@ msgstr "erro na criação da frase secreta msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "não é possível utilizar o pacote ESK simétrico devido ao modo S2K\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "%s' já comprimido\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVISO: ficheiro vazio\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "no modo --pgp2 só pode cifrar com chaves RSA de 2048 bits ou menos\n" @@ -2008,7 +2047,7 @@ msgstr "" "impossível utilizar a cifra IDEA para todas as chaves para que está a " "cifrar.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2026,431 +2065,421 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s cifrado para: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "erro na leitura do bloco de chave: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "chave %08lX: não está protegida - ignorada\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: tipo PGP 2.x - ignorada\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desactivado\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Utilizador não encontrado]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "há uma chave secreta para a chave pública \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves processadas até agora\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total processado: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignorei novas chaves: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de utilizadores: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " não modificados: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de utilizadores: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogações de chaves: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas não modificadas: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " não importadas: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "NOTA: Chave primária Elgamal detectada - pode demorar algum tempo a " "importar\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "chave %08lX: sem ID de utilizador\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "chave %08lX: subchave HKP corrompida foi reparada\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "chave %08lX: sem IDs de utilizadores válidos\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "chave %08lX: chave nova - ignorada\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "a escrever para `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro na escrita do porta-chaves `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública \"%s\" importada\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chave %08lX: não corresponde à nossa cópia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "chave %08lX: \"%s\" 1 nova assinatura\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "chave %08lX: \"%s\" %d novas assinaturas\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "chave %08lX: \"%s\" 1 nova subchave\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "chave %08lX: \"%s\" %d novas subchaves\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "chave %08lX: \"%s\" não modificada\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "sem porta-chaves público por omissão: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chave %08lX: já está no porta-chaves secreto\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chave %08lX: chave secreta não encontrada: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pública - impossível aplicar certificado\n" "de revogação\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: \"%s\" certificado de revogação importado\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "chave %08lX: apagada ligação múltipla de subchave \n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "chave %08lX: sem subchave para revocação de chave\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "chave %08lX: revocação de subchave inválida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "chave %08lX: removida revogação múltiplace de subchaves\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "chave %08lX: ignorado ID de utilizador '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chave %08lX: subchave ignorada\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não " "presente.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "chave %08lX: assinatura directa de chave adicionada\n" @@ -2463,29 +2492,29 @@ msgstr "[revogação]" msgid "[self-signature]" msgstr "[auto-assinatura]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 assinatura incorrecta\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d assinaturas incorrectas\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 assinatura não verificada por falta de chave\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d assinaturas não verificadas por falta de chaves\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 assinatura não verificada devido a um erro\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d assinaturas não verificadas devido a erros\n" @@ -2504,20 +2533,27 @@ msgstr "%d IDs de utilizadores sem auto- msgid "User ID \"%s\" is revoked." msgstr "Utilizador \"%s\" está revocado." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Não foi possível assinar.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Utilizador \"%s\" está revocado." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2526,11 +2562,11 @@ msgstr "" "A sua auto-assinatura em \"%s\"\n" "é uma assinatura do tipo PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Quer promovê-la a uma auto-assinatura OpenPGP? (s/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, fuzzy, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2539,14 +2575,14 @@ msgstr "" "A sua assinatura actual em \"%s\"\n" "é uma assinatura local.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 #, fuzzy msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2555,55 +2591,55 @@ msgstr "" "A sua assinatura actual em \"%s\"\n" "é uma assinatura local.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Quer promovê-la a uma assinatura exportável? (s/N)" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" já foi assinado localmente pela chave %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" já foi assinado pela chave %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada para assinar com a chave %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Esta chave expirou!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Esta chave vai expirar em %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "Não pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Isto tornaria a chave inutilizável no PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2613,31 +2649,35 @@ msgstr "" "pertence\n" "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Não vou responder.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (por omissão)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Não verifiquei.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Verifiquei por alto.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Verifiquei com bastante cuidado.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2645,7 +2685,7 @@ msgstr "" "Você tem certeza de que quer assinar esta chave com\n" "a sua chave: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2653,7 +2693,7 @@ msgstr "" "\n" "Isto será uma auto-assinatura.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2661,7 +2701,7 @@ msgstr "" "\n" "AVISO: a assinatura não será marcada como não-exportável.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2669,7 +2709,7 @@ msgstr "" "\n" "AVISO: a assinatura não será marcada como não-revocável.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2677,7 +2717,7 @@ msgstr "" "\n" "A assinatura será marcada como não-exportável.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2685,7 +2725,7 @@ msgstr "" "\n" "A assinatura será marcada como não-revocável.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2693,7 +2733,7 @@ msgstr "" "\n" "Não verifiquei esta chave.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2701,7 +2741,7 @@ msgstr "" "\n" "Verifiquei por alto esta chave.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2709,34 +2749,34 @@ msgstr "" "\n" "Verifiquei esta chave com muito cuidado.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossível editar esta chave: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2744,7 +2784,7 @@ msgstr "" "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2752,494 +2792,494 @@ msgstr "" "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Você quer realmente fazer isso? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "a mover a assinatura da chave para o local correcto\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "sair deste menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "mostra impressão digital" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lista chave e identificadores de utilizadores" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "seleciona ID de utilizador N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "seleciona chave secundária N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "assina a chave localmente" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "assina a chave de forma não-revogável" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "assinar a chave localmente e de forma não revogável" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "adiciona um novo ID de utilizador" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "adiciona um identificador fotográfico" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "remove ID de utilizador" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "adiciona uma chave de revocação" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "seleccionar o identificador do utilizador como primário" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "lista preferências (perito)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "lista preferências (detalhadamente)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "configurar lista de preferências" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "preferências actualizadas" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revocar um ID de utilizador" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "desactiva uma chave" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "activa uma chave" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "mostrar identificador fotográfico" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "impossível fazer isso em modo não-interativo\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "erro na leitura do bloco de chave secreto `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor utilize o comando \"toggle\" primeiro.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "A chave está revogada." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Realmente assinar todos os IDs de utilizador? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Este comando não é permitido no modo %s.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de utilizador!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Realmente remover todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Realmente remover este ID de utilizador? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Você quer realmente remover as chaves selecionadas? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Você quer realmente remover esta chave? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Realmente revocar todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Realmente revocar este ID de utilizador? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Você quer realmente revogar as chaves selecionadas? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Você quer realmente revogar esta chave? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Realmente actualizar as preferências para os utilizadores seleccionados?" -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Realmente actualizar as preferências?" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Gravar alterações? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Sair sem gravar? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "actualização falhou: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma actualização é necessária.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "'Digest': " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Esta chave pode ser revogada pela chave %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (sensível)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX criada: %s expira: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " confiança: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Esta chave foi desactivada" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! subchave foi revogada: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- revogação falsa encontrada\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problema ao verificar revogação: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3247,7 +3287,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3256,46 +3302,46 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Apagar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Apagar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Apagar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3304,84 +3350,84 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Insira o ID de utilizador do revogador escolhido: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, 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:2452 +#: g10/keyedit.c:2523 #, 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:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as selecções das chaves secretas.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Por favor seleccione no máximo uma chave secundária.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "A modificar a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Modificar a data de validade para uma chave primária.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Seleccione exactamente um identificador de utilizador.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID de utilizador: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3390,7 +3436,7 @@ msgstr "" "\"\n" "assinado com a sua chave %08lX em %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3399,56 +3445,56 @@ msgstr "" "\"\n" "assinada localmente com a sua chave %08lX em %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " assinado por %08lX em %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " assinado por %08lX em %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente criar os certificados de revogação? (s/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" @@ -3457,70 +3503,70 @@ msgstr "o utilizador com o id \"%s\" já #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Politica de assinatura crítica: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Politica de assinatura: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "AVISO: dados de notação inválidos encontrados\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Notação de assinatura crítica: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Notação de assinatura: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "não legível por humanos" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Porta-chaves" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr "[expira: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Impressão da chave =" @@ -3604,102 +3650,111 @@ msgstr "NOTA: o remetente solicitou \"ap msgid "original file name='%.*s'\n" msgstr "nome do ficheiro original='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notação: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Política: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verificação de assinatura suprimida\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "não consigo tratar estas assinaturas múltiplas\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Nenhuma ajuda disponível" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Assinatura INCORRECTA de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Assinatura expirada de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Assinatura correcta de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[incerto]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "assinatura %s de: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "versão desconhecida" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossível verificar assinatura: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "não é uma assinatura separada\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura de classe 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" @@ -3727,75 +3782,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informações\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: opção depreciada \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: \"%s\" é uma opção depreciada\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "por favor utilize \"%s%s\" em vez dela\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, 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/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "impossível manipular algoritmo de chave pública %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "o gpg-agent não está disponível nesta sessão\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "não consegui colocar o pid do cliente no agente\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "não consigo obter FD de leitura no servidor para o agente\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "não consigo obter FD de escrita no servidor para o agente\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variável de ambiente GPG_AGENT_INFO inválida\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versão %d do protocolo gpg-agent não é suportada\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível ligar a `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problemas na comunicação com o gpg-agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utilização deste\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3808,32 +3868,32 @@ msgstr "" "\"%.*s\"\n" "chave %u bits %s, ID %08lx, criada %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Repita a frase secreta\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Insira a frase secreta\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "frase secreta demasiado longa\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "resposta do agente inválida\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3843,20 +3903,20 @@ msgstr "" "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -3948,8 +4008,8 @@ msgid "failed sending to `%s': status=%u msgstr "erro ao enviar para `%s': estado=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "o servidor de chaves não é totalmente compatível com HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3989,11 +4049,11 @@ msgid "generating the deprecated 16-bit msgstr "" "a gerar a 'checksum' (depreciada) de 16-bit para protecção da chave secreta\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4002,17 +4062,17 @@ msgstr "" "chave: %08lX: esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para " "assinaturas!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4021,7 +4081,7 @@ msgstr "" "a chave %08lX foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4030,50 +4090,55 @@ msgstr "" "a chave %08lX foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: chave de assinatura %08lx expirou %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "chave %08lX: sem subchave para o pacote revocação de subchave\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "chave %08lX: sem subchave para ligação de chaves\n" + +#: g10/sign.c:84 #, 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" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "AVISO: impossível expandir-%% a url de política (demasiado grande). A " "utilizar não expandida.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4100,12 +4165,12 @@ msgstr "AVISO: `%s' é um ficheiro vazio\ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "impossível criar %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4120,7 +4185,7 @@ msgstr "a assinar:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode assinar à vista com chaves do tipo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "será utilizada a cifragem %s\n" @@ -4135,12 +4200,12 @@ msgstr "impossível manipular linhas de t msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4149,122 +4214,122 @@ msgstr "base de dados de confiança rec % msgid "trustdb transaction too large\n" msgstr "transação de base de dados de confiança muito grande\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: impossível aceder: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: diretoria inexistente!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: impossível criar tranca\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: impossível criar tranca\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossível criar: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: falha ao criar registo de versão: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: base de dados de confiança inválida criada\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: base de dados de confiança criada\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "NOTA: não é possível escrever na trustdb\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: base de dados de confiança inválida\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: falha ao criar tabela de dispersão: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erro a actualizar registo de versão: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erro ao ler registo de versão: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erro ao escrever registo de versão: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "base de dados de confiança: lseek falhou: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: não é um base de dados de confiança\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registo de versão com recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro ao ler registo livre: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro ao escrever registo de diretório: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: falha ao zerar um registo: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: falha ao anexar um registo: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 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" @@ -4317,40 +4382,40 @@ msgstr "registo de confiança %lu, tipo % msgid "trustdb: sync failed: %s\n" msgstr "base de dados de confiança: sincronização falhou: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 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:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "a verificar a base de dados de confiança\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "chave pública %08lX não encontrada: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, 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:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4359,7 +4424,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4916,17 +4981,17 @@ msgstr "Por favor conserte esta possível msgid "checking keyring `%s'\n" msgstr "a verificar o porta chaves `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu chaves verificadas até agora (%lu assinaturas)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu chave verificadas (%lu assinaturas)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: porta-chaves criado\n" @@ -5022,7 +5087,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -5115,37 +5180,37 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "motivo da revocação: " -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 #, 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:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "motivo da revocação: " -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Usar esta chave de qualquer modo? " @@ -5191,3 +5256,6 @@ msgstr "%s: erro ao escrever registo de #, fuzzy, c-format msgid "read error: %s\n" msgstr "armadura: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "o servidor de chaves não é totalmente compatível com HKP\n" diff -urpP gnupg-1.2.2/po/pt_BR.po gnupg-1.2.3/po/pt_BR.po --- gnupg-1.2.2/po/pt_BR.po 2003-05-01 14:38:25.000000000 +0000 +++ gnupg-1.2.3/po/pt_BR.po 2003-08-21 20:05:27.000000000 +0000 @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -54,7 +54,7 @@ msgid "nN" msgstr "nN" # INICIO MENU -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "sair" @@ -285,63 +285,63 @@ msgstr "... isto é um bug (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "você encontrou um bug ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, fuzzy, c-format msgid "can't stat `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "" -#: cipher/random.c:401 +#: cipher/random.c:407 #, fuzzy msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "AVISO: dados de notação inválidos encontrados\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, fuzzy, c-format msgid "can't read `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar %s: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, fuzzy, c-format msgid "can't write `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, fuzzy, c-format msgid "can't close `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: usando gerador de números aleatórios inseguro!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -372,6 +372,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -379,7 +384,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -387,175 +392,175 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[arquivo]|fazer uma assinatura" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|fazer uma assinatura em texto puro" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "fazer uma assinatura separada" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "criptografar dados" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "" "criptografar apenas com criptografia\n" "simétrica" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "apenas armazenar" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "descriptografar dados (padrão)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verificar uma assinatura" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "listar as chaves" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "listar as chaves e as assinaturas" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "verificar as assinaturas das chaves" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "listar as chaves e as impressões digitais" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "listar as chaves secretas" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "gerar um novo par de chaves" -#: g10/g10.c:327 +#: g10/g10.c:325 #, fuzzy msgid "remove keys from the public keyring" msgstr "remover a chave do chaveiro público" -#: g10/g10.c:329 +#: g10/g10.c:327 #, fuzzy msgid "remove keys from the secret keyring" msgstr "remover a chave do chaveiro secreto" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "assinar uma chave" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "assinar uma chave localmente" -#: g10/g10.c:332 +#: g10/g10.c:330 #, fuzzy msgid "sign a key non-revocably" msgstr "assinar uma chave localmente" -#: g10/g10.c:333 +#: g10/g10.c:331 #, fuzzy msgid "sign a key locally and non-revocably" msgstr "assinar uma chave localmente" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "assinar ou editar uma chave" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "gerar um certificado de revogação" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportar chaves para um servidor" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importar chaves de um servidor" -#: g10/g10.c:341 +#: g10/g10.c:339 #, fuzzy msgid "search for keys on a key server" msgstr "exportar chaves para um servidor" -#: g10/g10.c:343 +#: g10/g10.c:341 #, fuzzy msgid "update all keys from a keyserver" msgstr "importar chaves de um servidor" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importar/fundir chaves" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "listar apenas as seqüências de pacotes" # ownertrust ??? -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exportar os valores de confiança" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importar os valores de confiança" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "atualizar o banco de dados de confiabilidade" -#: g10/g10.c:357 +#: g10/g10.c:355 #, fuzzy msgid "unattended trust database update" msgstr "atualizar o banco de dados de confiabilidade" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "" "consertar um banco de dados de confiabilidade\n" "danificado" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "retirar a armadura de um arquivo ou de \"stdin\"" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "criar armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -565,169 +570,169 @@ msgstr "" "Opções:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "criar saída com armadura ascii" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NOME|criptografar para NOME" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NOME|usar NOME como destinatário padrão" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "usar a chave padrão como destinatário padrão" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "usar este identificador de usuário para\n" "assinar ou descriptografar" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|estabelecer nível de compressão N\n" "(0 desabilita)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "usar modo de texto canônico" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "usar como arquivo de saída" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "nunca usar o terminal" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "forçar assinaturas v3" -#: g10/g10.c:398 +#: g10/g10.c:396 #, fuzzy msgid "do not force v3 signatures" msgstr "forçar assinaturas v3" -#: g10/g10.c:399 +#: g10/g10.c:397 #, fuzzy msgid "force v4 key signatures" msgstr "forçar assinaturas v3" -#: g10/g10.c:400 +#: g10/g10.c:398 #, fuzzy msgid "do not force v4 key signatures" msgstr "forçar assinaturas v3" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:403 +#: g10/g10.c:401 #, fuzzy msgid "never use a MDC for encryption" msgstr "sempre usar um MDC para criptografar" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "não fazer alterações" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "modo não-interativo: nunca perguntar" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "assumir não para a maioria das perguntas" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "adicionar este chaveiro à lista de chaveiros" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "adicionar este chaveiro secreto à lista" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usar NOME como chave secreta padrão" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|ENDEREÇO|usar este servidor para buscar chaves" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "" "|NOME|definir mapa de caracteres do terminal como\n" "NOME" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "ler opções do arquivo" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "" "|DA|escrever informações de estado para o\n" "descritor de arquivo DA" -#: g10/g10.c:428 +#: g10/g10.c:426 #, fuzzy msgid "|[file]|write status info to file" msgstr "" "|DA|escrever informações de estado para o\n" "descritor de arquivo DA" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emular o modo descrito no RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "configurar todas as opções de pacote,\n" "criptografia e \"digest\" para comportamento\n" "OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 #, fuzzy msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" @@ -781,13 +786,13 @@ msgstr "" msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -807,15 +812,15 @@ msgstr "" " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impressões digitais\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -825,7 +830,7 @@ msgstr "" "assina, verifica, criptografa ou descriptografa\n" "a operação padrão depende dos dados de entrada\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -833,328 +838,362 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 #, fuzzy msgid "Compression: " msgstr "Comentário: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 #, fuzzy msgid "invalid import options\n" msgstr "armadura inválida" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inválido" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 #, fuzzy msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 #, fuzzy msgid "invalid default preferences\n" msgstr "lista preferências" -#: g10/g10.c:1948 +#: g10/g10.c:1927 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista preferências" -#: g10/g10.c:1952 +#: g10/g10.c:1931 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista preferências" -#: g10/g10.c:1956 +#: g10/g10.c:1935 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista preferências" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1983 +#, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:1988 +#, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/g10.c:2175 +#: g10/g10.c:2214 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:2183 +#: g10/g10.c:2222 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "enumeração de chaves secretas falhou: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "get_dir_record: search_record falhou: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "enumeração de chaves secretas falhou: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1163,21 +1202,21 @@ msgstr "" "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" @@ -1327,7 +1366,7 @@ msgstr "" "Nenhum valor de confiança designado para %lu:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ou \"" @@ -1392,7 +1431,7 @@ msgstr "" msgid " q = quit\n" msgstr " q = sair\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Sua decisão? " @@ -1572,111 +1611,111 @@ msgstr "%s: ignorado: a chave pública es msgid "no valid addressees\n" msgstr "nenhum endereço válido\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, fuzzy, c-format msgid "preference %c%lu duplicated\n" msgstr "ignorado `%s': duplicado\n" # muitas ou demais ??? -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, fuzzy, c-format msgid "too many `%c' preferences\n" msgstr "Preferências demais" -#: g10/keygen.c:273 +#: g10/keygen.c:278 #, fuzzy msgid "invalid character in preference string\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 #, fuzzy msgid "writing direct signature\n" msgstr "escrevendo auto-assinatura\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "escrevendo auto-assinatura\n" # key binding ??? -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "escrevendo assinatura ligada a uma chave\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA e ElGamal (padrão)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (assinatura e criptografia)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, fuzzy, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, fuzzy, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) ElGamal (assinatura e criptografia)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Sua opção? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 #, fuzzy msgid "Create anyway? " msgstr "Usa esta chave de qualquer modo? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1689,20 +1728,20 @@ msgstr "" " tamanho padrão é 1024 bits\n" " tamanho máximo sugerido é 2048 bits\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Que tamanho de chave você quer? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permite apenas tamanhos de 512 a 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 #, fuzzy msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" @@ -1714,12 +1753,12 @@ msgstr "tamanho muito pequeno; 768 é o v #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1727,11 +1766,11 @@ msgstr "" "Tamanhos de chave maiores que 2048 não são recomendados\n" "porque o tempo de computação é REALMENTE longo!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1739,17 +1778,17 @@ msgstr "" "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também " "é vulnerável a ataques!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1765,7 +1804,7 @@ msgstr "" " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 #, fuzzy msgid "" "Please specify how long the signature should be valid.\n" @@ -1782,31 +1821,31 @@ msgstr "" " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 #, fuzzy msgid "Signature is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, fuzzy, c-format msgid "%s does not expire at all\n" msgstr "A chave não expira nunca\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, fuzzy, c-format msgid "%s expires at %s\n" msgstr "A chave expira em %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1814,11 +1853,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1834,44 +1873,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 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:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Endereço de correio eletrônico: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Endereço eletrônico inválido\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Caractere inválido no comentário\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1882,28 +1921,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 #, 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1911,17 +1950,17 @@ msgstr "" "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1933,7 +1972,7 @@ msgstr "" "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1945,54 +1984,54 @@ msgstr "" "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:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "O par de chaves DSA terá 1024 bits.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "escrevendo certificado público para `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "impossível bloquear chaveiro secreto: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 #, fuzzy msgid "key marked as ultimately trusted.\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -2000,12 +2039,12 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -2013,7 +2052,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -2021,25 +2060,25 @@ msgstr "" "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Realmente criar? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: impossível abrir: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro na criação da frase secreta: %s\n" @@ -2048,17 +2087,17 @@ msgstr "erro na criação da frase secreta msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, fuzzy, c-format msgid "`%s' already compressed\n" msgstr "%lu chaves processadas\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: AVISO: arquivo vazio\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" @@ -2072,7 +2111,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2087,425 +2126,415 @@ msgstr "NOTA: algoritmo de criptografia msgid "you may not use %s while in %s mode\n" msgstr "" -#: g10/encode.c:753 +#: g10/encode.c:748 #, fuzzy, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s criptografado para: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, fuzzy, c-format msgid "key `%s' not found: %s\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, fuzzy, c-format msgid "error reading keyblock: %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/export.c:238 +#: g10/export.c:205 #, fuzzy, c-format msgid "key %08lX: not protected - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/export.c:246 +#: g10/export.c:213 #, fuzzy, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desativado\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 #, fuzzy msgid "[User id not found]" msgstr "[usuário não encontrado]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "há uma chave secreta para esta chave pública!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves processadas até agora\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total processado: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, fuzzy, c-format msgid " skipped new keys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de usuários: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " não modificados: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuários: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogações de chaves: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas não modificadas: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importados: %lu" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "chave %08lX: sem ID de usuário\n" -#: g10/import.c:634 +#: g10/import.c:587 #, fuzzy, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:649 +#: g10/import.c:602 #, fuzzy, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "chave %08lX: aceito ID de usuário sem auto-assinatura '" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "chave %08lX: sem IDs de usuários válidos\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, fuzzy, c-format msgid "key %08lX: new key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/import.c:683 +#: g10/import.c:634 #, fuzzy, c-format msgid "no writable keyring found: %s\n" msgstr "impossível escrever chaveiro: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, fuzzy, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública importada\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chave %08lX: não corresponde à nossa cópia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "chave %8lX: 1 novo ID de usuário\n" -#: g10/import.c:788 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "chave %08lX: %d novos IDs de usuários\n" -#: g10/import.c:791 +#: g10/import.c:742 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "chave %08lX: 1 nova assinatura\n" -#: g10/import.c:794 +#: g10/import.c:745 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "chave %08lX: %d novas assinaturas\n" -#: g10/import.c:797 +#: g10/import.c:748 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "chave %08lX: 1 nova subchave\n" -#: g10/import.c:800 +#: g10/import.c:751 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "chave %08lX: %d novas subchaves\n" -#: g10/import.c:819 +#: g10/import.c:770 #, fuzzy, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "chave %08lX: não modificada\n" -#: g10/import.c:881 +#: g10/import.c:832 #, fuzzy, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" -#: g10/import.c:896 +#: g10/import.c:847 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "impossível bloquear chaveiro secreto: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chave %08lX: já está no chaveiro secreto\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chave %08lX: chave secreta não encontrada: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pública - impossível aplicar certificado\n" "de revogação\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: certificado de revogação importado\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "chave %08lX: nenhum ID de usuário para assinatura\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, fuzzy, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, fuzzy, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, fuzzy, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "chave %08lX.%lu: Revogação de subchave válida\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "chave %08lX: ignorado ID de usuário '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "chave %08lX: subchave ignorada\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogação inválido: %s - ignorada\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, fuzzy, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, fuzzy, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "chave %08lX: detectado ID de usuário duplicado - unido\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -#: g10/import.c:1535 +#: g10/import.c:1500 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "chave %08lX: certificado de revogação adicionado\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %08lX: direct key signature added\n" msgstr "chave %08lX: %d novas assinaturas\n" @@ -2518,29 +2547,29 @@ msgstr "[revogação]" msgid "[self-signature]" msgstr "[auto-assinatura]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 assinatura incorreta\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d assinaturas incorretas\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 assinatura não verificada por falta de chave\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d assinaturas não verificadas por falta de chaves\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 assinatura não verificada devido a um erro\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d assinaturas não verificadas devido a erros\n" @@ -2559,132 +2588,143 @@ msgstr "%d IDs de usuários sem auto-assi msgid "User ID \"%s\" is revoked." msgstr "A chave é protegida.\n" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr "" #: g10/keyedit.c:382 #, fuzzy, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +msgid "User ID \"%s\" is expired." +msgstr "A chave é protegida.\n" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "" -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, fuzzy, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "Já assinado pela chave %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, fuzzy, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "Já assinado pela chave %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nada para assinar com a chave %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 #, fuzzy msgid "This key has expired!" msgstr "Nota: Esta chave expirou!\n" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, fuzzy, c-format msgid "This key is due to expire on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 #, fuzzy msgid " (default)" msgstr "(o padrão é 1)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr "" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr "" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr "" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2692,14 +2732,14 @@ msgstr "" "Você tem certeza de que quer assinar esta chave com\n" "sua chave: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 #, fuzzy msgid "" "\n" "This will be a self-signature.\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 #, fuzzy msgid "" "\n" @@ -2708,7 +2748,7 @@ msgstr "" "A assinatura será marcada como não-exportável.\n" "\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 #, fuzzy msgid "" "\n" @@ -2717,7 +2757,7 @@ msgstr "" "A assinatura será marcada como não-exportável.\n" "\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 #, fuzzy msgid "" "\n" @@ -2726,7 +2766,7 @@ msgstr "" "A assinatura será marcada como não-exportável.\n" "\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 #, fuzzy msgid "" "\n" @@ -2735,53 +2775,53 @@ msgstr "" "A assinatura será marcada como não-exportável.\n" "\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" msgstr "" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" msgstr "" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 #, fuzzy msgid "Secret parts of primary key are not available.\n" msgstr "chave secreta não disponível" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossível editar esta chave: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2789,7 +2829,7 @@ msgstr "" "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2797,653 +2837,659 @@ msgstr "" "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Você realmente quer fazer isso? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "movendo a assinatura da chave para o local correto\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "sair deste menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "mostra impressão digital" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "lista chave e identificadores de usuários" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "seleciona ID de usuário N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "seleciona chave secundária N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "assina a chave localmente" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "nrsign" msgstr "sign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 #, fuzzy msgid "sign the key non-revocably" msgstr "assina a chave localmente" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "nrlsign" msgstr "sign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "sign the key locally and non-revocably" msgstr "assina a chave localmente" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 #, fuzzy msgid "add a photo ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "remove ID de usuário" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "addrevoker" msgstr "revkey" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 #, fuzzy msgid "add a revocation key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 #, fuzzy msgid "list preferences (expert)" msgstr "lista preferências" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 #, fuzzy msgid "list preferences (verbose)" msgstr "lista preferências" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "setpref" msgstr "pref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 #, fuzzy msgid "set preference list" msgstr "lista preferências" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updpref" msgstr "pref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 #, fuzzy msgid "updated preferences" msgstr "lista preferências" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revuid" msgstr "revsig" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revoke a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "desativa uma chave" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "ativa uma chave" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "impossível fazer isso em modo não-interativo\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, fuzzy, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 #, fuzzy msgid "Key is revoked." msgstr "A chave é protegida.\n" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Realmente assinar todos os IDs de usuário? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de usuário para assinar\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de usuário!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Você realmente quer remover as chaves selecionadas? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Você realmente quer remover esta chave? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 #, fuzzy msgid "Really revoke all selected user IDs? " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 #, fuzzy msgid "Really revoke this user ID? " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Você realmente quer revogar as chaves selecionadas? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Você realmente quer revogar esta chave? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 #, fuzzy msgid "Really update the preferences for the selected user IDs? " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 #, fuzzy msgid "Really update the preferences? " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Salvar alterações? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Sair sem salvar? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "atualização falhou: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "atualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma atualização é necessária.\n" # help ou ajuda ??? -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, fuzzy, c-format msgid "This key may be revoked by %s key " msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr "" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Esta chave foi desativada" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! a subchave foi revogada: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 #, fuzzy msgid "rev- faked revocation found\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 #, 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:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Deletar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deletar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deletar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 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:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Digite o tamanho da chave" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2446 +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, 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:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleções das chaves secretas.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no máximo uma chave secundária.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Modificando a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de validade para uma chave primária.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, fuzzy, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "ID de usuário: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3452,7 +3498,7 @@ msgstr "" "\"\n" "assinado com sua chave %08lX em %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, fuzzy, c-format msgid "" "\"\n" @@ -3461,59 +3507,59 @@ msgstr "" "\"\n" "assinado com sua chave %08lX em %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 #, 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:3052 +#: g10/keyedit.c:3128 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Você assinou estes IDs de usuário:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, fuzzy, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Você está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, fuzzy, c-format msgid " signed by %08lX at %s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "A chave é protegida.\n" @@ -3522,76 +3568,76 @@ msgstr "A chave é protegida.\n" #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 #, fuzzy msgid "Critical signature policy: " msgstr "assinatura %s de: %s\n" -#: g10/keylist.c:93 +#: g10/keylist.c:114 #, fuzzy msgid "Signature policy: " msgstr "assinatura %s de: %s\n" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "AVISO: dados de notação inválidos encontrados\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 #, fuzzy msgid "Critical signature notation: " msgstr "Notação: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 #, fuzzy msgid "Signature notation: " msgstr "Notação: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, fuzzy, c-format msgid " [expires: %s]" msgstr "A chave expira em %s\n" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 #, fuzzy msgid "Primary key fingerprint:" msgstr "listar as chaves e as impressões digitais" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 #, fuzzy msgid " Primary key fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 #, fuzzy msgid " Key fingerprint =" msgstr " Impressão digital:" @@ -3678,103 +3724,112 @@ msgstr "NOTA: o remetente solicitou \"ap msgid "original file name='%.*s'\n" msgstr "nome de arquivo original='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notação: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Política: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verificação de assinatura suprimida\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 #, fuzzy msgid "can't handle these multiple signatures\n" msgstr "fazer uma assinatura separada" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Nenhuma ajuda disponível" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "Assinatura INCORRETA de \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 #, fuzzy msgid "Expired signature from \"" msgstr "Assinatura correta de \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Assinatura correta de \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Esta chave não é protegida.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Esta chave não é protegida.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "assinatura %s de: %s\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 msgid "binary" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "versão desconhecida" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossível verificar assinatura: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 #, fuzzy msgid "not a detached signature\n" msgstr "fazer uma assinatura separada" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "assinatura isolada da classe 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "formato de assinatura antigo (PGP2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" @@ -3803,75 +3858,80 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "" -#: g10/misc.c:509 +#: g10/misc.c:533 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "impossível manipular algoritmo de chave pública %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "algoritmo de proteção %d não é suportado\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3883,35 +3943,35 @@ msgstr "" "usuário: \"%.*s\"\n" "%u-bit %s chave, ID %08lX, criada %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 #, fuzzy msgid "Repeat passphrase\n" msgstr "Repita a frase secreta: " -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 #, fuzzy msgid "Enter passphrase\n" msgstr "Digite a frase secreta: " -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 #, fuzzy msgid "passphrase too long\n" msgstr "linha muito longa\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3921,20 +3981,20 @@ msgstr "" "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4028,7 +4088,7 @@ msgid "failed sending to `%s': status=%u msgstr "" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" +msgid "this keyserver does not support --search-keys\n" msgstr "" #: g10/hkp.c:519 @@ -4070,11 +4130,11 @@ msgstr "" msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4082,17 +4142,17 @@ msgid "" msgstr "" "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, fuzzy, c-format msgid "public key %08lX 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:223 +#: g10/sig-check.c:225 #, fuzzy, c-format msgid "public key %08lX 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:232 +#: g10/sig-check.c:234 #, fuzzy, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4101,7 +4161,7 @@ msgstr "" "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, fuzzy, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4110,43 +4170,48 @@ msgstr "" "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "NOTA: chave de assinatura %08lX expirou %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, fuzzy, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, fuzzy, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "chave %08lX: sem subchave para ligação de chaves\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:86 +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -#: g10/sign.c:134 +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4171,12 +4236,12 @@ msgstr "AVISO: `%s' é um arquivo vazio\n msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "impossível criar %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, fuzzy, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n" @@ -4189,7 +4254,7 @@ msgstr "assinando:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, fuzzy, c-format msgid "%s encryption will be used\n" msgstr "descriptografia falhou: %s\n" @@ -4204,12 +4269,12 @@ msgstr "impossível manipular linhas de t msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4218,122 +4283,122 @@ msgstr "banco de dados de confiabilidade msgid "trustdb transaction too large\n" msgstr "transação de banco de dados de confiabilidade muito grande\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: impossível acessar: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: diretório inexistente!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: impossível criar trava\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, fuzzy, c-format msgid "%s: can't make lock\n" msgstr "%s: impossível criar trava\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossível criar: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: falha ao criar registro de versão: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: banco de dados de confiabilidade inválido criado\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: banco de dados de confiabilidade criado\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: banco de dados de confiabilidade inválido\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: erro atualizando registro de versão: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: erro lendo registro de versão: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: erro escrevendo registro de versão: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "banco de dados de confiabilidade: lseek falhou: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: registro de versão com recnum %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: versão de arquivo inválida %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: erro lendo registro livre: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: erro escrevendo registro de diretório: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: falha ao zerar um registro: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: falha ao anexar um registro: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" "O banco de dados de confiabilidade está danificado; por favor rode\n" @@ -4385,41 +4450,41 @@ msgstr "registro de confiança %lu, tipo msgid "trustdb: sync failed: %s\n" msgstr "banco de dados de confiabilidade: sincronização falhou: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, 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:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 #, fuzzy msgid "checking the trustdb\n" msgstr "muda os valores de confiança" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, fuzzy, c-format msgid "public key %08lX not found: %s\n" msgstr "chave pública não encontrada" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4427,7 +4492,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4930,17 +4995,17 @@ msgstr "Por favor conserte este possível msgid "checking keyring `%s'\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, fuzzy, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu chaves processadas até agora\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, fuzzy, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "listar as chaves e as assinaturas" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: chaveiro criado\n" @@ -5035,7 +5100,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -5129,34 +5194,34 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Usa esta chave de qualquer modo? " @@ -5345,9 +5410,6 @@ msgstr "erro de leitura: %s\n" #~ msgid "error reading primary key for LID %lu: %s\n" #~ msgstr "erro lendo chave primária para LID %lu: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record falhou: %s\n" - #~ msgid "key %08lX: query record failed\n" #~ msgstr "chave %08lX: pedido de registro falhou\n" @@ -5360,9 +5422,6 @@ msgstr "erro de leitura: %s\n" #~ msgid "key %08lX: secret and public key don't match\n" #~ msgstr "chave %08lX: chaves secreta e pública não são correspondentes\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "enumeração de chaves secretas falhou: %s\n" - #~ msgid "key %08lX.%lu: Good subkey binding\n" #~ msgstr "chave %08lX.%lu: Ligação de subchave válida\n" diff -urpP gnupg-1.2.2/po/ro.po gnupg-1.2.3/po/ro.po --- gnupg-1.2.2/po/ro.po 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.3/po/ro.po 2003-08-21 20:05:31.000000000 +0000 @@ -0,0 +1,5260 @@ +# Mesajele în limba românã pentru gnupg. +# Copyright (C) 2003 Free Software Foundation, Inc. +# Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul gnupg. +# Laurentiu Buzdugan , 2003. +# +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnupg 1.2.2\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-11 12:00-0500\n" +"Last-Translator: Laurentiu Buzdugan \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: util/secmem.c:88 +msgid "WARNING: using insecure memory!\n" +msgstr "AVERTISMENT: este folositã memorie neprotejatã (insecure)!\n" + +#: util/secmem.c:89 +msgid "please see http://www.gnupg.org/faq.html for more information\n" +msgstr "vedeþi http://www.gnupg.org/faq.html pentru informaþii suplimentare\n" + +#: util/secmem.c:326 +msgid "operation is not possible without initialized secure memory\n" +msgstr "" +"operaþia nu este posibilã fãrã memorie protejatã (secure) iniþializatã\n" + +#: util/secmem.c:327 +msgid "(you may have used the wrong program for this task)\n" +msgstr "(aþi folosit probabil un program nepotrivit pentru aceastã sarcinã)\n" + +#: util/miscutil.c:296 util/miscutil.c:331 +msgid "yes" +msgstr "da" + +#: util/miscutil.c:297 util/miscutil.c:334 +msgid "yY" +msgstr "dD" + +#: util/miscutil.c:298 util/miscutil.c:332 +msgid "no" +msgstr "nu" + +#: util/miscutil.c:299 util/miscutil.c:335 +msgid "nN" +msgstr "nN" + +#: util/miscutil.c:333 g10/keyedit.c:978 +msgid "quit" +msgstr "terminã" + +#: util/miscutil.c:336 +msgid "qQ" +msgstr "tT" + +#: util/errors.c:54 +msgid "general error" +msgstr "eroare generalã" + +#: util/errors.c:55 +msgid "unknown packet type" +msgstr "tip de pachet necunoscut" + +#: util/errors.c:56 +msgid "unknown version" +msgstr "versiune necunoscutã" + +#: util/errors.c:57 +msgid "unknown pubkey algorithm" +msgstr "algoritm pubkey necunoscut" + +#: util/errors.c:58 +msgid "unknown digest algorithm" +msgstr "algoritm rezumat necunoscut" + +#: util/errors.c:59 +msgid "bad public key" +msgstr "cheie publicã incorectã" + +#: util/errors.c:60 +msgid "bad secret key" +msgstr "cheie secretã incorectã" + +#: util/errors.c:61 +msgid "bad signature" +msgstr "semnãturã incorectã" + +#: util/errors.c:62 +msgid "checksum error" +msgstr "eroare checksum" + +#: util/errors.c:63 +msgid "bad passphrase" +msgstr "frazã-parolã incorectã" + +#: util/errors.c:64 +msgid "public key not found" +msgstr "cheia publicã nu a fost gãsitã" + +#: util/errors.c:65 +msgid "unknown cipher algorithm" +msgstr "algoritm cifrare necunoscut" + +#: util/errors.c:66 +msgid "can't open the keyring" +msgstr "nu pot deschide inelul de chei" + +#: util/errors.c:67 +msgid "invalid packet" +msgstr "pachet invalid" + +#: util/errors.c:68 +msgid "invalid armor" +msgstr "armurã invalidã" + +#: util/errors.c:69 +msgid "no such user id" +msgstr "nu existã acest id utilizator" + +#: util/errors.c:70 +msgid "secret key not available" +msgstr "cheia secretã nu e disponibilã" + +#: util/errors.c:71 +msgid "wrong secret key used" +msgstr "a fost folositã o cheie secretã greºitã" + +#: util/errors.c:72 +msgid "not supported" +msgstr "nu este suportat(ã)" + +#: util/errors.c:73 +msgid "bad key" +msgstr "cheie incorectã" + +#: util/errors.c:74 +msgid "file read error" +msgstr "eroare citire fiºier" + +#: util/errors.c:75 +msgid "file write error" +msgstr "eroare scriere fiºier" + +#: util/errors.c:76 +msgid "unknown compress algorithm" +msgstr "algoritm compresie necunoscut" + +#: util/errors.c:77 +msgid "file open error" +msgstr "eroare deschidere fiºier" + +#: util/errors.c:78 +msgid "file create error" +msgstr "eroare creare fiºier" + +#: util/errors.c:79 +msgid "invalid passphrase" +msgstr "frazã-parolã invalidã" + +#: util/errors.c:80 +msgid "unimplemented pubkey algorithm" +msgstr "algoritm pubkey neimplementat" + +#: util/errors.c:81 +msgid "unimplemented cipher algorithm" +msgstr "algoritm cifrare neimplementat" + +#: util/errors.c:82 +msgid "unknown signature class" +msgstr "clasã semnãturi necunoscutã" + +#: util/errors.c:83 +msgid "trust database error" +msgstr "eroare bazã de date încredere" + +#: util/errors.c:84 +msgid "bad MPI" +msgstr "MPI incorect" + +#: util/errors.c:85 +msgid "resource limit" +msgstr "limitã resurse" + +#: util/errors.c:86 +msgid "invalid keyring" +msgstr "inel de chei invalid" + +#: util/errors.c:87 +msgid "bad certificate" +msgstr "certificat incorect" + +#: util/errors.c:88 +msgid "malformed user id" +msgstr "id utilizator anormal" + +#: util/errors.c:89 +msgid "file close error" +msgstr "eroare închidere fiºier" + +#: util/errors.c:90 +msgid "file rename error" +msgstr "eroare redenumire fiºier" + +#: util/errors.c:91 +msgid "file delete error" +msgstr "eroare ºtergere fiºier" + +#: util/errors.c:92 +msgid "unexpected data" +msgstr "date neaºteptate" + +#: util/errors.c:93 +msgid "timestamp conflict" +msgstr "conflict timestamp" + +#: util/errors.c:94 +msgid "unusable pubkey algorithm" +msgstr "algoritm pubkey nefolosibil" + +#: util/errors.c:95 +msgid "file exists" +msgstr "fiºierul existã" + +#: util/errors.c:96 +msgid "weak key" +msgstr "cheie slabã" + +#: util/errors.c:97 +msgid "invalid argument" +msgstr "argument invalid" + +#: util/errors.c:98 +msgid "bad URI" +msgstr "URI incorect" + +#: util/errors.c:99 +msgid "unsupported URI" +msgstr "URI nesuportat" + +#: util/errors.c:100 +msgid "network error" +msgstr "eroare reþea" + +#: util/errors.c:102 +msgid "not encrypted" +msgstr "necifrat" + +#: util/errors.c:103 +msgid "not processed" +msgstr "neprocesat" + +#. the key cannot be used for a specific usage +#: util/errors.c:105 +msgid "unusable public key" +msgstr "cheie publicã de nefolosit" + +#: util/errors.c:106 +msgid "unusable secret key" +msgstr "cheie secretã de nefolosit" + +#: util/errors.c:107 +msgid "keyserver error" +msgstr "eroare server de chei" + +#: util/logger.c:249 +#, c-format +msgid "... this is a bug (%s:%d:%s)\n" +msgstr "... acesta este un bug (%s:%d:%s)\n" + +#: util/logger.c:255 +#, c-format +msgid "you found a bug ... (%s:%d)\n" +msgstr "aþi gãsit un bug ... (%s:%d)\n" + +#: cipher/random.c:163 +msgid "no entropy gathering module detected\n" +msgstr "nu a fost gãsit nici un modul de adunare a entropiei\n" + +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 +#, c-format +msgid "can't open `%s': %s\n" +msgstr "nu pot deschide `%s': %s\n" + +#: cipher/random.c:391 +#, c-format +msgid "can't stat `%s': %s\n" +msgstr "nu pot obþine statistici `%s': %s\n" + +#: cipher/random.c:396 +#, c-format +msgid "`%s' is not a regular file - ignored\n" +msgstr "`%s' nu este un fiºier normal - ignorat\n" + +#: cipher/random.c:401 +msgid "note: random_seed file is empty\n" +msgstr "notã: fiºier random_seed este gol\n" + +#: cipher/random.c:407 +msgid "WARNING: invalid size of random_seed file - not used\n" +msgstr "" +"AVERTISMENT: dimensiune invalidã pentru fiºierul random_seed - nu va fi " +"folositã\n" + +#: cipher/random.c:415 +#, c-format +msgid "can't read `%s': %s\n" +msgstr "nu pot citi `%s': %s\n" + +#: cipher/random.c:453 +msgid "note: random_seed file not updated\n" +msgstr "notã: fiºierul random_seed nu a fost actualizat\n" + +#: cipher/random.c:473 g10/exec.c:481 +#, c-format +msgid "can't create `%s': %s\n" +msgstr "nu pot crea `%s': %s\n" + +#: cipher/random.c:480 +#, c-format +msgid "can't write `%s': %s\n" +msgstr "nu pot scrie `%s': %s\n" + +#: cipher/random.c:483 +#, c-format +msgid "can't close `%s': %s\n" +msgstr "nu pot închide `%s': %s\n" + +#: cipher/random.c:728 +msgid "WARNING: using insecure random number generator!!\n" +msgstr "" +"AVERISMENT: este folosit un generator de numere aleatoare nesigur " +"(insecure)!!\n" + +#: cipher/random.c:729 +msgid "" +"The random number generator is only a kludge to let\n" +"it run - it is in no way a strong RNG!\n" +"\n" +"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" +"\n" +msgstr "" +"Generatorul de numere aleatoare este doar ceva temporar pentru\n" +"a-l face sã meargã - nu este nicidecum un GNA sigur (secure)!\n" +"\n" +"NU FOLOSIÞI NICI O DATà GENERATà DE ACEST PROGRAM!!\n" +"\n" + +#: cipher/rndlinux.c:134 +#, c-format +msgid "" +"\n" +"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" +msgstr "" +"\n" +"Nu sunt disponibili destui octeþi aleatori. Vã rugãm faceþi ceva pentru\n" +"a da sistemului de operare o ºansã de a colecta mai multã entropie\n" +"(Mai sunt necesari %d octeþi)\n" + +#: cipher/md.c:140 +#, c-format +msgid "digest algorithm `%s' is read-only in this release\n" +msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n" + +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + +#: cipher/rndegd.c:204 +msgid "" +"Please wait, entropy is being gathered. Do some work if it would\n" +"keep you from getting bored, because it will improve the quality\n" +"of the entropy.\n" +msgstr "" +"Vã rugãm aºteptaþi, este adunatã entropia. Faceþi ceva dacã vã ajutã sã\n" +"nu vã plictisiþi, pentru cã va îmbunãtãþi calitatea entropiei.\n" + +#: g10/g10.c:305 +msgid "" +"@Commands:\n" +" " +msgstr "" +"@Comenzi:\n" +" " + +#: g10/g10.c:307 +msgid "|[file]|make a signature" +msgstr "|[fiºier]|creazã o semnãturã" + +#: g10/g10.c:308 +msgid "|[file]|make a clear text signature" +msgstr "|[fiºier]|creazã o semnãturã text în clar" + +#: g10/g10.c:309 +msgid "make a detached signature" +msgstr "creazã o semnãturã detaºatã" + +#: g10/g10.c:310 +msgid "encrypt data" +msgstr "cifreazã datele" + +#: g10/g10.c:311 +msgid "|[files]|encrypt files" +msgstr "|[fiºiere]|cifreazã fiºiere" + +#: g10/g10.c:312 +msgid "encryption only with symmetric cipher" +msgstr "cifreazã numai cu cifru simetric" + +#: g10/g10.c:313 +msgid "store only" +msgstr "doar pãstreazã" + +#: g10/g10.c:314 +msgid "decrypt data (default)" +msgstr "decripteazã datele (implicit)" + +#: g10/g10.c:315 +msgid "|[files]|decrypt files" +msgstr "|[fiºiere]|decripteazã fiºiere" + +#: g10/g10.c:316 +msgid "verify a signature" +msgstr "verificã o semnãturã" + +#: g10/g10.c:318 +msgid "list keys" +msgstr "enumerã chei" + +#: g10/g10.c:320 +msgid "list keys and signatures" +msgstr "enumerã chei ºi semnãturi" + +#: g10/g10.c:321 +msgid "check key signatures" +msgstr "verificã semnãturile cheii" + +#: g10/g10.c:322 +msgid "list keys and fingerprints" +msgstr "enumerã chei ºi amprente" + +#: g10/g10.c:323 +msgid "list secret keys" +msgstr "enumerã chei secrete" + +#: g10/g10.c:324 +msgid "generate a new key pair" +msgstr "genereazã o nouã perechi de chei" + +#: g10/g10.c:325 +msgid "remove keys from the public keyring" +msgstr "ºterge chei de pe inelul de chei public" + +#: g10/g10.c:327 +msgid "remove keys from the secret keyring" +msgstr "ºterge chei de pe inelul de chei secret" + +#: g10/g10.c:328 +msgid "sign a key" +msgstr "semneazã o cheie" + +#: g10/g10.c:329 +msgid "sign a key locally" +msgstr "semneazã o cheie local" + +#: g10/g10.c:330 +msgid "sign a key non-revocably" +msgstr "semneazã o cheie irevocabil" + +#: g10/g10.c:331 +msgid "sign a key locally and non-revocably" +msgstr "semneazã o cheie local ºi irevocabil" + +#: g10/g10.c:332 +msgid "sign or edit a key" +msgstr "semneazã sau editeazã o cheie" + +#: g10/g10.c:333 +msgid "generate a revocation certificate" +msgstr "genereazã un certificat de revocare" + +#: g10/g10.c:335 +msgid "export keys" +msgstr "exportã chei" + +#: g10/g10.c:336 +msgid "export keys to a key server" +msgstr "exportã chei pentru un server de chei" + +#: g10/g10.c:337 +msgid "import keys from a key server" +msgstr "importã chei de la un server de chei" + +#: g10/g10.c:339 +msgid "search for keys on a key server" +msgstr "cautã pentru chei pe un server de chei" + +#: g10/g10.c:341 +msgid "update all keys from a keyserver" +msgstr "actualizeazã toate cheile de la un server de chei" + +#: g10/g10.c:345 +msgid "import/merge keys" +msgstr "importã/combinã chei" + +#: g10/g10.c:347 +msgid "list only the sequence of packets" +msgstr "enumerã numai secvenþa de pachete" + +#: g10/g10.c:349 +msgid "export the ownertrust values" +msgstr "exportã valorile încrederii în proprietari" + +#: g10/g10.c:351 +msgid "import ownertrust values" +msgstr "importã valorile încrederii în proprietari" + +#: g10/g10.c:353 +msgid "update the trust database" +msgstr "actualizeazã baza de date de încredere" + +#: g10/g10.c:355 +msgid "unattended trust database update" +msgstr "actualizare fãrã supraveghere a bazei de date de încredere" + +#: g10/g10.c:356 +msgid "fix a corrupted trust database" +msgstr "reparã o bazã de date de încredere coruptã" + +#: g10/g10.c:357 +msgid "De-Armor a file or stdin" +msgstr "Eliminã armura unui fiºier sau intrãrii standard (stdin)" + +#: g10/g10.c:359 +msgid "En-Armor a file or stdin" +msgstr "Pune armura unui fiºier sau intrãrii standard (stdin)" + +#: g10/g10.c:361 +msgid "|algo [files]|print message digests" +msgstr "|algo [fiºiere]|afiºeazã rezumate mesaje" + +#: g10/g10.c:365 g10/gpgv.c:64 +msgid "" +"@\n" +"Options:\n" +" " +msgstr "" +"@\n" +"Opþiuni:\n" +" " + +#: g10/g10.c:367 +msgid "create ascii armored output" +msgstr "creazã ieºire în armurã ascii" + +#: g10/g10.c:369 +msgid "|NAME|encrypt for NAME" +msgstr "|NUME|cifrare pentru NUME" + +#: g10/g10.c:372 +msgid "|NAME|use NAME as default recipient" +msgstr "|NUME|foloseºte NUME ca destinatar implicit" + +#: g10/g10.c:374 +msgid "use the default key as default recipient" +msgstr "foloseºte cheia implicitã ca destinatar implicit" + +#: g10/g10.c:380 +msgid "use this user-id to sign or decrypt" +msgstr "foloseºte acest id-utilizator pentru a semna sau decripta" + +#: g10/g10.c:381 +msgid "|N|set compress level N (0 disables)" +msgstr "|N|seteazã nivel de compresie N (0 deactiveazã)" + +#: g10/g10.c:383 +msgid "use canonical text mode" +msgstr "foloseºte modul text canonic" + +#: g10/g10.c:391 +msgid "use as output file" +msgstr "foloseºte ca fiºier ieºire" + +#: g10/g10.c:392 g10/gpgv.c:66 +msgid "verbose" +msgstr "locvace" + +#: g10/g10.c:393 g10/gpgv.c:67 +msgid "be somewhat more quiet" +msgstr "fii oarecum mai tãcut" + +#: g10/g10.c:394 +msgid "don't use the terminal at all" +msgstr "nu folosi deloc terminalul" + +#: g10/g10.c:395 +msgid "force v3 signatures" +msgstr "forþeazã semnãturi v3" + +#: g10/g10.c:396 +msgid "do not force v3 signatures" +msgstr "nu forþa semnãturi v3" + +#: g10/g10.c:397 +msgid "force v4 key signatures" +msgstr "forþeazã semnãturi de chei v4" + +#: g10/g10.c:398 +msgid "do not force v4 key signatures" +msgstr "nu forþa semnãturi de chei v4" + +#: g10/g10.c:399 +msgid "always use a MDC for encryption" +msgstr "foloseºte întotdeauna un MDC pentru cifrare" + +#: g10/g10.c:401 +msgid "never use a MDC for encryption" +msgstr "nu folosi niciodatã un MDC pentru cifrare" + +#: g10/g10.c:403 +msgid "do not make any changes" +msgstr "nu face nici o schimbare" + +#: g10/g10.c:404 +msgid "prompt before overwriting" +msgstr "întreabã înainte de a suprascrie" + +#: g10/g10.c:405 +msgid "use the gpg-agent" +msgstr "foloseºte gpg-agent" + +#: g10/g10.c:408 +msgid "batch mode: never ask" +msgstr "modul batch: nu întreba niciodatã" + +#: g10/g10.c:409 +msgid "assume yes on most questions" +msgstr "presupune da la cele mai multe întrebãri" + +#: g10/g10.c:410 +msgid "assume no on most questions" +msgstr "presupune nu la cele mai multe întrebãri" + +#: g10/g10.c:411 +msgid "add this keyring to the list of keyrings" +msgstr "adaugã acest inel de chei la lista inelelor de chei" + +#: g10/g10.c:412 +msgid "add this secret keyring to the list" +msgstr "adaugã acest inel de chei secret la listã" + +#: g10/g10.c:413 +msgid "show which keyring a listed key is on" +msgstr "aratã cãruia dintre inelele de chei îi aparþine o cheie enumeratã" + +#: g10/g10.c:414 +msgid "|NAME|use NAME as default secret key" +msgstr "|NUME|foloseºte NUME ca cheie secretã implicitã" + +#: g10/g10.c:415 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "|HOST|foloseºte acest server de chei pentru a cãuta chei" + +#: g10/g10.c:419 +msgid "|NAME|set terminal charset to NAME" +msgstr "|NUME|seteazã charset-ul pentru terminal ca NUME" + +#: g10/g10.c:420 +msgid "read options from file" +msgstr "citeºte opþiuni din fiºier" + +#: g10/g10.c:424 g10/gpgv.c:71 +msgid "|FD|write status info to this FD" +msgstr "|FD|scrie informaþii de stare în acest FD" + +#: g10/g10.c:426 +msgid "|[file]|write status info to file" +msgstr "|[fiºier]|scrie informaþii de stare în fiºier" + +#: g10/g10.c:438 +msgid "|KEYID|ultimately trust this key" +msgstr "|IDCHEIE|ai încredere deplinã în aceastã cheie" + +#: g10/g10.c:439 +msgid "|FILE|load extension module FILE" +msgstr "|FIªIER|încarcã modulul extensie FIªIER" + +#: g10/g10.c:445 +msgid "emulate the mode described in RFC1991" +msgstr "emuleazã modul descris în RFC1991" + +#: g10/g10.c:447 +msgid "set all packet, cipher and digest options to OpenPGP behavior" +msgstr "" +"seteazã toate opþiunile pentru pachete, cifru ºi rezumat ca pentru " +"comportamentul OpenPGP" + +#: g10/g10.c:448 +msgid "set all packet, cipher and digest options to PGP 2.x behavior" +msgstr "" +"seteazã toate opþiunile pentru pachete, cifru ºi rezumat ca pentru " +"comportamentul PGP 2.x" + +#: g10/g10.c:452 +msgid "|N|use passphrase mode N" +msgstr "|N|foloseºte modul frazã-parolã N" + +#: g10/g10.c:454 +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME pentru fraza-parolã" + +#: g10/g10.c:456 +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "|NUME|foloseºte algoritm cifrare NUME pentru fraza-parolã" + +#: g10/g10.c:458 +msgid "|NAME|use cipher algorithm NAME" +msgstr "|NUME|foloseºte algoritm cifrare NUME" + +#: g10/g10.c:459 +msgid "|NAME|use message digest algorithm NAME" +msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME" + +#: g10/g10.c:461 +msgid "|N|use compress algorithm N" +msgstr "|N|foloseºte algoritm compresie N" + +#: g10/g10.c:462 +msgid "throw keyid field of encrypted packets" +msgstr "ignorã câmp keyid pentru pachete cifrate" + +#: g10/g10.c:463 +msgid "Show Photo IDs" +msgstr "Aratã poze ID-uri" + +#: g10/g10.c:464 +msgid "Don't show Photo IDs" +msgstr "Nu arãta poze ID-uri" + +#: g10/g10.c:465 +msgid "Set command line to view Photo IDs" +msgstr "Seteazã linia de comandã pentru a vedea poze ID-uri" + +#: g10/g10.c:472 +msgid "" +"@\n" +"(See the man page for a complete listing of all commands and options)\n" +msgstr "" +"@\n" +"(Aratã pagina man pentru o listã completã a comenzilor ºi opþiunilor)\n" + +#: g10/g10.c:475 +msgid "" +"@\n" +"Examples:\n" +"\n" +" -se -r Bob [file] sign and encrypt for user Bob\n" +" --clearsign [file] make a clear text signature\n" +" --detach-sign [file] make a detached signature\n" +" --list-keys [names] show keys\n" +" --fingerprint [names] show fingerprints\n" +msgstr "" +"@\n" +"Exemple:\n" +"\n" +" -se -r Dan [fiºier] semneazã ºi cifreazã pentru utilizatorul Dan\n" +" --clearsign [fiºier] creazã o semnãturã text în clar\n" +" --detach-sign [fiºier] creazã o semnãturã detaºatã\n" +" --list-keys [nume] aratã chei\n" +" --fingerprint [nume] aratã amprente\n" + +#: g10/g10.c:635 g10/gpgv.c:95 +msgid "Please report bugs to .\n" +msgstr "Raportaþi bug-uri la .\n" + +#: g10/g10.c:639 +msgid "Usage: gpg [options] [files] (-h for help)" +msgstr "Folosire: gpg [opþiuni] [fiºiere] (-h pentru ajutor)" + +#: g10/g10.c:642 +msgid "" +"Syntax: gpg [options] [files]\n" +"sign, check, encrypt or decrypt\n" +"default operation depends on the input data\n" +msgstr "" +"Sintaxã: gpg [opþiuni] [fiºiere]\n" +"sign, check, encrypt sau decrypt\n" +"operaþiunea implicitã depinde de datele de intrare\n" + +#: g10/g10.c:653 +msgid "" +"\n" +"Supported algorithms:\n" +msgstr "" +"\n" +"Algoritmuri suportate:\n" + +#: g10/g10.c:656 +msgid "Pubkey: " +msgstr "Pubkey: " + +#: g10/g10.c:662 g10/keyedit.c:1568 +msgid "Cipher: " +msgstr "Cifru: " + +#: g10/g10.c:668 +msgid "Hash: " +msgstr "Hash: " + +#: g10/g10.c:674 g10/keyedit.c:1614 +msgid "Compression: " +msgstr "Compresie: " + +#: g10/g10.c:757 +msgid "usage: gpg [options] " +msgstr "folosire: gpg [opþiuni] " + +#: g10/g10.c:825 +msgid "conflicting commands\n" +msgstr "comenzi în conflict\n" + +#: g10/g10.c:843 +#, c-format +msgid "no = sign found in group definition \"%s\"\n" +msgstr "nu am gãsit nici un semn = în definiþia grupului \"%s\"\n" + +#: g10/g10.c:1011 +#, c-format +msgid "WARNING: unsafe ownership on %s \"%s\"\n" +msgstr "AVERTISMENT: proprietate nesigurã (unsafe) pentru %s \"%s\"\n" + +#: g10/g10.c:1014 +#, c-format +msgid "WARNING: unsafe permissions on %s \"%s\"\n" +msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n" + +#: g10/g10.c:1017 +#, c-format +msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" +msgstr "" +"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s" +"\"\n" + +#: g10/g10.c:1021 +#, c-format +msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" +msgstr "" +"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s" +"\"\n" + +#: g10/g10.c:1197 +#, c-format +msgid "NOTE: old default options file `%s' ignored\n" +msgstr "NOTÃ: fisier opþiuni implicite vechi `%s' ignorat\n" + +#: g10/g10.c:1233 +#, c-format +msgid "NOTE: no default option file `%s'\n" +msgstr "NOTÃ: nici un fiºier opþiuni implicit `%s'\n" + +#: g10/g10.c:1237 +#, c-format +msgid "option file `%s': %s\n" +msgstr "fiºier opþiuni `%s': %s\n" + +#: g10/g10.c:1244 +#, c-format +msgid "reading options from `%s'\n" +msgstr "citesc opþiuni din `%s'\n" + +#: g10/g10.c:1430 +#, c-format +msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" +msgstr "" +"extensie cifru \"%s\" nu a fost încãrcat din cauza permisiunilor nesigure " +"(unsafe)\n" + +#: g10/g10.c:1563 +#, c-format +msgid "%s is not a valid character set\n" +msgstr "%s nu este un set de carectere valid\n" + +#: g10/g10.c:1581 +msgid "could not parse keyserver URI\n" +msgstr "nu am putut interpreta URI pentru serverul de chei\n" + +#: g10/g10.c:1590 +#, c-format +msgid "%s:%d: invalid import options\n" +msgstr "%s:%d: opþiuni import invalide\n" + +#: g10/g10.c:1593 +msgid "invalid import options\n" +msgstr "opþiuni import invalide\n" + +#: g10/g10.c:1600 +#, c-format +msgid "%s:%d: invalid export options\n" +msgstr "%s:%d: opþiuni export invalide\n" + +#: g10/g10.c:1603 +msgid "invalid export options\n" +msgstr "opþiuni export invalide\n" + +#: g10/g10.c:1609 +#, c-format +msgid "unable to set exec-path to %s\n" +msgstr "nu pot seta cale-execuþie ca %s\n" + +#: g10/g10.c:1736 +msgid "WARNING: program may create a core file!\n" +msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n" + +#: g10/g10.c:1740 +#, c-format +msgid "WARNING: %s overrides %s\n" +msgstr "AVERTISMENT: %s înlocuieºte %s\n" + +#: g10/g10.c:1747 g10/g10.c:1758 +#, c-format +msgid "NOTE: %s is not for normal use!\n" +msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n" + +#: g10/g10.c:1749 +#, c-format +msgid "%s not allowed with %s!\n" +msgstr "%s nu este permis cu %s!\n" + +#: g10/g10.c:1752 +#, c-format +msgid "%s makes no sense with %s!\n" +msgstr "%s nu are sens cu %s!\n" + +#: g10/g10.c:1773 +msgid "you can only make detached or clear signatures while in --pgp2 mode\n" +msgstr "" +"puteþi crea doar semnãturi detaºate sau în clar câtã vreme sunteþi în modul " +"--pgp2\n" + +#: g10/g10.c:1779 +msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" +msgstr "" +"nu puteþi semna ºi cifra în acelaºi timp câtã vreme sunteþi în modul --pgp2\n" + +#: g10/g10.c:1785 +msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" +msgstr "" +"trebuie sã folosiþi fiºiere (ºi nu un pipe) când lucraþi cu modul --pgp2 " +"activat.\n" + +#: g10/g10.c:1798 +msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" +msgstr "cifrarea unui mesaj în modul --pgp2 necesitã un cifru IDEA\n" + +#: g10/g10.c:1869 g10/g10.c:1887 +msgid "selected cipher algorithm is invalid\n" +msgstr "algoritm cifrare selectat este invalid\n" + +#: g10/g10.c:1875 g10/g10.c:1893 +msgid "selected digest algorithm is invalid\n" +msgstr "algoritm rezumat selectat este invalid\n" + +#: g10/g10.c:1881 +msgid "selected certification digest algorithm is invalid\n" +msgstr "algoritm rezumat certificare selectat este invalid\n" + +#: g10/g10.c:1896 +#, c-format +msgid "compress algorithm must be in range %d..%d\n" +msgstr "algoritm compresie trebuie sã fie în intervalul %d..%d\n" + +#: g10/g10.c:1898 +msgid "completes-needed must be greater than 0\n" +msgstr "completes-needed trebuie sã fie mai mare decât 0\n" + +#: g10/g10.c:1900 +msgid "marginals-needed must be greater than 1\n" +msgstr "marginals-needed trebuie sã fie mai mare decât 1\n" + +#: g10/g10.c:1902 +msgid "max-cert-depth must be in range 1 to 255\n" +msgstr "max-cert-depth trebuie sã fie în intervalul 1..255\n" + +#: g10/g10.c:1905 +msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" +msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n" + +#: g10/g10.c:1909 +msgid "invalid S2K mode; must be 0, 1 or 3\n" +msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n" + +#: g10/g10.c:1913 +msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" +msgstr "default-check-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" + +#: g10/g10.c:1919 +msgid "invalid default preferences\n" +msgstr "preferinþe implicite invalide\n" + +#: g10/g10.c:1927 +msgid "invalid personal cipher preferences\n" +msgstr "preferinþe cifrare personale invalide\n" + +#: g10/g10.c:1931 +msgid "invalid personal digest preferences\n" +msgstr "preferinþe rezumat personale invalide\n" + +#: g10/g10.c:1935 +msgid "invalid personal compress preferences\n" +msgstr "preferinþe compresie personale invalide\n" + +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" + +#: g10/g10.c:2081 +#, c-format +msgid "failed to initialize the TrustDB: %s\n" +msgstr "am eºuat sã iniþializez TrustDB:%s\n" + +#: g10/g10.c:2091 +msgid "WARNING: recipients (-r) given without using public key encryption\n" +msgstr "" +"AVERTISMENT: destinatari (-r) furnizaþi fãrã a folosi cifrare cu cheie " +"publicã\n" + +#: g10/g10.c:2101 +msgid "--store [filename]" +msgstr "--store [nume_fiºier]" + +#: g10/g10.c:2108 +msgid "--symmetric [filename]" +msgstr "--symmetric [nume_fiºier]" + +#: g10/g10.c:2116 +msgid "--encrypt [filename]" +msgstr "--encrypt [nume_fiºier]" + +#: g10/g10.c:2133 +msgid "--sign [filename]" +msgstr "--sign [nume_fiºier]" + +#: g10/g10.c:2146 +msgid "--sign --encrypt [filename]" +msgstr "--sign --encrypt [nume_fiºier]" + +#: g10/g10.c:2160 +msgid "--sign --symmetric [filename]" +msgstr "--sign --symmetric [nume_fiºier]" + +#: g10/g10.c:2169 +msgid "--clearsign [filename]" +msgstr "--clearsign [nume_fiºier]" + +#: g10/g10.c:2187 +msgid "--decrypt [filename]" +msgstr "--decrypt [nume_fiºier]" + +#: g10/g10.c:2198 +msgid "--sign-key user-id" +msgstr "--sign-key id-utilizator" + +#: g10/g10.c:2206 +msgid "--lsign-key user-id" +msgstr "--lsign-key id-utilizator" + +#: g10/g10.c:2214 +msgid "--nrsign-key user-id" +msgstr "--nrsign-key id-utilizator" + +#: g10/g10.c:2222 +msgid "--nrlsign-key user-id" +msgstr "--nrlsign-key id-utilizator" + +#: g10/g10.c:2230 +msgid "--edit-key user-id [commands]" +msgstr "--edit-key id-utilizator [comenzi]" + +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 +#, c-format +msgid "can't open %s: %s\n" +msgstr "nu pot deschide %s: %s\n" + +#: g10/g10.c:2301 +msgid "-k[v][v][v][c] [user-id] [keyring]" +msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" + +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "actualizarea secretului a eºuat: %s\n" + +#: g10/g10.c:2406 +#, c-format +msgid "dearmoring failed: %s\n" +msgstr "eliminarea armurii a eºuat: %s\n" + +#: g10/g10.c:2414 +#, c-format +msgid "enarmoring failed: %s\n" +msgstr "punerea armurii a eºuat: %s\n" + +#: g10/g10.c:2501 +#, c-format +msgid "invalid hash algorithm `%s'\n" +msgstr "algoritm hash invalid `%s'\n" + +#: g10/g10.c:2587 +msgid "[filename]" +msgstr "[nume_fiºier]" + +#: g10/g10.c:2591 +msgid "Go ahead and type your message ...\n" +msgstr "Daþi-i drumul ºi scriþi mesajul ...\n" + +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/verify.c:142 +#, c-format +msgid "can't open `%s'\n" +msgstr "nu pot deschide `%s'\n" + +#: g10/g10.c:2867 +msgid "" +"a notation name must have only printable characters or spaces, and end with " +"an '='\n" +msgstr "" +"un nume de notaþie trebuie sã conþinã numai caractere imprimabile sau spaþii " +"ºi sã se termine cu un '='\n" + +#: g10/g10.c:2876 +msgid "a user notation name must contain the '@' character\n" +msgstr "un nume de notaþie utilizator trebuie sã conþinã caracterul '@'\n" + +#: g10/g10.c:2886 +msgid "a notation value must not use any control characters\n" +msgstr "" +"o valoare de notaþie trebuie sã nu foloseascã nici un caracter de control\n" + +#: g10/g10.c:2921 +msgid "the given certification policy URL is invalid\n" +msgstr "URL-ul politicii de certificare furnizat este invalid\n" + +#: g10/g10.c:2923 +msgid "the given signature policy URL is invalid\n" +msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" + +#: g10/gpgv.c:68 +msgid "take the keys from this keyring" +msgstr "ia cheile de pe acest inel de chei" + +#: g10/gpgv.c:70 +msgid "make timestamp conflicts only a warning" +msgstr "dã numai un avertisment la conflicte de timestamp" + +#: g10/gpgv.c:99 +msgid "Usage: gpgv [options] [files] (-h for help)" +msgstr "Folosire: gpgv [opþiuni] [fiºiere] (-h pentru ajutor)" + +#: g10/gpgv.c:102 +msgid "" +"Syntax: gpg [options] [files]\n" +"Check signatures against known trusted keys\n" +msgstr "" +"Sintaxã: gpg [opþiuni] [fiºiere]\n" +"Verificã semnãturi folosind cheile cunoscute ca fiind de încredere\n" + +#: g10/armor.c:321 +#, c-format +msgid "armor: %s\n" +msgstr "armurã: %s\n" + +#: g10/armor.c:350 +msgid "invalid armor header: " +msgstr "header armurã invalid: " + +#: g10/armor.c:357 +msgid "armor header: " +msgstr "header armurã: " + +#: g10/armor.c:368 +msgid "invalid clearsig header\n" +msgstr "header clearsig invalid\n" + +#: g10/armor.c:420 +msgid "nested clear text signatures\n" +msgstr "semnãturi text în clar încuibãrite\n" + +#: g10/armor.c:544 +msgid "invalid dash escaped line: " +msgstr "linie cu liniuþã escape invalidã: " + +#: g10/armor.c:556 +msgid "unexpected armor:" +msgstr "armurã neaºteptatã:" + +#: g10/armor.c:682 g10/armor.c:1258 +#, c-format +msgid "invalid radix64 character %02x skipped\n" +msgstr "caracter radix64 invalid %02x sãrit\n" + +#: g10/armor.c:725 +msgid "premature eof (no CRC)\n" +msgstr "eof prematur (nici un CRC)\n" + +#: g10/armor.c:759 +msgid "premature eof (in CRC)\n" +msgstr "eof prematur (în CRC)\n" + +#: g10/armor.c:763 +msgid "malformed CRC\n" +msgstr "CRC anormal\n" + +#: g10/armor.c:767 g10/armor.c:1295 +#, c-format +msgid "CRC error; %06lx - %06lx\n" +msgstr "eroare CRC; %06lx - %06lx\n" + +#: g10/armor.c:787 +msgid "premature eof (in Trailer)\n" +msgstr "eof prematur (în Trailer)\n" + +#: g10/armor.c:791 +msgid "error in trailer line\n" +msgstr "eroare linia de trailer\n" + +#: g10/armor.c:1073 +msgid "no valid OpenPGP data found.\n" +msgstr "nici o datã OpenPGP validã gãsitã.\n" + +#: g10/armor.c:1078 +#, c-format +msgid "invalid armor: line longer than %d characters\n" +msgstr "armurã invalidã: linie mai lungã de %d caractere\n" + +#: g10/armor.c:1082 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" +"caracter printabil în ghilimele în armurã - probabil a fost folosit un MTA " +"cu bug-uri\n" + +#: g10/pkclist.c:63 g10/revoke.c:603 +msgid "No reason specified" +msgstr "Nici un motiv specificat" + +#: g10/pkclist.c:65 g10/revoke.c:605 +msgid "Key is superseded" +msgstr "Cheia este înlocuitã" + +#: g10/pkclist.c:67 g10/revoke.c:604 +msgid "Key has been compromised" +msgstr "Cheia a fost compromisã" + +#: g10/pkclist.c:69 g10/revoke.c:606 +msgid "Key is no longer used" +msgstr "Cheia nu mai este folositã" + +#: g10/pkclist.c:71 g10/revoke.c:607 +msgid "User ID is no longer valid" +msgstr "ID utilizator nu mai este valid" + +#: g10/pkclist.c:75 +msgid "reason for revocation: " +msgstr "motiv pentru revocare: " + +#: g10/pkclist.c:92 +msgid "revocation comment: " +msgstr "comentariu revocare: " + +#. a string with valid answers +#: g10/pkclist.c:254 +msgid "iImMqQsS" +msgstr "iImMtTsS" + +#: g10/pkclist.c:262 +#, c-format +msgid "" +"No trust value assigned to:\n" +"%4u%c/%08lX %s \"" +msgstr "" +"Nici o valoare de încredere atribuitã lui:\n" +"%4u%c/%08lX %s \"" + +#: g10/pkclist.c:290 g10/mainproc.c:1451 +msgid " aka \"" +msgstr " aka \"" + +#: g10/pkclist.c:301 +msgid "" +"Please decide how far you trust this user to correctly\n" +"verify other users' keys (by looking at passports,\n" +"checking fingerprints from different sources...)?\n" +"\n" +msgstr "" +"Vã rugãm decideþi cât de multã încredere aveþi în acest utilizator\n" +"pentru a verifica cheile altor utilizatori (privind la paºapoarte,\n" +"verificând amprentele din diferite surse...)?\n" +"\n" + +#: g10/pkclist.c:304 +#, c-format +msgid " %d = Don't know\n" +msgstr " %d = Nu ºtiu\n" + +#: g10/pkclist.c:305 +#, c-format +msgid " %d = I do NOT trust\n" +msgstr " %d = NU am încredere\n" + +#: g10/pkclist.c:306 +#, c-format +msgid " %d = I trust marginally\n" +msgstr " %d = Am o încredere marginalã\n" + +#: g10/pkclist.c:307 +#, c-format +msgid " %d = I trust fully\n" +msgstr " %d = Am toatã încrederea\n" + +#: g10/pkclist.c:309 +#, c-format +msgid " %d = I trust ultimately\n" +msgstr " %d = Am încredere supremã\n" + +#. not yet implemented +#: g10/pkclist.c:312 +msgid " i = please show me more information\n" +msgstr " i = aratã-mi mai multe informaþii\n" + +#: g10/pkclist.c:315 +msgid " m = back to the main menu\n" +msgstr " m = înapoi la meniul principal\n" + +#: g10/pkclist.c:318 +msgid " s = skip this key\n" +msgstr " s = sãri peste cheia asta\n" + +#: g10/pkclist.c:319 +msgid " q = quit\n" +msgstr " t = terminã\n" + +#: g10/pkclist.c:326 g10/revoke.c:632 +msgid "Your decision? " +msgstr "Decizia d-voastrã? " + +#: g10/pkclist.c:347 +msgid "Do you really want to set this key to ultimate trust? " +msgstr "Doriþi într-adevãr sã setaþi aceastã cheie cu încredere supremã? " + +#: g10/pkclist.c:361 +msgid "Certificates leading to an ultimately trusted key:\n" +msgstr "Certificatele ce conduc la o cheie cu încredere supremã:\n" + +#: g10/pkclist.c:436 +#, c-format +msgid "key %08lX: key has been revoked!\n" +msgstr "cheia %08lX: cheia a fost revocatã!\n" + +#: g10/pkclist.c:443 g10/pkclist.c:455 g10/pkclist.c:555 +msgid "Use this key anyway? " +msgstr "Folosiþi oricum aceastã cheie? " + +#: g10/pkclist.c:448 +#, c-format +msgid "key %08lX: subkey has been revoked!\n" +msgstr "cheie %08lX: subcheia a fost revocatã!\n" + +#: g10/pkclist.c:469 +#, c-format +msgid "%08lX: key has expired\n" +msgstr "%08lX: cheia a expirat\n" + +#: g10/pkclist.c:479 +#, c-format +msgid "" +"%08lX: There is no indication that this key really belongs to the owner\n" +msgstr "" +"%08lX: Nu existã nici o indicaþie cã aceastã cheie aparþine într-adevãr " +"proprietarului\n" + +#: g10/pkclist.c:485 +#, c-format +msgid "%08lX: We do NOT trust this key\n" +msgstr "%08lX: Noi NU avem încredere în acestã cheie\n" + +#: g10/pkclist.c:491 +#, c-format +msgid "" +"%08lX: It is not sure that this key really belongs to the owner\n" +"but it is accepted anyway\n" +msgstr "" +"%08lX: Nu este sigur dacã aceastã cheie aparþine într-adevãr\n" +"proprietarului, dar este oricum acceptatã\n" + +#: g10/pkclist.c:497 +msgid "This key probably belongs to the owner\n" +msgstr "Aceastã cheie aparþine probabil proprietarului\n" + +#: g10/pkclist.c:502 +msgid "This key belongs to us\n" +msgstr "Aceastã cheie ne aparþine\n" + +#: g10/pkclist.c:550 +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" +"\n" +msgstr "" +"NU este sigur cã cheie aparþine persoanei numite în ID-ul\n" +"utilizator. Dacã ºtiþi *cu adevãrat* ce faceþi, puteþi\n" +"rãspunde cu da la urmãtoarea întrebare\n" +"\n" + +#: g10/pkclist.c:564 g10/pkclist.c:594 +msgid "WARNING: Using untrusted key!\n" +msgstr "AVERTISMENT: Folosiþi o cheie fãrã încredere!\n" + +#: g10/pkclist.c:605 +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:606 +msgid " This could mean that the signature is forgery.\n" +msgstr " Aceasta ar putea însemna cã semnãtura e falsificatã.\n" + +#: g10/pkclist.c:612 +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:617 +msgid "Note: This key has been disabled.\n" +msgstr "Notã: Aceastã cheie a fost deactivatã.\n" + +#: g10/pkclist.c:622 +msgid "Note: This key has expired!\n" +msgstr "Notã: Aceastã cheie a expirat!\n" + +#: g10/pkclist.c:633 +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:635 +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:643 +msgid "WARNING: We do NOT trust this key!\n" +msgstr "AVERTISMENT: Noi NU avem încredere în aceastã cheie!\n" + +#: g10/pkclist.c:644 +msgid " The signature is probably a FORGERY.\n" +msgstr " Semnãtura este probabil un FALS.\n" + +#: g10/pkclist.c:652 +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:654 +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:808 g10/pkclist.c:832 g10/pkclist.c:990 g10/pkclist.c:1050 +#, c-format +msgid "%s: skipped: %s\n" +msgstr "%s: sãritã: %s\n" + +#: g10/pkclist.c:818 g10/pkclist.c:1022 +#, c-format +msgid "%s: skipped: public key already present\n" +msgstr "%s: sãritã: cheia publicã este deja prezentã\n" + +#: g10/pkclist.c:849 +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:862 +msgid "" +"\n" +"Enter the user ID. End with an empty line: " +msgstr "" +"\n" +"Introduceþi ID-ul utilizator. Terminaþi cu o linie nouã: " + +#: g10/pkclist.c:878 +msgid "No such user ID.\n" +msgstr "Nu existã acest ID utilizator.\n" + +#: g10/pkclist.c:883 g10/pkclist.c:965 +msgid "skipped: public key already set as default recipient\n" +msgstr "sãritã: cheia publicã setatã deja ca destinatar implicit\n" + +#: g10/pkclist.c:901 +msgid "Public key is disabled.\n" +msgstr "Cheia publicã este deactivatã.\n" + +#: g10/pkclist.c:908 +msgid "skipped: public key already set\n" +msgstr "sãritã: cheia publicã setatã deja\n" + +#: g10/pkclist.c:957 +#, c-format +msgid "unknown default recipient `%s'\n" +msgstr "destinatar implicit necunoscut `%s'\n" + +#: g10/pkclist.c:1002 +#, c-format +msgid "%s: skipped: public key is disabled\n" +msgstr "%s: sãritã: cheia publicã este deactivatã\n" + +#: g10/pkclist.c:1057 +msgid "no valid addressees\n" +msgstr "nici un destinatar valid\n" + +#: g10/keygen.c:196 +#, c-format +msgid "preference %c%lu is not valid\n" +msgstr "preferinþa %c%lu nu este validã\n" + +#: g10/keygen.c:203 +#, c-format +msgid "preference %c%lu duplicated\n" +msgstr "preferinþa %c%lu duplicatã\n" + +#: g10/keygen.c:208 +#, c-format +msgid "too many `%c' preferences\n" +msgstr "prea multe preferinþe `%c'\n" + +#: g10/keygen.c:278 +msgid "invalid character in preference string\n" +msgstr "caracter invalid în ºir preferinþe\n" + +#: g10/keygen.c:538 +msgid "writing direct signature\n" +msgstr "scriu semnãturã directã\n" + +#: g10/keygen.c:577 +msgid "writing self signature\n" +msgstr "scriu auto semnãturã\n" + +#: g10/keygen.c:621 +msgid "writing key binding signature\n" +msgstr "scriu semnãturã legatã de cheie\n" + +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#, c-format +msgid "keysize invalid; using %u bits\n" +msgstr "lungime cheie invalidã; folosesc %u biþi\n" + +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 +#, c-format +msgid "keysize rounded up to %u bits\n" +msgstr "lungime cheie rotunjitã la %u biþi\n" + +#: g10/keygen.c:955 +msgid "Please select what kind of key you want:\n" +msgstr "Selectaþi ce fel de cheie doriþi:\n" + +#: g10/keygen.c:957 +#, c-format +msgid " (%d) DSA and ElGamal (default)\n" +msgstr " (%d) DSA ºi ElGamal (implicit)\n" + +#: g10/keygen.c:958 +#, c-format +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (numai semnãturã)\n" + +#: g10/keygen.c:960 +#, c-format +msgid " (%d) ElGamal (encrypt only)\n" +msgstr " (%d) ElGamal (numai cifrare)\n" + +#: g10/keygen.c:962 +#, c-format +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (semnãturã ºi cifrare)\n" + +#: g10/keygen.c:963 +#, c-format +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (numai semnãturã)\n" + +#: g10/keygen.c:965 +#, c-format +msgid " (%d) RSA (encrypt only)\n" +msgstr " (%d) RSA (numai cifrare)\n" + +#: g10/keygen.c:967 +#, c-format +msgid " (%d) RSA (sign and encrypt)\n" +msgstr " (%d) RSA (semnãturã ºi cifrare)\n" + +#: g10/keygen.c:970 +msgid "Your selection? " +msgstr "Selecþia d-voastrã? " + +#: g10/keygen.c:996 +msgid "" +"The use of this algorithm is only supported by GnuPG. You will not be\n" +"able to use this key to communicate with PGP users. This algorithm is also\n" +"very slow, and may not be as secure as the other choices.\n" +msgstr "" +"Folosirea acestui algoritm este suportatã numai de GnuPG. Nu veþi putea\n" +"folosi aceastã cheie pentru a comunica cu alþi utilizatori PGP. Mai mult,\n" +"acest algoritm este foarte lent ºi ar putea fi mai puþin sigur decât\n" +"celelalte opþiuni.\n" + +#: g10/keygen.c:1001 +msgid "Create anyway? " +msgstr "Creaþi oricum? " + +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 +msgid "Invalid selection.\n" +msgstr "Selecþie invalidã.\n" + +#: g10/keygen.c:1032 +#, c-format +msgid "" +"About to generate a new %s keypair.\n" +" minimum keysize is 768 bits\n" +" default keysize is 1024 bits\n" +" highest suggested keysize is 2048 bits\n" +msgstr "" +"Pe cale sã generaþi o nouã pereche de chei %s.\n" +" lungimea minimã este 768 bits\n" +" lungimea implicitã este 1024 bits\n" +" cea mai lungã cheie sugeratã este 2048 bits\n" + +#: g10/keygen.c:1041 +msgid "What keysize do you want? (1024) " +msgstr "Ce lungime de cheie doriþi? (1024) " + +#: g10/keygen.c:1046 +msgid "DSA only allows keysizes from 512 to 1024\n" +msgstr "DSA permite numai chei de la 512 la 1024\n" + +#: g10/keygen.c:1048 +msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +msgstr "" +"lungime cheie prea micã; 1024 este cea mai micã valoare permisã pentru RSA.\n" + +#: g10/keygen.c:1051 +msgid "keysize too small; 768 is smallest value allowed.\n" +msgstr "lungime cheie prea micã; 768 este cea mai micã valoare permisã.\n" + +#. It is ridiculous and an annoyance to use larger key sizes! +#. * GnuPG can handle much larger sizes; but it takes an eternity +#. * to create such a key (but less than the time the Sirius +#. * Computer Corporation needs to process one of the usual +#. * complaints) and {de,en}cryption although needs some time. +#. * So, before you complain about this limitation, I suggest that +#. * you start a discussion with Marvin about this theme and then +#. * do whatever you want. +#: g10/keygen.c:1062 +#, c-format +msgid "keysize too large; %d is largest value allowed.\n" +msgstr "lungime cheie prea mare; %d este cea mai mare valoare permisã.\n" + +#: g10/keygen.c:1067 +msgid "" +"Keysizes larger than 2048 are not suggested because\n" +"computations take REALLY long!\n" +msgstr "" +"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n" +"deoarece calculele iau FOARTE MULT timp!\n" + +#: g10/keygen.c:1070 +msgid "Are you sure that you want this keysize? " +msgstr "Sunteþi sigur(ã) cã doriþi aceastã lungime de cheie?" + +#: g10/keygen.c:1071 +msgid "" +"Okay, but keep in mind that your monitor and keyboard radiation is also very " +"vulnerable to attacks!\n" +msgstr "" +"Bine, dar þineþi minte cã radiaþia monitorului ºi tastaturii d-voastrã este " +"de asemenea vulnerabilã la atacuri!\n" + +#: g10/keygen.c:1080 +#, c-format +msgid "Requested keysize is %u bits\n" +msgstr "Lungimea cheii necesarã este %u biþi\n" + +#: g10/keygen.c:1083 g10/keygen.c:1087 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "rotunjitã prin adaos la %u biþi\n" + +#: g10/keygen.c:1138 +msgid "" +"Please specify how long the key should be valid.\n" +" 0 = key does not expire\n" +" = key expires in n days\n" +" w = key expires in n weeks\n" +" m = key expires in n months\n" +" y = key expires in n years\n" +msgstr "" +"Specificaþi cât de mult timp doriþi sã fie validã cheia.\n" +" 0 = cheia nu expirã\n" +" = cheia expirã în n zile\n" +" w = cheia expirã în n sãptãmâni\n" +" m = cheia expirã în n luni\n" +" y = cheia expirã în n ani\n" + +#: g10/keygen.c:1147 +msgid "" +"Please specify how long the signature should be valid.\n" +" 0 = signature does not expire\n" +" = signature expires in n days\n" +" w = signature expires in n weeks\n" +" m = signature expires in n months\n" +" y = signature expires in n years\n" +msgstr "" +"Specificaþi cât de mult timp doriþi sã fie validã semnãtura.\n" +" 0 = semnãtura nu expirã\n" +" = semnãtura expirã în n zile\n" +" w = semnãtura expirã în n sãptãmâni\n" +" m = semnãtura expirã în n luni\n" +" y = semnãtura expirã în n ani\n" + +#: g10/keygen.c:1169 +msgid "Key is valid for? (0) " +msgstr "Cheia este validã pentru? (0) " + +#: g10/keygen.c:1171 +msgid "Signature is valid for? (0) " +msgstr "Semnãtura este validã pentru? (0) " + +#: g10/keygen.c:1176 +msgid "invalid value\n" +msgstr "valoare invalidã\n" + +#: g10/keygen.c:1181 +#, c-format +msgid "%s does not expire at all\n" +msgstr "%s nu expirã deloc\n" + +#. print the date when the key expires +#: g10/keygen.c:1188 +#, c-format +msgid "%s expires at %s\n" +msgstr "%s expirã la %s\n" + +#: g10/keygen.c:1194 +msgid "" +"Your system can't display dates beyond 2038.\n" +"However, it will be correctly handled up to 2106.\n" +msgstr "" +"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:1199 +msgid "Is this correct (y/n)? " +msgstr "Este aceasta corect (d/n)? " + +#: g10/keygen.c:1242 +msgid "" +"\n" +"You need a User-ID to identify your key; the software constructs the user " +"id\n" +"from Real Name, Comment and Email Address in this form:\n" +" \"Heinrich Heine (Der Dichter) \"\n" +"\n" +msgstr "" +"\n" +"Aveþi nevoie de un ID utilizator pentru a identifica cheia; software-ul\n" +"construieºte id-ul utilizator din Numele Real, Comentariu ºi Adresa de " +"Email\n" +"în aceastã formã:\n" +" \"Popa Ioan (popicã) \"\n" +"\n" + +#: g10/keygen.c:1254 +msgid "Real name: " +msgstr "Nume real: " + +#: g10/keygen.c:1262 +msgid "Invalid character in name\n" +msgstr "Caracter invalid în nume\n" + +#: g10/keygen.c:1264 +msgid "Name may not start with a digit\n" +msgstr "Numele nu poate începe cu o cifrã\n" + +#: g10/keygen.c:1266 +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:1274 +msgid "Email address: " +msgstr "Adresã de email: " + +#: g10/keygen.c:1285 +msgid "Not a valid email address\n" +msgstr "Nu este o adresã de email validã\n" + +#: g10/keygen.c:1293 +msgid "Comment: " +msgstr "Comentariu: " + +#: g10/keygen.c:1299 +msgid "Invalid character in comment\n" +msgstr "Caracter invalid în comentariu\n" + +#: g10/keygen.c:1322 +#, c-format +msgid "You are using the `%s' character set.\n" +msgstr "Folosiþi setul de caractere `%s'\n" + +#: g10/keygen.c:1328 +#, c-format +msgid "" +"You selected this USER-ID:\n" +" \"%s\"\n" +"\n" +msgstr "" +"Aþi selectat acest ID-UTILIZATOR:\n" +" \"%s\"\n" +"\n" + +#: g10/keygen.c:1334 +msgid "Please don't put the email address into the real name or the comment\n" +msgstr "Vã rugãm nu puneþi adresa de email în numele real sau comentariu\n" + +#: g10/keygen.c:1339 +msgid "NnCcEeOoQq" +msgstr "NnCcEeOoTt" + +#: g10/keygen.c:1349 +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:1350 +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:1369 +msgid "Please correct the error first\n" +msgstr "Vã rugãm corectaþi mai întâi eroarea\n" + +#: g10/keygen.c:1408 +msgid "" +"You need a Passphrase to protect your secret key.\n" +"\n" +msgstr "" +"Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n" +"\n" + +#: g10/keygen.c:1417 g10/keyedit.c:864 +msgid "passphrase not correctly repeated; try again" +msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" + +#: g10/keygen.c:1418 +#, c-format +msgid "%s.\n" +msgstr "%s.\n" + +#: g10/keygen.c:1424 +msgid "" +"You don't want a passphrase - this is probably a *bad* idea!\n" +"I will do it anyway. You can change your passphrase at any time,\n" +"using this program with the option \"--edit-key\".\n" +"\n" +msgstr "" +"Nu aveþi nevoie de o frazã-parolã - aceasta este probabil o idee *proastã*!\n" +"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:1445 +msgid "" +"We need to generate a lot of random bytes. It is a good idea to perform\n" +"some other action (type on the keyboard, move the mouse, utilize the\n" +"disks) during the prime generation; this gives the random number\n" +"generator a better chance to gain enough entropy.\n" +msgstr "" +"Trebuie sã generãm o grãmadã de octeþi aleatori. Este o idee bunã sã faceþi\n" +"altceva (tastaþi la tastaturã, miºcaþi mausul, utilizaþi discurile)\n" +"î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:2010 +msgid "DSA keypair will have 1024 bits.\n" +msgstr "Perechea de chei DSA va avea 1024 biþi.\n" + +#: g10/keygen.c:2074 +msgid "Key generation canceled.\n" +msgstr "Generarea cheii a fost anulatã.\n" + +#: g10/keygen.c:2181 g10/keygen.c:2269 +#, c-format +msgid "writing public key to `%s'\n" +msgstr "scriu cheia publicã în `%s'\n" + +#: g10/keygen.c:2182 g10/keygen.c:2271 +#, c-format +msgid "writing secret key to `%s'\n" +msgstr "scriu cheia secretã în `%s'\n" + +#: g10/keygen.c:2258 +#, 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:2264 +#, 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:2278 +#, c-format +msgid "error writing public keyring `%s': %s\n" +msgstr "eroare la scrierea inelului de chei public `%s': %s\n" + +#: g10/keygen.c:2285 +#, c-format +msgid "error writing secret keyring `%s': %s\n" +msgstr "eroare la scrierea inelului de chei secret `%s': %s\n" + +#: g10/keygen.c:2305 +msgid "public and secret key created and signed.\n" +msgstr "cheile secretã ºi publicã au fost create ºi semnate.\n" + +#: g10/keygen.c:2306 +msgid "key marked as ultimately trusted.\n" +msgstr "cheie marcatã ca având încredere supremã.\n" + +#: g10/keygen.c:2317 +msgid "" +"Note that this key cannot be used for encryption. You may want to use\n" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" +msgstr "" +"De notat cã aceastã cheie nu poate fi folositã pentru cifrare. Poate " +"doriþi\n" +"sã folosiþi comanda \"--edit-key\" pentru a genera o cheie secundarã pentru\n" +"acest scop.\n" + +#: g10/keygen.c:2329 g10/keygen.c:2448 +#, c-format +msgid "Key generation failed: %s\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/keygen.c:2375 g10/sign.c:261 +#, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"cheia a fost creatã %lu secundã în viitor (warp în timp sau probleme cu " +"ceasul)\n" + +#: g10/keygen.c:2377 g10/sign.c:263 +#, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"cheia a fost creatã %lu secunde în viitor (warp în timp sau probleme cu " +"ceasul)\n" + +#: g10/keygen.c:2386 +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:2415 +msgid "Really create? " +msgstr "Creaþi într-adevãr? " + +#: g10/decrypt.c:96 g10/encode.c:775 +msgid "--output doesn't work for this command\n" +msgstr "--output nu merge pentru aceastã comandã\n" + +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 +#: g10/openfile.c:316 +#, c-format +msgid "%s: can't open: %s\n" +msgstr "%s: nu pot deschide: %s\n" + +#: g10/encode.c:209 g10/sign.c:1055 +#, c-format +msgid "error creating passphrase: %s\n" +msgstr "eroare la crearea frazei-parolã: %s\n" + +#: g10/encode.c:214 +msgid "can't use a symmetric ESK packet due to the S2K mode\n" +msgstr "nu pot crea un pachet ESK simetric datoritã modului S2K\n" + +#: g10/encode.c:233 g10/encode.c:497 +#, c-format +msgid "`%s' already compressed\n" +msgstr "`%s' deja compresat\n" + +#: g10/encode.c:302 g10/encode.c:534 +#, c-format +msgid "%s: WARNING: empty file\n" +msgstr "%s: AVERTISMENT: fiºier gol\n" + +#: g10/encode.c:417 +msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" +msgstr "" +"în modul --pgp2 puteþi cifra numai cu chei RSA de 2048 biþi sau mai puþin\n" + +#: g10/encode.c:432 +#, c-format +msgid "reading from `%s'\n" +msgstr "citesc din `%s'\n" + +#: g10/encode.c:468 +msgid "" +"unable to use the IDEA cipher for all of the keys you are encrypting to.\n" +msgstr "" +"nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifraþi.\n" + +#: g10/encode.c:478 g10/encode.c:662 +#, c-format +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:576 g10/sign.c:770 +#, c-format +msgid "forcing compression algorithm %s (%d) violates recipient preferences\n" +msgstr "" +"forþând algoritmul de compresie %s (%d) violaþi preferinþele destinatarului\n" + +#: g10/encode.c:721 +#, 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" + +#: g10/encode.c:748 +#, c-format +msgid "%s/%s encrypted for: \"%s\"\n" +msgstr "%s/%s cifrat pentru: \"%s\"\n" + +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 +#, c-format +msgid "key `%s' not found: %s\n" +msgstr "cheia `%s' nu a fost gãsitã: %s\n" + +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#, c-format +msgid "error reading keyblock: %s\n" +msgstr "eroare la citire keyblock: %s\n" + +#: g10/export.c:189 +#, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "cheia %08lX: nu e o cheie rfc2440 - sãritã\n" + +#: g10/export.c:205 +#, c-format +msgid "key %08lX: not protected - skipped\n" +msgstr "cheia %08lX: nu e protejatã - sãritã\n" + +#: g10/export.c:213 +#, c-format +msgid "key %08lX: PGP 2.x style key - skipped\n" +msgstr "cheia %08lX: cheie stil PGP 2.x - sãritã\n" + +#. I hope this warning doesn't confuse people. +#: g10/export.c:284 +#, c-format +msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" +msgstr "AVERTISMENT: cheia secretã %08lX nu are un checksum SK simplu\n" + +#: g10/export.c:310 +msgid "WARNING: nothing exported\n" +msgstr "AVERTISMENT: nimic exportat\n" + +#: g10/getkey.c:151 +msgid "too many entries in pk cache - disabled\n" +msgstr "prea multe intrãri în cache-ul pk - deactivat\n" + +#. fixme: returning translatable constants instead of a user ID is +#. * not good because they are probably not utf-8 encoded. +#: g10/getkey.c:187 g10/getkey.c:2584 +msgid "[User id not found]" +msgstr "[ID utilizator nu a fost gãsit]" + +#: g10/getkey.c:1578 +#, c-format +msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" +msgstr "Cheia invalidã %08lX fãcutã validã de --allow-non-selfsigned-uid\n" + +#: g10/getkey.c:2072 +#, c-format +msgid "no secret subkey for public subkey %08lX - ignoring\n" +msgstr "nici o subcheie secretã pentru subcheia publicã %08lX - ignoratã\n" + +#: g10/getkey.c:2300 +#, c-format +msgid "using secondary key %08lX instead of primary key %08lX\n" +msgstr "folosim cheia secundarã %08lX în loc de cheia primarã %08lX\n" + +#: g10/getkey.c:2347 +#, c-format +msgid "key %08lX: secret key without public key - skipped\n" +msgstr "cheia %08lX: cheie secretã fãrã cheie publicã - sãritã\n" + +#: g10/import.c:227 +#, c-format +msgid "skipping block of type %d\n" +msgstr "bloc de tip %d sãrit\n" + +#: g10/import.c:236 +#, c-format +msgid "%lu keys so far processed\n" +msgstr "%lu chei procesate pânã acum\n" + +#: g10/import.c:241 +#, c-format +msgid "error reading `%s': %s\n" +msgstr "eroare la citire `%s': %s\n" + +#: g10/import.c:253 +#, c-format +msgid "Total number processed: %lu\n" +msgstr "Numãr total procesate: %lu\n" + +#: g10/import.c:255 +#, c-format +msgid " skipped new keys: %lu\n" +msgstr " chei noi sãrite: %lu\n" + +#: g10/import.c:258 +#, c-format +msgid " w/o user IDs: %lu\n" +msgstr " fãrã ID-uri utilizator: %lu\n" + +#: g10/import.c:260 +#, c-format +msgid " imported: %lu" +msgstr " importate: %lu" + +#: g10/import.c:266 +#, c-format +msgid " unchanged: %lu\n" +msgstr " neschimbate: %lu\n" + +#: g10/import.c:268 +#, c-format +msgid " new user IDs: %lu\n" +msgstr " noi ID-uri utilizator: %lu\n" + +#: g10/import.c:270 +#, c-format +msgid " new subkeys: %lu\n" +msgstr " noi subchei: %lu\n" + +#: g10/import.c:272 +#, c-format +msgid " new signatures: %lu\n" +msgstr " noi semnãturi: %lu\n" + +#: g10/import.c:274 +#, c-format +msgid " new key revocations: %lu\n" +msgstr " noi revocãri de chei: %lu\n" + +#: g10/import.c:276 +#, c-format +msgid " secret keys read: %lu\n" +msgstr " chei secrete citite: %lu\n" + +#: g10/import.c:278 +#, c-format +msgid " secret keys imported: %lu\n" +msgstr " chei secrete importate: %lu\n" + +#: g10/import.c:280 +#, c-format +msgid " secret keys unchanged: %lu\n" +msgstr "chei secrete neschimbate: %lu\n" + +#: g10/import.c:282 +#, c-format +msgid " not imported: %lu\n" +msgstr " ne importate: %lu\n" + +#: g10/import.c:551 +msgid "" +"NOTE: Elgamal primary key detected - this may take some time to import\n" +msgstr "" +"NOTÃ: cheie primarã Elgamal detectatã - poate lua ceva timp pentru a " +"importa\n" + +#: g10/import.c:565 g10/import.c:826 +#, c-format +msgid "key %08lX: no user ID\n" +msgstr "cheia %08lX: nici un ID utilizator\n" + +#: g10/import.c:587 +#, c-format +msgid "key %08lX: HKP subkey corruption repaired\n" +msgstr "cheia %08lX: subcheia HPK coruptã a fost reparatã\n" + +#: g10/import.c:602 +#, c-format +msgid "key %08lX: accepted non self-signed user ID '%s'\n" +msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n" + +#: g10/import.c:608 +#, c-format +msgid "key %08lX: no valid user IDs\n" +msgstr "cheia %08lX: nici un ID utilizator valid\n" + +#: g10/import.c:610 +msgid "this may be caused by a missing self-signature\n" +msgstr "aceasta poate fi cauzatã de o auto-semnãturã ce lipseºte\n" + +#: g10/import.c:619 g10/import.c:906 +#, c-format +msgid "key %08lX: public key not found: %s\n" +msgstr "cheia %08lX: cheia publicã nu a fost gãsitã: %s\n" + +#: g10/import.c:624 +#, c-format +msgid "key %08lX: new key - skipped\n" +msgstr "cheia %08lX: cheie nouã - sãritã\n" + +#: g10/import.c:634 +#, c-format +msgid "no writable keyring found: %s\n" +msgstr "n-am gãsit nici un inel de chei ce poate fi scris: %s\n" + +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 +#, c-format +msgid "writing to `%s'\n" +msgstr "scriu în `%s'\n" + +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 +#, c-format +msgid "error writing keyring `%s': %s\n" +msgstr "eroare la scrierea inelului de chei `%s': %s\n" + +#: g10/import.c:659 +#, c-format +msgid "key %08lX: public key \"%s\" imported\n" +msgstr "cheia %08lX: cheia publicã \"%s\" importatã\n" + +#: g10/import.c:681 +#, c-format +msgid "key %08lX: doesn't match our copy\n" +msgstr "cheia %08lX: nu se potriveºte cu copia noastrã\n" + +#: g10/import.c:698 g10/import.c:923 +#, c-format +msgid "key %08lX: can't locate original keyblock: %s\n" +msgstr "cheia %08lX: nu pot gãsi keyblock-ul original: %s\n" + +#: g10/import.c:705 g10/import.c:929 +#, c-format +msgid "key %08lX: can't read original keyblock: %s\n" +msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n" + +#: g10/import.c:736 +#, c-format +msgid "key %08lX: \"%s\" 1 new user ID\n" +msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n" + +#: g10/import.c:739 +#, c-format +msgid "key %08lX: \"%s\" %d new user IDs\n" +msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n" + +#: g10/import.c:742 +#, c-format +msgid "key %08lX: \"%s\" 1 new signature\n" +msgstr "cheia %08lX: \"%s\" 1 nouã semnãturã\n" + +#: g10/import.c:745 +#, c-format +msgid "key %08lX: \"%s\" %d new signatures\n" +msgstr "cheia %08lX: \"%s\" %d noi semnãturi\n" + +#: g10/import.c:748 +#, c-format +msgid "key %08lX: \"%s\" 1 new subkey\n" +msgstr "key %08lX: \"%s\" 1 nouã subcheie\n" + +#: g10/import.c:751 +#, c-format +msgid "key %08lX: \"%s\" %d new subkeys\n" +msgstr "key %08lX: \"%s\" %d noi subchei\n" + +#: g10/import.c:770 +#, c-format +msgid "key %08lX: \"%s\" not changed\n" +msgstr "key %08lX: \"%s\" nu a fost schimbatã\n" + +#: g10/import.c:832 +#, c-format +msgid "key %08lX: secret key with invalid cipher %d - skipped\n" +msgstr "key %08lX: cheie secretã cu cifru invalid %d - sãritã\n" + +#: g10/import.c:847 +#, c-format +msgid "no default secret keyring: %s\n" +msgstr "nici un inel de chei secret implicit: %s\n" + +#: g10/import.c:858 +#, c-format +msgid "key %08lX: secret key imported\n" +msgstr "cheia %08lX: cheie secretã importatã\n" + +#. we can't merge secret keys +#: g10/import.c:864 +#, c-format +msgid "key %08lX: already in secret keyring\n" +msgstr "cheia %08lX: deja în inelul de chei secret\n" + +#: g10/import.c:871 +#, c-format +msgid "key %08lX: secret key not found: %s\n" +msgstr "cheia %08lX: cheia secretã nu a fost gãsitã: %s\n" + +#: g10/import.c:900 +#, c-format +msgid "key %08lX: no public key - can't apply revocation certificate\n" +msgstr "" +"cheia %08lX: nici o cheie publicã - nu pot aplica certificatul de revocare\n" + +#: g10/import.c:940 +#, c-format +msgid "key %08lX: invalid revocation certificate: %s - rejected\n" +msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n" + +#: g10/import.c:972 +#, c-format +msgid "key %08lX: \"%s\" revocation certificate imported\n" +msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n" + +#: g10/import.c:1035 +#, c-format +msgid "key %08lX: no user ID for signature\n" +msgstr "cheia %08lX: nici un ID utilizator pentru semnãturã\n" + +#: g10/import.c:1050 +#, c-format +msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" +msgstr "" +"cheia %08lX: algoritm cu cheie publicã nesuportat pentru ID-ul utilizator \"%" +"s\"\n" + +#: g10/import.c:1052 +#, c-format +msgid "key %08lX: invalid self-signature on user id \"%s\"\n" +msgstr "cheia %08lX: auto-semnãturã invalidã pentru ID-ul utilizator \"%s\"\n" + +#: g10/import.c:1069 +#, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "cheia %08lX: nici o subcheie legatã de cheie\n" + +#: g10/import.c:1078 g10/import.c:1122 +#, c-format +msgid "key %08lX: unsupported public key algorithm\n" +msgstr "cheia %08lX: algoritm cu cheie publicã nesuportat\n" + +#: g10/import.c:1079 +#, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "cheia %08lX: legãturã subcheie invalidã\n" + +#: g10/import.c:1092 +#, c-format +msgid "key %08lX: removed multiple subkey binding\n" +msgstr "cheia %08lX: am ºters multiple legãturi de subchei\n" + +#: g10/import.c:1113 +#, c-format +msgid "key %08lX: no subkey for key revocation\n" +msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n" + +#: g10/import.c:1123 +#, c-format +msgid "key %08lX: invalid subkey revocation\n" +msgstr "cheia %08lX: revocare de subcheie invalidã\n" + +#: g10/import.c:1136 +#, c-format +msgid "key %08lX: removed multiple subkey revocation\n" +msgstr "cheia %08lX: am ºters multiple revocãri de subcheie\n" + +#: g10/import.c:1173 +#, c-format +msgid "key %08lX: skipped user ID '" +msgstr "cheia %08lX: am sãrit ID-ul utilizator '" + +#: g10/import.c:1196 +#, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "cheia %08lX: am sãrit subcheia\n" + +#: g10/import.c:1223 +#, c-format +msgid "key %08lX: non exportable signature (class %02x) - skipped\n" +msgstr "cheia %08lX: semnãtura nu poate fi exportatã (clasa %02x) - sãritã\n" + +#: g10/import.c:1232 +#, c-format +msgid "key %08lX: revocation certificate at wrong place - skipped\n" +msgstr "cheia %08lX: certificat de revocare într-un loc greºit - sãrit\n" + +#: g10/import.c:1249 +#, c-format +msgid "key %08lX: invalid revocation certificate: %s - skipped\n" +msgstr "cheia %08lX: certificat de revocare invalid: %s - sãrit\n" + +#: g10/import.c:1262 +#, c-format +msgid "key %08lX: subkey signature in wrong place - skipped\n" +msgstr "cheia %08lX: semnãturã subcheie într-un loc greºit - sãritã\n" + +#: g10/import.c:1270 +#, c-format +msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" +msgstr "cheia %08lX: clasã de semnãturã neaºteptatã (0x%02X) - sãritã\n" + +#: g10/import.c:1369 +#, c-format +msgid "key %08lX: duplicated user ID detected - merged\n" +msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n" + +#: g10/import.c:1428 +#, c-format +msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" +msgstr "" +"AVERTISMENT: cheia %08lX poate fi revocatã: aduc revocarea cheii %08lX\n" + +#: g10/import.c:1442 +#, c-format +msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" +msgstr "" +"AVERTISMENT: cheia %08lX poate fi revocatã: cheia de revocare %08lX nu este " +"prezentã.\n" + +#: g10/import.c:1500 +#, c-format +msgid "key %08lX: \"%s\" revocation certificate added\n" +msgstr "cheia %08lX: am adãugat certificatul de revocare \"%s\"\n" + +#: g10/import.c:1533 +#, c-format +msgid "key %08lX: direct key signature added\n" +msgstr "cheia %08lX: am adãugat semnãtura de cheie directã\n" + +#: g10/keyedit.c:149 +msgid "[revocation]" +msgstr "[revocare]" + +#: g10/keyedit.c:150 +msgid "[self-signature]" +msgstr "[auto-semnãturã]" + +#: g10/keyedit.c:221 g10/keylist.c:169 +msgid "1 bad signature\n" +msgstr "1 semnãturã incorectã\n" + +#: g10/keyedit.c:223 g10/keylist.c:171 +#, c-format +msgid "%d bad signatures\n" +msgstr "%d semnãturi incorecte\n" + +#: g10/keyedit.c:225 g10/keylist.c:173 +msgid "1 signature not checked due to a missing key\n" +msgstr "1 semnãturã nu a fost verificatã din cauza unei chei lipsã\n" + +#: g10/keyedit.c:227 g10/keylist.c:175 +#, c-format +msgid "%d signatures not checked due to missing keys\n" +msgstr "%d semnãturi nu au fost verificate din cauza unor chei lipsã\n" + +#: g10/keyedit.c:229 g10/keylist.c:177 +msgid "1 signature not checked due to an error\n" +msgstr "1 semnãturã nu a fost verificatã din cauza unei erori\n" + +#: g10/keyedit.c:231 g10/keylist.c:179 +#, c-format +msgid "%d signatures not checked due to errors\n" +msgstr "%d semnãturi nu au fost verificate din cauza unor erori\n" + +#: g10/keyedit.c:233 +msgid "1 user ID without valid self-signature detected\n" +msgstr "am gãsit 1 ID utilizator fãrã auto-semnãturã validã\n" + +#: g10/keyedit.c:235 +#, c-format +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:362 +#, c-format +msgid "User ID \"%s\" is revoked." +msgstr "ID utilizator \"%s\" a fost revocat." + +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 +msgid "Are you sure you still want to sign it? (y/N) " +msgstr "Sunteþi sigur(ã) cã doriþi sã ºtergeþi permanent \"%s\"? (d/N)" + +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 +msgid " Unable to sign.\n" +msgstr " Nu pot semna.\n" + +#: g10/keyedit.c:382 +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "ID utilizator \"%s\" a fost revocat." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." +msgstr "AVERISMENT: ID-ul utilizator \"%s\" nu este auto-semnat.\n" + +#: g10/keyedit.c:437 +#, c-format +msgid "" +"The self-signature on \"%s\"\n" +"is a PGP 2.x-style signature.\n" +msgstr "" +"Auto-semnãtura pe \"%s\"\n" +"este o semnãturã stil PGP 2.x.\n" + +#: g10/keyedit.c:446 +msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " +msgstr "Doriþi sã o promovaþi la o auto-semnãturã OpenPGP? (d/N) " + +#: g10/keyedit.c:460 +#, c-format +msgid "" +"Your current signature on \"%s\"\n" +"has expired.\n" +msgstr "" +"Semnãtura d-voastrã curentã pe \"%s\"\n" +"a expirat.\n" + +#: g10/keyedit.c:464 +msgid "Do you want to issue a new signature to replace the expired one? (y/N) " +msgstr "" +"Doriþi sã creaþi o nouã semnãturã pentru a o înlocui pe cea expiratã? (d/N) " + +#. It's a local sig, and we want to make a +#. exportable sig. +#: g10/keyedit.c:485 +#, c-format +msgid "" +"Your current signature on \"%s\"\n" +"is a local signature.\n" +msgstr "" +"Semnãtura d-voastrã curentã pe \"%s\"\n" +"semnãturã localã.\n" + +#: g10/keyedit.c:489 +msgid "Do you want to promote it to a full exportable signature? (y/N) " +msgstr "Doriþi sã o promovaþi la o semnãturã total exportabilã? (d/N) " + +#: g10/keyedit.c:510 +#, c-format +msgid "\"%s\" was already locally signed by key %08lX\n" +msgstr "\"%s\" a fost deja semnatã local de cheia %08lX\n" + +#: g10/keyedit.c:514 +#, c-format +msgid "\"%s\" was already signed by key %08lX\n" +msgstr "\"%s\" a fost deja semnatã de cheia %08lX\n" + +#: g10/keyedit.c:519 +msgid "Do you want to sign it again anyway? (y/N) " +msgstr "Doriþi sã o semnaþi oricum din nou? (d/N) " + +#: g10/keyedit.c:539 +#, c-format +msgid "Nothing to sign with key %08lX\n" +msgstr "Nimic de semnat cu cheia %08lX\n" + +#: g10/keyedit.c:554 +msgid "This key has expired!" +msgstr "Aceastã cheie a expirat!" + +#: g10/keyedit.c:574 +#, c-format +msgid "This key is due to expire on %s.\n" +msgstr "Aceastã cheie va expira pe %s.\n" + +#: g10/keyedit.c:578 +msgid "Do you want your signature to expire at the same time? (Y/n) " +msgstr "Doriþi ca semnãtura d-voastrã sã expire în acelaºi timp? (D/n) " + +#: g10/keyedit.c:611 +msgid "" +"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " +"mode.\n" +msgstr "" +"Nu puteþi crea o semnãturã OpenPGP pe o cheie PGP 2.x câtã vreme sunteþi în " +"modul --pgp2.\n" + +#: g10/keyedit.c:613 +msgid "This would make the key unusable in PGP 2.x.\n" +msgstr "Aceasta va face cheia de nefolosit în PGP 2.x.\n" + +#: g10/keyedit.c:636 +msgid "" +"How carefully have you verified the key you are about to sign actually " +"belongs\n" +"to the person named above? If you don't know what to answer, enter \"0\".\n" +msgstr "" +"Cât de atent aþi verificat cã cheia pe care sunteþi pe cale a o semna " +"aparþine\n" +"într-adevãr persoanei numite deasupra? Dacã nu ºtiþi ce sã rãspundeþi,\n" +"introduceþi \"0\".\n" + +#: g10/keyedit.c:640 +#, c-format +msgid " (0) I will not answer.%s\n" +msgstr " (0) Nu voi rãspunde.%s\n" + +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 +msgid " (default)" +msgstr "(implicit)" + +#: g10/keyedit.c:642 +#, c-format +msgid " (1) I have not checked at all.%s\n" +msgstr " (1) Nu am verificat deloc.%s\n" + +#: g10/keyedit.c:644 +#, c-format +msgid " (2) I have done casual checking.%s\n" +msgstr " (2) Am fãcut ceva verificãri superficiale.%s\n" + +#: g10/keyedit.c:646 +#, c-format +msgid " (3) I have done very careful checking.%s\n" +msgstr " (3) Am fãcut verificãri foarte atente.%s\n" + +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 +msgid "" +"Are you really sure that you want to sign this key\n" +"with your key: \"" +msgstr "" +"Sunteþi într-adevãr sigur(ã) cã doriþi sã semnaþi\n" +"aceastã cheie cu cheia d-voastrã: \"" + +#: g10/keyedit.c:681 +msgid "" +"\n" +"This will be a self-signature.\n" +msgstr "" +"\n" +"Aceasta va fi o auto-semnãturã.\n" + +#: g10/keyedit.c:685 +msgid "" +"\n" +"WARNING: the signature will not be marked as non-exportable.\n" +msgstr "" +"\n" +"AVERTISMENT: semnãtura nu va fi marcatã ca non-exportabilã.\n" + +#: g10/keyedit.c:690 +msgid "" +"\n" +"WARNING: the signature will not be marked as non-revocable.\n" +msgstr "" +"\n" +"AVERTISMENT: semnãtura nu va fi marcatã ca non-revocabilã.\n" + +#: g10/keyedit.c:697 +msgid "" +"\n" +"The signature will be marked as non-exportable.\n" +msgstr "" +"\n" +"Semnãtura va fi marcatã ca non-exportabilã.\n" + +#: g10/keyedit.c:701 +msgid "" +"\n" +"The signature will be marked as non-revocable.\n" +msgstr "" +"\n" +"Semnãtura va fi marcatã ca non-revocabilã.\n" + +#: g10/keyedit.c:706 +msgid "" +"\n" +"I have not checked this key at all.\n" +msgstr "" +"\n" +"Nu am verificat aceastã cheie deloc.\n" + +#: g10/keyedit.c:710 +msgid "" +"\n" +"I have checked this key casually.\n" +msgstr "" +"\n" +"Am verificat aceastã cheie superficial.\n" + +#: g10/keyedit.c:714 +msgid "" +"\n" +"I have checked this key very carefully.\n" +msgstr "" +"\n" +"Am verificat aceastã cheie foarte atent.\n" + +#: g10/keyedit.c:723 +msgid "Really sign? " +msgstr "Doriþi cu adevãrat sã semnaþi?" + +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 +#: g10/sign.c:312 +#, c-format +msgid "signing failed: %s\n" +msgstr "semnarea a eºuat: %s\n" + +#: g10/keyedit.c:821 +msgid "This key is not protected.\n" +msgstr "Aceastã cheie nu este protejatã.\n" + +#: g10/keyedit.c:825 +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:829 +msgid "Key is protected.\n" +msgstr "Cheia este protejatã.\n" + +#: g10/keyedit.c:849 +#, c-format +msgid "Can't edit this key: %s\n" +msgstr "Nu pot edita aceastã cheie: %s\n" + +#: g10/keyedit.c:855 +msgid "" +"Enter the new passphrase for this secret key.\n" +"\n" +msgstr "" +"Introduceþi noua frazã-parolã pentru acestã cheie secretã.\n" +"\n" + +#: g10/keyedit.c:869 +msgid "" +"You don't want a passphrase - this is probably a *bad* idea!\n" +"\n" +msgstr "" +"Nu doriþi o frazã-parolã - aceasta este probabil o idee *proastã*!\n" +"\n" + +#: g10/keyedit.c:872 +msgid "Do you really want to do this? " +msgstr "Doriþi într-adevãr sã faceþi acest lucru?" + +#: g10/keyedit.c:936 +msgid "moving a key signature to the correct place\n" +msgstr "mut o semnãturã de cheie în locul corect\n" + +#: g10/keyedit.c:978 +msgid "quit this menu" +msgstr "ieºi din acest meniu" + +#: g10/keyedit.c:979 +msgid "q" +msgstr "t" + +#: g10/keyedit.c:980 +msgid "save" +msgstr "salveazã" + +#: g10/keyedit.c:980 +msgid "save and quit" +msgstr "salveazã ºi terminã" + +#: g10/keyedit.c:981 +msgid "help" +msgstr "ajutor" + +#: g10/keyedit.c:981 +msgid "show this help" +msgstr "afiºeazã acest mesaj" + +#: g10/keyedit.c:983 +msgid "fpr" +msgstr "ampr" + +#: g10/keyedit.c:983 +msgid "show fingerprint" +msgstr "afiºeazã amprenta" + +#: g10/keyedit.c:984 +msgid "list" +msgstr "enumerã" + +#: g10/keyedit.c:984 +msgid "list key and user IDs" +msgstr "enumerã chei ºi ID-uri utilizator" + +#: g10/keyedit.c:985 +msgid "l" +msgstr "l" + +#: g10/keyedit.c:986 +msgid "uid" +msgstr "uid" + +#: g10/keyedit.c:986 +msgid "select user ID N" +msgstr "selecteazã ID utilizator N" + +#: g10/keyedit.c:987 +msgid "key" +msgstr "cheie" + +#: g10/keyedit.c:987 +msgid "select secondary key N" +msgstr "selecteazã cheie secundarã N" + +#: g10/keyedit.c:988 +msgid "check" +msgstr "verificã" + +#: g10/keyedit.c:988 +msgid "list signatures" +msgstr "enumerã semnãturi" + +#: g10/keyedit.c:989 +msgid "c" +msgstr "c" + +#: g10/keyedit.c:990 +msgid "sign" +msgstr "semneazã" + +#: g10/keyedit.c:990 +msgid "sign the key" +msgstr "semneazã cheia" + +#: g10/keyedit.c:991 +msgid "s" +msgstr "s" + +#: g10/keyedit.c:992 +msgid "lsign" +msgstr "semloc" + +#: g10/keyedit.c:992 +msgid "sign the key locally" +msgstr "semneazã cheia local" + +#: g10/keyedit.c:993 +msgid "nrsign" +msgstr "semirev" + +#: g10/keyedit.c:993 +msgid "sign the key non-revocably" +msgstr "semneazã cheia irevocabil" + +#: g10/keyedit.c:994 +msgid "nrlsign" +msgstr "semlirev" + +#: g10/keyedit.c:994 +msgid "sign the key locally and non-revocably" +msgstr "semneazã cheia local ºi irevocabil" + +#: g10/keyedit.c:995 +msgid "debug" +msgstr "depanare" + +#: g10/keyedit.c:996 +msgid "adduid" +msgstr "adauid" + +#: g10/keyedit.c:996 +msgid "add a user ID" +msgstr "adaugã un ID utilizator" + +#: g10/keyedit.c:997 +msgid "addphoto" +msgstr "adapoza" + +#: g10/keyedit.c:997 +msgid "add a photo ID" +msgstr "adaugã o pozã ID" + +#: g10/keyedit.c:998 +msgid "deluid" +msgstr "steuid" + +#: g10/keyedit.c:998 +msgid "delete user ID" +msgstr "ºterge ID utilizator" + +#. delphoto is really deluid in disguise +#: g10/keyedit.c:1000 +msgid "delphoto" +msgstr "stepoza" + +#: g10/keyedit.c:1001 +msgid "addkey" +msgstr "adacheie" + +#: g10/keyedit.c:1001 +msgid "add a secondary key" +msgstr "adaugã o cheie secundarã" + +#: g10/keyedit.c:1002 +msgid "delkey" +msgstr "stecheie" + +#: g10/keyedit.c:1002 +msgid "delete a secondary key" +msgstr "ºterge o cheie secundarã" + +#: g10/keyedit.c:1003 +msgid "addrevoker" +msgstr "adarev" + +#: g10/keyedit.c:1003 +msgid "add a revocation key" +msgstr "adaugã o cheie de revocare" + +#: g10/keyedit.c:1004 +msgid "delsig" +msgstr "stesem" + +#: g10/keyedit.c:1004 +msgid "delete signatures" +msgstr "ºterge semnãturi" + +#: g10/keyedit.c:1005 +msgid "expire" +msgstr "expira" + +#: g10/keyedit.c:1005 +msgid "change the expire date" +msgstr "schimbã data de expirare" + +#: g10/keyedit.c:1006 +msgid "primary" +msgstr "primar" + +#: g10/keyedit.c:1006 +msgid "flag user ID as primary" +msgstr "marcheazã ID-ul utilizator ca primar" + +#: g10/keyedit.c:1007 +msgid "toggle" +msgstr "comuta" + +#: g10/keyedit.c:1007 +msgid "toggle between secret and public key listing" +msgstr "comutã între listele de chei secrete ºi publice" + +#: g10/keyedit.c:1009 +msgid "t" +msgstr "t" + +#: g10/keyedit.c:1010 +msgid "pref" +msgstr "pref" + +#: g10/keyedit.c:1010 +msgid "list preferences (expert)" +msgstr "enumerã preferinþele (expert)" + +#: g10/keyedit.c:1011 +msgid "showpref" +msgstr "afispref" + +#: g10/keyedit.c:1011 +msgid "list preferences (verbose)" +msgstr "afiºeazã preferinþele (detaliat)" + +#: g10/keyedit.c:1012 +msgid "setpref" +msgstr "setpref" + +#: g10/keyedit.c:1012 +msgid "set preference list" +msgstr "seteazã lista de preferinþe" + +#: g10/keyedit.c:1013 +msgid "updpref" +msgstr "actpref" + +#: g10/keyedit.c:1013 +msgid "updated preferences" +msgstr "preferinþe actualizate" + +#: g10/keyedit.c:1014 +msgid "passwd" +msgstr "parola" + +#: g10/keyedit.c:1014 +msgid "change the passphrase" +msgstr "schimbã fraza-parolã" + +#: g10/keyedit.c:1015 +msgid "trust" +msgstr "incred" + +#: g10/keyedit.c:1015 +msgid "change the ownertrust" +msgstr "schimbã încrederea pentru proprietar" + +#: g10/keyedit.c:1016 +msgid "revsig" +msgstr "revsem" + +#: g10/keyedit.c:1016 +msgid "revoke signatures" +msgstr "revocã semnãturi" + +#: g10/keyedit.c:1017 +msgid "revuid" +msgstr "revuid" + +#: g10/keyedit.c:1017 +msgid "revoke a user ID" +msgstr "revocã un ID utilizator" + +#: g10/keyedit.c:1018 +msgid "revkey" +msgstr "revcheie" + +#: g10/keyedit.c:1018 +msgid "revoke a secondary key" +msgstr "revocã o cheie secundarã" + +#: g10/keyedit.c:1019 +msgid "disable" +msgstr "deact" + +#: g10/keyedit.c:1019 +msgid "disable a key" +msgstr "deactiveazã o cheie" + +#: g10/keyedit.c:1020 +msgid "enable" +msgstr "activ" + +#: g10/keyedit.c:1020 +msgid "enable a key" +msgstr "activeazã o cheie" + +#: g10/keyedit.c:1021 +msgid "showphoto" +msgstr "afispoza" + +#: g10/keyedit.c:1021 +msgid "show photo ID" +msgstr "aratã o pozã ID" + +#: g10/keyedit.c:1041 g10/delkey.c:119 +msgid "can't do that in batchmode\n" +msgstr "nu pot face acest lucru în modul batch\n" + +#: g10/keyedit.c:1079 +#, c-format +msgid "error reading secret keyblock `%s': %s\n" +msgstr "eroare la citire keyblock secret `%s': %s\n" + +#: g10/keyedit.c:1097 +msgid "Secret key is available.\n" +msgstr "Cheia secretã este disponibilã.\n" + +#: g10/keyedit.c:1128 +msgid "Command> " +msgstr "Comandã> " + +#: g10/keyedit.c:1160 +msgid "Need the secret key to do this.\n" +msgstr "Aveþi nevoie de cheia secretã pentru a face aceasta.\n" + +#: g10/keyedit.c:1164 +msgid "Please use the command \"toggle\" first.\n" +msgstr "Vã rugãm folosiþi mai întâi comanda \"toggle\".\n" + +#: g10/keyedit.c:1213 +msgid "Key is revoked." +msgstr "Cheia este revocatã." + +#: g10/keyedit.c:1232 +msgid "Really sign all user IDs? " +msgstr "Semnaþi într-adevãr toate ID-urile utilizator? " + +#: g10/keyedit.c:1233 +msgid "Hint: Select the user IDs to sign\n" +msgstr "Sugestie: Selectaþi ID-ul utilizator de semnat\n" + +#: g10/keyedit.c:1258 +#, c-format +msgid "This command is not allowed while in %s mode.\n" +msgstr "Aceastã comandã nu este permisã în modul %s.\n" + +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 +msgid "You must select at least one user ID.\n" +msgstr "Trebuie mai întâi sã selectaþi cel puþin un ID utilizator.\n" + +#: g10/keyedit.c:1280 +msgid "You can't delete the last user ID!\n" +msgstr "Nu puteþi ºterge ultimul ID utilizator!\n" + +#: g10/keyedit.c:1283 +msgid "Really remove all selected user IDs? " +msgstr "ªtergeþi într-adevãr toate ID-urile utilizator selectate? " + +#: g10/keyedit.c:1284 +msgid "Really remove this user ID? " +msgstr "ªtergeþi într-adevãr acest ID utilizator? " + +#: g10/keyedit.c:1322 g10/keyedit.c:1378 +msgid "You must select at least one key.\n" +msgstr "Trebuie sã selectaþi cel puþin o cheie.\n" + +#: g10/keyedit.c:1326 +msgid "Do you really want to delete the selected keys? " +msgstr "Doriþi într-adevãr sã ºtergeþi cheile selectate? " + +#: g10/keyedit.c:1327 +msgid "Do you really want to delete this key? " +msgstr "Doriþi într-adevãr sã ºtergeþi aceastã cheie? " + +#: g10/keyedit.c:1362 +msgid "Really revoke all selected user IDs? " +msgstr "Doriþi într-adevãr sã revocaþi toate ID-urile utilizator selectate? " + +#: g10/keyedit.c:1363 +msgid "Really revoke this user ID? " +msgstr "Doriþi într-adevãr sã revocaþi acest ID utilizator? " + +#: g10/keyedit.c:1382 +msgid "Do you really want to revoke the selected keys? " +msgstr "Doriþi într-adevãr sã revocaþi cheile selectate? " + +#: g10/keyedit.c:1383 +msgid "Do you really want to revoke this key? " +msgstr "Doriþi într-adevãr sã revocaþi aceastã cheie? " + +#: g10/keyedit.c:1452 +msgid "Really update the preferences for the selected user IDs? " +msgstr "" +"Doriþi într-adevãr sã actualizaþi preferinþele pentru ID-urile utilizator " +"selectate? " + +#: g10/keyedit.c:1454 +msgid "Really update the preferences? " +msgstr "Doriþi într-adevãr sã actualizaþi preferinþele? " + +#: g10/keyedit.c:1492 +msgid "Save changes? " +msgstr "Salvaþi schimbãrile? " + +#: g10/keyedit.c:1495 +msgid "Quit without saving? " +msgstr "Terminaþi fãrã a salva? " + +#: g10/keyedit.c:1506 +#, c-format +msgid "update failed: %s\n" +msgstr "actualizarea a eºuat: %s\n" + +#: g10/keyedit.c:1513 +#, c-format +msgid "update secret failed: %s\n" +msgstr "actualizarea secretului a eºuat: %s\n" + +#: g10/keyedit.c:1520 +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:1532 +msgid "Invalid command (try \"help\")\n" +msgstr "Comandã invalidã (încercaþi \"ajutor\")\n" + +#: g10/keyedit.c:1591 +msgid "Digest: " +msgstr "Rezumat: " + +#: g10/keyedit.c:1643 +msgid "Features: " +msgstr "Capabilitãþi: " + +#: g10/keyedit.c:1880 +#, c-format +msgid "This key may be revoked by %s key " +msgstr "Aceastã cheie poate fi revocatã de cheia %s " + +#: g10/keyedit.c:1884 +msgid " (sensitive)" +msgstr " (senzitiv)" + +#. Note, we use the same format string as in other show +#. functions to make the translation job easier. +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 +#, c-format +msgid "%s%c %4u%c/%08lX created: %s expires: %s" +msgstr "%s%c %4u%c/%08lX creatã: %s expirã: %s" + +#: g10/keyedit.c:1899 +#, c-format +msgid " trust: %c/%c" +msgstr " încredere: %c/%c" + +#: g10/keyedit.c:1903 +msgid "This key has been disabled" +msgstr "Aceastã cheie a fost deactivatã" + +#: g10/keyedit.c:1932 +#, c-format +msgid "rev! subkey has been revoked: %s\n" +msgstr "rev! subcheia a fost revocatã: %s\n" + +#: g10/keyedit.c:1935 +msgid "rev- faked revocation found\n" +msgstr "rev- a fost gãsitã o revocare falsificatã\n" + +#: g10/keyedit.c:1937 +#, c-format +msgid "rev? problem checking revocation: %s\n" +msgstr "rev? probleme la verificare revocãrii: %s\n" + +#: g10/keyedit.c:1957 +msgid "[revoked] " +msgstr "[revocatã] " + +#: g10/keyedit.c:1959 +msgid "[expired] " +msgstr "[expiratã] " + +#: g10/keyedit.c:1967 +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:1975 +msgid "" +"Please note that the shown key validity is not necessarily correct\n" +"unless you restart the program.\n" +msgstr "" +"Vã rugãm observaþi cã validitatea cheii arãtate nu este în mod necesar\n" +"corectã dacã nu reporniþi programul.\n" + +#: g10/keyedit.c:2107 +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:2166 +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 "" +"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:2171 g10/keyedit.c:2444 +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:2177 +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:2312 +msgid "Delete this good signature? (y/N/q)" +msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)" + +#: g10/keyedit.c:2322 +msgid "Delete this invalid signature? (y/N/q)" +msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)" + +#: g10/keyedit.c:2326 +msgid "Delete this unknown signature? (y/N/q)" +msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)" + +#: g10/keyedit.c:2332 +msgid "Really delete this self-signature? (y/N)" +msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)" + +#: g10/keyedit.c:2346 +#, c-format +msgid "Deleted %d signature.\n" +msgstr "Am ºters %d semnãturã.\n" + +#: g10/keyedit.c:2347 +#, c-format +msgid "Deleted %d signatures.\n" +msgstr "Am ºters %d semnãturi.\n" + +#: g10/keyedit.c:2350 +msgid "Nothing deleted.\n" +msgstr "Nu am ºters nimic.\n" + +#: g10/keyedit.c:2439 +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 "" +"AVERTISMENT: Aceasta este o cheie stil PGP 2.x. Adãugarea unui " +"revocator desemnat poate face ca unele versiuni de PGP sã respingã " +"cheia.\n" + +#: g10/keyedit.c:2450 +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:2473 +msgid "Enter the user ID of the designated revoker: " +msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: " + +#: g10/keyedit.c:2488 +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" + +#. 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:2498 +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:2517 +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:2523 +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 revocator " +"desemnat? (d/N): " + +#: g10/keyedit.c:2588 +msgid "Please remove selections from the secret keys.\n" +msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n" + +#: g10/keyedit.c:2594 +msgid "Please select at most one secondary key.\n" +msgstr "Vã rugãm selectaþi cel mult o cheie secundarã.\n" + +#: g10/keyedit.c:2598 +msgid "Changing expiration time for a secondary key.\n" +msgstr "Schimbarea timpului de expirare pentru o cheie secundarã.\n" + +#: g10/keyedit.c:2600 +msgid "Changing expiration time for the primary key.\n" +msgstr "Schimbarea timpului de expirare pentru o cheie primarã.\n" + +#: g10/keyedit.c:2645 +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:2661 +msgid "No corresponding signature in secret ring\n" +msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n" + +#: g10/keyedit.c:2741 +msgid "Please select exactly one user ID.\n" +msgstr "Vã rugãm selectaþi exact un ID utilizator.\n" + +#: g10/keyedit.c:2778 g10/keyedit.c:2887 +#, c-format +msgid "skipping v3 self-signature on user id \"%s\"\n" +msgstr "auto-semnãturi v3 sãrite pentru ID-ul utilizator \"%s\"\n" + +#: g10/keyedit.c:2947 +#, c-format +msgid "No user ID with index %d\n" +msgstr "Nici un ID utilizator cu indicele %d\n" + +#: g10/keyedit.c:2993 +#, c-format +msgid "No secondary key with index %d\n" +msgstr "Nici o cheie secundarã cu indicele %d\n" + +#: g10/keyedit.c:3107 +msgid "user ID: \"" +msgstr "ID utilizator: \"" + +#: g10/keyedit.c:3112 +#, c-format +msgid "" +"\"\n" +"signed with your key %08lX at %s\n" +msgstr "" +"\"\n" +"semnatã cu cheie d-voastrã %08lX la %s\n" + +#: g10/keyedit.c:3115 +#, c-format +msgid "" +"\"\n" +"locally signed with your key %08lX at %s\n" +msgstr "" +"\"\n" +"semnatã local cu cheie d-voastrã %08lX la %s\n" + +#: g10/keyedit.c:3120 +#, c-format +msgid "This signature expired on %s.\n" +msgstr "Aceastã semnãturã a expirat pe %s.\n" + +#: g10/keyedit.c:3124 +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:3128 +msgid "Create a revocation certificate for this signature? (y/N) " +msgstr "Creaþi un certificat de revocare pentru aceastã semnãturã? (d/N) " + +#. FIXME: detect duplicates here +#: g10/keyedit.c:3153 +msgid "You have signed these user IDs:\n" +msgstr "Aþi semnat aceste ID-uri utilizator:\n" + +#: g10/keyedit.c:3172 +#, c-format +msgid " signed by %08lX at %s%s%s\n" +msgstr " semnatã de %08lX la %s%s%s\n" + +#: g10/keyedit.c:3180 +#, c-format +msgid " revoked by %08lX at %s\n" +msgstr " revocat de %08lX la %s\n" + +#: g10/keyedit.c:3200 +msgid "You are about to revoke these signatures:\n" +msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n" + +#: g10/keyedit.c:3210 +#, c-format +msgid " signed by %08lX at %s%s\n" +msgstr " semnatã de %08lX la %s%s\n" + +#: g10/keyedit.c:3212 +msgid " (non-exportable)" +msgstr " (non-exportabilã)" + +#: g10/keyedit.c:3219 +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:3249 +msgid "no secret key\n" +msgstr "nici o cheie secretã\n" + +#: g10/keyedit.c:3319 +#, c-format +msgid "user ID \"%s\" is already revoked\n" +msgstr "ID-ul utilizator \"%s\" este deja revocat\n" + +#. Okay, this is a problem. The user ID selfsig was +#. created in the future, so we need to warn the user and +#. set our revocation timestamp one second after that so +#. everything comes out clean. +#: g10/keyedit.c:3336 +#, 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:3509 +#, c-format +msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" +msgstr "Afiºez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n" + +#: g10/keylist.c:112 +msgid "Critical signature policy: " +msgstr "Politicã de semnãturi criticã: " + +#: g10/keylist.c:114 +msgid "Signature policy: " +msgstr "Politicã de semnãturi: " + +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 +msgid "WARNING: invalid notation data found\n" +msgstr "AVERTISMENT: am gãsit date de notare invalide\n" + +#: g10/keylist.c:148 +msgid "Critical signature notation: " +msgstr "Notare semnãturã criticã: " + +#: g10/keylist.c:150 +msgid "Signature notation: " +msgstr "Notare semnãturã: " + +#: g10/keylist.c:157 +msgid "not human readable" +msgstr "ilizibil" + +#: g10/keylist.c:250 +msgid "Keyring" +msgstr "Inel de chei" + +#. of subkey +#: g10/keylist.c:527 g10/mainproc.c:902 +#, c-format +msgid " [expires: %s]" +msgstr " [expirã: %s]" + +#: g10/keylist.c:1049 +msgid "Primary key fingerprint:" +msgstr "Amprentã cheie primarã:" + +#: g10/keylist.c:1051 +msgid " Subkey fingerprint:" +msgstr " Amprentã subcheie:" + +#: g10/keylist.c:1058 +msgid " Primary key fingerprint:" +msgstr " Amprentã cheie primarã:" + +#: g10/keylist.c:1060 +msgid " Subkey fingerprint:" +msgstr " Amprentã subcheie:" + +#. use tty +#: g10/keylist.c:1064 g10/keylist.c:1068 +msgid " Key fingerprint =" +msgstr " Amprentã cheie =" + +#: g10/mainproc.c:248 +#, c-format +msgid "weird size for an encrypted session key (%d)\n" +msgstr "dimensiune ciudatã pentru o cheie de sesiune cifratã (%d)\n" + +#: g10/mainproc.c:259 +#, c-format +msgid "invalid symkey algorithm detected (%d)\n" +msgstr "am detectat un algoritm symkey invalid (%d)\n" + +#: g10/mainproc.c:288 g10/encr-data.c:66 +#, c-format +msgid "%s encrypted data\n" +msgstr "%s date cifrate\n" + +#: g10/mainproc.c:290 g10/encr-data.c:68 +#, c-format +msgid "encrypted with unknown algorithm %d\n" +msgstr "cifrat cu un algoritm necunoscut %d\n" + +#: g10/mainproc.c:318 +#, c-format +msgid "public key is %08lX\n" +msgstr "cheia publicã este %08lX\n" + +#: g10/mainproc.c:364 +msgid "public key encrypted data: good DEK\n" +msgstr "date cigrate cu cheie publicã: DEK bun\n" + +#: g10/mainproc.c:416 +#, c-format +msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" +msgstr "cifrat cu cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s\n" + +#: g10/mainproc.c:426 +#, c-format +msgid "encrypted with %s key, ID %08lX\n" +msgstr "cifrat cu cheia %s, ID %08lX\n" + +#: g10/mainproc.c:440 +#, c-format +msgid "public key decryption failed: %s\n" +msgstr "decriptarea cu cheie publicã a eºuat: %s\n" + +#: g10/mainproc.c:467 g10/mainproc.c:486 +#, c-format +msgid "assuming %s encrypted data\n" +msgstr "presupunem date cifrate %s\n" + +#: g10/mainproc.c:474 +#, c-format +msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" +msgstr "cifru IDEA indisponibil, vom încerca sã folosim %s în loc\n" + +#: g10/mainproc.c:504 +msgid "decryption okay\n" +msgstr "decriptare OK\n" + +#: g10/mainproc.c:508 +msgid "WARNING: message was not integrity protected\n" +msgstr "AVERTISMENT: mesajul nu a avut integritatea protejatã\n" + +#: g10/mainproc.c:511 +msgid "WARNING: encrypted message has been manipulated!\n" +msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n" + +#: g10/mainproc.c:517 +#, c-format +msgid "decryption failed: %s\n" +msgstr "decriptarea a eºuat: %s\n" + +#: g10/mainproc.c:536 +msgid "NOTE: sender requested \"for-your-eyes-only\"\n" +msgstr "NOTÃ: expeditorul a cerut \"doar-pentru-ochii-d-voastrã\"\n" + +#: g10/mainproc.c:538 +#, c-format +msgid "original file name='%.*s'\n" +msgstr "nume fiºier original='%.*s'\n" + +#: g10/mainproc.c:710 +msgid "standalone revocation - use \"gpg --import\" to apply\n" +msgstr "revocare standalone - folosiþi \"gpg --import\" pentru a aplica\n" + +#: g10/mainproc.c:778 +msgid "Notation: " +msgstr "Notaþie:" + +#: g10/mainproc.c:790 +msgid "Policy: " +msgstr "Politica: " + +#: g10/mainproc.c:1245 +msgid "signature verification suppressed\n" +msgstr "verificare semnãturã eliminatã\n" + +#. plaintext before signatures but no one-pass packets +#: g10/mainproc.c:1287 g10/mainproc.c:1297 +msgid "can't handle these multiple signatures\n" +msgstr "nu pot mânui aceste semnãturi multiple\n" + +#: g10/mainproc.c:1306 +#, c-format +msgid "Signature made %.*s using %s key ID %08lX\n" +msgstr "Semnãtura a fãcut %.*s folosind cheia %s ID %08lX\n" + +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Nici un ajutor disponibil" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 +msgid "BAD signature from \"" +msgstr "Semnãturã INCORECTà din \"" + +#: g10/mainproc.c:1379 g10/mainproc.c:1412 +msgid "Expired signature from \"" +msgstr "Semnãturã expiratã din \"" + +#: g10/mainproc.c:1380 g10/mainproc.c:1413 +msgid "Good signature from \"" +msgstr "Semnãturã bunã din \"" + +#: g10/mainproc.c:1415 +msgid "[uncertain]" +msgstr "[nesigur]" + +#: g10/mainproc.c:1514 +#, c-format +msgid "Signature expired %s\n" +msgstr "Semnãturã expiratã %s\n" + +#: g10/mainproc.c:1519 +#, c-format +msgid "Signature expires %s\n" +msgstr "Semnãtura expirã %s\n" + +#: g10/mainproc.c:1522 +#, c-format +msgid "%s signature, digest algorithm %s\n" +msgstr "semnãturã %s, algoritm rezumat %s\n" + +#: g10/mainproc.c:1523 +msgid "binary" +msgstr "binar" + +#: g10/mainproc.c:1524 +msgid "textmode" +msgstr "modtext" + +#: g10/mainproc.c:1524 +msgid "unknown" +msgstr "necunoscut" + +#: g10/mainproc.c:1544 +#, c-format +msgid "Can't check signature: %s\n" +msgstr "Nu pot verifica semnãtura: %s\n" + +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 +msgid "not a detached signature\n" +msgstr "nu o semnãturã detaºatã\n" + +#: g10/mainproc.c:1656 +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:1664 +#, c-format +msgid "standalone signature of class 0x%02x\n" +msgstr "semnãturã standalone de clasã 0x%02x\n" + +#: g10/mainproc.c:1721 +msgid "old style (PGP 2.x) signature\n" +msgstr "semnãturã de stil vechi (PGP 2.x)\n" + +#: g10/mainproc.c:1731 +msgid "invalid root packet detected in proc_tree()\n" +msgstr "pachet root invalid detectat în proc_tree()\n" + +#: g10/misc.c:98 +#, c-format +msgid "can't disable core dumps: %s\n" +msgstr "nu pot deactiva generarea fiºierelor core: %s\n" + +#: g10/misc.c:162 +msgid "Experimental algorithms should not be used!\n" +msgstr "Algoritme experimentale nu ar trebui folosite!\n" + +#: g10/misc.c:192 +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +msgstr "" +"acest algoritm de cifrare este învechit; vã rugãm folosiþi unul standard!\n" + +#: g10/misc.c:300 +msgid "the IDEA cipher plugin is not present\n" +msgstr "plugin-ul cu cifrul IDEA nu este prezent\n" + +#: g10/misc.c:301 +msgid "" +"please see http://www.gnupg.org/why-not-idea.html for more information\n" +msgstr "" +"vedeþi http://www.gnupg.org/why-not-idea.html pentru informaþii " +"suplimentare\n" + +#: g10/misc.c:533 +#, c-format +msgid "%s:%d: deprecated option \"%s\"\n" +msgstr "%s:%d: opþiune învechitã \"%s\"\n" + +#: g10/misc.c:537 +#, c-format +msgid "WARNING: \"%s\" is a deprecated option\n" +msgstr "AVERTISMENT: \"%s\" este o opþiune învechitã\n" + +#: g10/misc.c:539 +#, c-format +msgid "please use \"%s%s\" instead\n" +msgstr "vã rugãm folosiþi \"%s%s\" în loc\n" + +#: g10/misc.c:617 +#, 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/parse-packet.c:121 +#, c-format +msgid "can't handle public key algorithm %d\n" +msgstr "nu pot mânui algoritmul cu cheie publicã %d\n" + +#: g10/parse-packet.c:1083 +#, c-format +msgid "subpacket of type %d has critical bit set\n" +msgstr "subpachetul de tip %d are bitul critic setat\n" + +#: g10/passphrase.c:459 g10/passphrase.c:506 +msgid "gpg-agent is not available in this session\n" +msgstr "gpg-agent nu este disponibil în aceastã sesiune\n" + +#: g10/passphrase.c:467 +msgid "can't set client pid for the agent\n" +msgstr "nu pot seta pid-ul client pentru agent\n" + +#: g10/passphrase.c:475 +msgid "can't get server read FD for the agent\n" +msgstr "nu pot convinge serverul sã citeascã FD pentru agent\n" + +#: g10/passphrase.c:482 +msgid "can't get server write FD for the agent\n" +msgstr "nu pot convinge serverul sã scrie FD pentru agent\n" + +#: g10/passphrase.c:515 +msgid "malformed GPG_AGENT_INFO environment variable\n" +msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n" + +#: g10/passphrase.c:528 +#, c-format +msgid "gpg-agent protocol version %d is not supported\n" +msgstr "gpg-agent versiune protocol %d nu este suportat\n" + +#: g10/passphrase.c:549 g10/hkp.c:155 +#, c-format +msgid "can't connect to `%s': %s\n" +msgstr "nu mã pot conecta la `%s': %s\n" + +#: g10/passphrase.c:571 +msgid "communication problem with gpg-agent\n" +msgstr "probleme de comunicare cu gpg-agent\n" + +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +msgid "problem with the agent - disabling agent use\n" +msgstr "problemã cu agentul - deactivez folosirea agentului\n" + +#: g10/passphrase.c:680 g10/passphrase.c:1098 +#, c-format +msgid " (main key ID %08lX)" +msgstr " (ID cheie principalã %08lX)" + +#: g10/passphrase.c:690 +#, c-format +msgid "" +"You need a passphrase to unlock the secret key for user:\n" +"\"%.*s\"\n" +"%u-bit %s key, ID %08lX, created %s%s\n" +msgstr "" +"Aveþi nevoie de o frazã-parolã pentru a descuia cheia secretã pentru " +"utilizator:\n" +"\"%.*s\"\n" +"%u-bit cheia %s, ID %08lX, creatã %s%s\n" + +#: g10/passphrase.c:712 +msgid "Repeat passphrase\n" +msgstr "Repetaþi fraza-parolã\n" + +#: g10/passphrase.c:714 +msgid "Enter passphrase\n" +msgstr "Introduceþi fraza-parolã\n" + +#: g10/passphrase.c:752 +msgid "passphrase too long\n" +msgstr "frazã-parolã prea lungã\n" + +#: g10/passphrase.c:765 +msgid "invalid response from agent\n" +msgstr "rãspuns invalid de la agent\n" + +#: g10/passphrase.c:780 g10/passphrase.c:873 +msgid "cancelled by user\n" +msgstr "anulatã de utilizator\n" + +#: g10/passphrase.c:785 g10/passphrase.c:963 +#, c-format +msgid "problem with the agent: agent returns 0x%lx\n" +msgstr "problemã cu agentul: agentul returneazã 0x%lx\n" + +#: g10/passphrase.c:1084 +msgid "" +"\n" +"You need a passphrase to unlock the secret key for\n" +"user: \"" +msgstr "" +"\n" +"Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n" +"secretã pentru utilizator: \"" + +#: g10/passphrase.c:1093 +#, c-format +msgid "%u-bit %s key, ID %08lX, created %s" +msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s" + +#: g10/passphrase.c:1145 +msgid "can't query password in batchmode\n" +msgstr "nu pot cere parola în modul batch\n" + +#: g10/passphrase.c:1149 +msgid "Enter passphrase: " +msgstr "Introduceþi fraza-parolã: " + +#: g10/passphrase.c:1153 +msgid "Repeat passphrase: " +msgstr "Repetaþi fraza-parolã: " + +#: g10/plaintext.c:67 +msgid "data not saved; use option \"--output\" to save it\n" +msgstr "" +"datele nu au fost salvate: folosiþi opþiunea \"--output\" pentru a le salva\n" + +#: g10/plaintext.c:108 +#, c-format +msgid "error creating `%s': %s\n" +msgstr "eroare la creearea `%s': %s\n" + +#: g10/plaintext.c:339 +msgid "Detached signature.\n" +msgstr "Semnãturã detaºatã.\n" + +#: g10/plaintext.c:343 +msgid "Please enter name of data file: " +msgstr "Vã rugãm introduceþi numele fiºierului de date: " + +#: g10/plaintext.c:364 +msgid "reading stdin ...\n" +msgstr "citesc stdin ...\n" + +#: g10/plaintext.c:398 +msgid "no signed data\n" +msgstr "nici o datã semnatã\n" + +#: g10/plaintext.c:406 +#, c-format +msgid "can't open signed data `%s'\n" +msgstr "nu pot deschide date semnate `%s'\n" + +#: g10/pubkey-enc.c:101 +#, c-format +msgid "anonymous recipient; trying secret key %08lX ...\n" +msgstr "destinator anonim; încerc cheia secretã %08lX ...\n" + +#: g10/pubkey-enc.c:107 +msgid "okay, we are the anonymous recipient.\n" +msgstr "OK, noi suntem destinatarul anonim.\n" + +#: g10/pubkey-enc.c:159 +msgid "old encoding of the DEK is not supported\n" +msgstr "vechea encodare a lui DEK nu este suportatã\n" + +#: g10/pubkey-enc.c:178 +#, c-format +msgid "cipher algorithm %d%s is unknown or disabled\n" +msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n" + +#: g10/pubkey-enc.c:221 +#, c-format +msgid "NOTE: cipher algorithm %d not found in preferences\n" +msgstr "NOTÃ: algoritm cifrare %d nu a fost gãsit în preferinþe\n" + +#: g10/pubkey-enc.c:243 +#, c-format +msgid "NOTE: secret key %08lX expired at %s\n" +msgstr "NOTÃ: cheia secretã %08lX a expirat la %s\n" + +#: g10/pubkey-enc.c:249 +msgid "NOTE: key has been revoked" +msgstr "NOTÃ: cheia a fost revocatã" + +#: g10/hkp.c:71 +#, c-format +msgid "requesting key %08lX from %s\n" +msgstr "cer cheia %08lX de la %s\n" + +#: g10/hkp.c:98 +#, c-format +msgid "can't get key from keyserver: %s\n" +msgstr "nu pot obþine cheia de la serverul de chei: %s\n" + +#: g10/hkp.c:179 +#, c-format +msgid "error sending to `%s': %s\n" +msgstr "eroare trimitere la `%s': %s\n" + +#: g10/hkp.c:194 +#, c-format +msgid "success sending to `%s' (status=%u)\n" +msgstr "succes trimitere la `%s' (stare=%u)\n" + +#: g10/hkp.c:197 +#, c-format +msgid "failed sending to `%s': status=%u\n" +msgstr "a eºuat trimiterea la `%s': stare=%u\n" + +#: g10/hkp.c:369 +msgid "this keyserver does not support --search-keys\n" +msgstr "" + +#: g10/hkp.c:519 +#, c-format +msgid "searching for \"%s\" from HKP server %s\n" +msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" + +#: g10/hkp.c:571 +#, c-format +msgid "can't search keyserver: %s\n" +msgstr "nu pot cãuta serverul de chei: %s\n" + +#: g10/seckey-cert.c:53 +msgid "secret key parts are not available\n" +msgstr "pãrþi ale cheii secrete nu sunt disponibile\n" + +#: g10/seckey-cert.c:59 +#, c-format +msgid "protection algorithm %d%s is not supported\n" +msgstr "algoritm de protecþie %d%s nu este suportat\n" + +#: g10/seckey-cert.c:233 +msgid "Invalid passphrase; please try again" +msgstr "Frazã-parolã invalidã; vã rugãm mai încercaþi o datã" + +#: g10/seckey-cert.c:234 +#, c-format +msgid "%s ...\n" +msgstr "%s ...\n" + +#: g10/seckey-cert.c:291 +msgid "WARNING: Weak key detected - please change passphrase again.\n" +msgstr "" +"AVERTISMENT: Cheie slabã detectatã - vã rugãm schimbaþi din nou fraza-" +"parolã.\n" + +#: g10/seckey-cert.c:329 +msgid "generating the deprecated 16-bit checksum for secret key protection\n" +msgstr "generez învechitul checksum de 16-bit pentru protecþia cheii secrete\n" + +#: g10/sig-check.c:70 +msgid "WARNING: signature digest conflict in message\n" +msgstr "AVERTISMENT: conflict pentru rezumat semnãturã în mesaj\n" + +#: g10/sig-check.c:215 +#, c-format +msgid "" +"key %08lX: this is a PGP generated ElGamal key which is NOT secure for " +"signatures!\n" +msgstr "" +"cheie %08lX: aceasta este o cheie ElGamal generatã de PGP care NU este " +"sigurã pentru semnãturi!\n" + +#: g10/sig-check.c:224 +#, c-format +msgid "public key %08lX is %lu second newer than the signature\n" +msgstr "cheie publicã %08lX este mai nouã cu %lu secundã decât semnãtura\n" + +#: g10/sig-check.c:225 +#, c-format +msgid "public key %08lX is %lu seconds newer than the signature\n" +msgstr "cheie publicã %08lX este mai nouã cu %lu secunde decât semnãtura\n" + +#: g10/sig-check.c:234 +#, c-format +msgid "" +"key %08lX has been created %lu second in future (time warp or clock " +"problem)\n" +msgstr "" +"cheia %08lX a fost creatã %lu secundã în viitor (warp în timp sau probleme " +"cu ceasul)\n" + +#: g10/sig-check.c:236 +#, c-format +msgid "" +"key %08lX has been created %lu seconds in future (time warp or clock " +"problem)\n" +msgstr "" +"cheia %08lX a fost creatã %lu secunde în viitor (warp în timp sau probleme " +"cu ceasul)\n" + +#: g10/sig-check.c:249 +#, c-format +msgid "NOTE: signature key %08lX expired %s\n" +msgstr "NOTÃ: cheia semnãturii %08lX a expirat %s\n" + +#: g10/sig-check.c:352 +#, c-format +msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" +msgstr "" +"presupun semnãturã incorectã din cheia %08lX datoritã unui bit critic " +"necunoscut\n" + +#: g10/sig-check.c:562 +#, c-format +msgid "key %08lX: no subkey for subkey revocation packet\n" +msgstr "cheia %08lX: nici o subcheie pentru pachetul de revocare a subcheii\n" + +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "cheia %08lX: nici o subcheie legatã de cheie\n" + +#: g10/sign.c:84 +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" + +#: g10/sign.c:92 +msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" +msgstr "nu pot pune date notare în semnãturi de chei v3 (stil PGP 2.x)\n" + +#: g10/sign.c:111 +#, c-format +msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" +msgstr "" +"AVERTISMENT: nu pot %%-expanda notarea (prea mare). Folosesc neexpandat.\n" + +#: g10/sign.c:137 +msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" +msgstr "nu pot pune un URL de politicã în semnãturi v3 (stil PGP 2.x)\n" + +#: g10/sign.c:145 +msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" +msgstr "" +"nu pot pune un URL de politicã în semnãturi de chei v3 (stil PGP 2.x)\n" + +#: g10/sign.c:158 +#, c-format +msgid "" +"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" +msgstr "" +"AVERTISMENT: nu pot %%-expanda url-ul de politicã (prea mare). Folosesc " +"neexpandat.\n" + +#: g10/sign.c:307 +#, c-format +msgid "checking created signature failed: %s\n" +msgstr "verificarea semnãturii create a eºuat: %s\n" + +#: g10/sign.c:316 +#, c-format +msgid "%s signature from: \"%s\"\n" +msgstr "%s semnãturã de la: \"%s\"\n" + +#: g10/sign.c:465 +#, c-format +msgid "WARNING: `%s' is an empty file\n" +msgstr "AVERTISMENT: `%s' este un fiºier gol\n" + +#: g10/sign.c:648 +msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" +msgstr "puteþi semna-dataºat cu chei stil PGP 2.x numai în modul --pgp2\n" + +#: g10/sign.c:672 g10/sign.c:911 +#, c-format +msgid "can't create %s: %s\n" +msgstr "nu pot crea %s: %s\n" + +#: g10/sign.c:701 +#, c-format +msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" +msgstr "" +"forþarea algoritmului rezumat %s (%d) violeazã preferinþele destinatarului\n" + +#: g10/sign.c:796 +msgid "signing:" +msgstr "semnare:" + +#: g10/sign.c:895 +msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" +msgstr "puteþi semna-în-clar cu chei stil PGP 2.x în modul --pgp2\n" + +#: g10/sign.c:1049 +#, c-format +msgid "%s encryption will be used\n" +msgstr "va fi folositã cifrarea %s\n" + +#: g10/textfilter.c:134 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "nu pot mânui linii de text mai lungi de %d caractere\n" + +#: g10/textfilter.c:231 +#, c-format +msgid "input line longer than %d characters\n" +msgstr "linii de intrare mai lungi de %d caractere\n" + +#: g10/tdbio.c:128 g10/tdbio.c:1411 +#, c-format +msgid "trustdb rec %lu: lseek failed: %s\n" +msgstr "trustdb rec %lu: lseek a eºuat: %s\n" + +#: g10/tdbio.c:134 g10/tdbio.c:1418 +#, c-format +msgid "trustdb rec %lu: write failed (n=%d): %s\n" +msgstr "trustdb rec %lu: scrierea a eºuat (n=%d): %s\n" + +#: g10/tdbio.c:244 +msgid "trustdb transaction too large\n" +msgstr "tranzacþia trustdb prea mare\n" + +#: g10/tdbio.c:471 +#, c-format +msgid "%s: can't access: %s\n" +msgstr "%s: nu pot accesa: %s\n" + +#: g10/tdbio.c:486 +#, c-format +msgid "%s: directory does not exist!\n" +msgstr "%s: directorul nu existã!\n" + +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 +#, c-format +msgid "%s: can't create lock\n" +msgstr "%s: nu pot crea încuietoare(lock)\n" + +#: g10/tdbio.c:498 g10/tdbio.c:560 +#, c-format +msgid "%s: can't make lock\n" +msgstr "%s: nu pot crea încuietoare(lock)\n" + +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 +#, c-format +msgid "%s: can't create: %s\n" +msgstr "%s: nu pot crea: %s\n" + +#: g10/tdbio.c:519 +#, c-format +msgid "%s: failed to create version record: %s" +msgstr "%s: am eºuat sã creez înregistrare versiune: %s" + +#: g10/tdbio.c:523 +#, c-format +msgid "%s: invalid trustdb created\n" +msgstr "%s: a fost creat trustdb invalid\n" + +#: g10/tdbio.c:526 +#, c-format +msgid "%s: trustdb created\n" +msgstr "%s: a fost creat trustdb\n" + +#: g10/tdbio.c:566 +msgid "NOTE: trustdb not writable\n" +msgstr "NOTÃ: nu poate fi scris în trustdb\n" + +#: g10/tdbio.c:582 +#, c-format +msgid "%s: invalid trustdb\n" +msgstr "%s: trustdb invalid\n" + +#: g10/tdbio.c:614 +#, c-format +msgid "%s: failed to create hashtable: %s\n" +msgstr "%s: am eºuat sã creez hashtable: %s\n" + +#: g10/tdbio.c:622 +#, c-format +msgid "%s: error updating version record: %s\n" +msgstr "%s: eroare actualizare înregistrare versiune: %s\n" + +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 +#, c-format +msgid "%s: error reading version record: %s\n" +msgstr "%s: eroare citire înregistrare versiune: %s\n" + +#: g10/tdbio.c:651 g10/tdbio.c:703 +#, c-format +msgid "%s: error writing version record: %s\n" +msgstr "%s: eroare scriere înregistrare versiune: %s\n" + +#: g10/tdbio.c:1142 +#, c-format +msgid "trustdb: lseek failed: %s\n" +msgstr "trustdb: lseek a eºuat: %s\n" + +#: g10/tdbio.c:1150 +#, c-format +msgid "trustdb: read failed (n=%d): %s\n" +msgstr "trustdb: citirea a eºuat (n=%d): %s\n" + +#: g10/tdbio.c:1171 +#, c-format +msgid "%s: not a trustdb file\n" +msgstr "%s: nu e un fiºier trustdb\n" + +#: g10/tdbio.c:1189 +#, c-format +msgid "%s: version record with recnum %lu\n" +msgstr "%s: înregistrare versiune cu recnum %lu\n" + +#: g10/tdbio.c:1194 +#, c-format +msgid "%s: invalid file version %d\n" +msgstr "%s: versiune fiºier invalidã %d\n" + +#: g10/tdbio.c:1377 +#, c-format +msgid "%s: error reading free record: %s\n" +msgstr "%s: eroare citire înregistrare liberã: %s\n" + +#: g10/tdbio.c:1385 +#, c-format +msgid "%s: error writing dir record: %s\n" +msgstr "%s: eroare scriere înregistrare dir: %s\n" + +#: g10/tdbio.c:1395 +#, 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:1425 +#, 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:1470 +msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n" + +#: g10/trustdb.c:201 +#, c-format +msgid "`%s' is not a valid long keyID\n" +msgstr "`%s' nu este un ID-cheie de lungime validã\n" + +#: g10/trustdb.c:236 +#, c-format +msgid "key %08lX: accepted as trusted key\n" +msgstr "cheia %08lX: acceptatã ca cheie validã\n" + +#: g10/trustdb.c:274 +#, c-format +msgid "key %08lX occurs more than once in the trustdb\n" +msgstr "cheia %08lX apare de mai multe ori în trustdb\n" + +#: g10/trustdb.c:289 +#, c-format +msgid "key %08lX: no public key for trusted key - skipped\n" +msgstr "cheia %08lX: nici o cheie publicã pentru cheia de încredere - sãritã\n" + +#: g10/trustdb.c:298 +#, c-format +msgid "key %08lX marked as ultimately trusted\n" +msgstr "cheia %08lX marcatã ca având încredere supremã\n" + +#: g10/trustdb.c:324 +#, c-format +msgid "trust record %lu, req type %d: read failed: %s\n" +msgstr "înregistrare încredere %lu, tip req %d: citirea a eºuat: %s\n" + +#: g10/trustdb.c:330 +#, c-format +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:345 g10/tdbdump.c:59 +#, c-format +msgid "trust record %lu, type %d: write failed: %s\n" +msgstr "înregistrare încredere %lu, tip %d: scrierea a eºuat: %s\n" + +#: g10/trustdb.c:360 g10/tdbdump.c:217 +#, c-format +msgid "trustdb: sync failed: %s\n" +msgstr "trustdb: sincronizarea a eºuat: %s\n" + +#: g10/trustdb.c:459 +msgid "no need for a trustdb check\n" +msgstr "nu e nevoie de o verificare pentru trustdb\n" + +#: g10/trustdb.c:465 g10/trustdb.c:1795 +#, c-format +msgid "next trustdb check due at %s\n" +msgstr "urmãtoarea verificare pentru trustdb programatã pe %s\n" + +#: g10/trustdb.c:835 +msgid "please do a --check-trustdb\n" +msgstr "vã rugãm faceþi un --check-trustdb\n" + +#: g10/trustdb.c:839 +msgid "checking the trustdb\n" +msgstr "verific trustdb\n" + +#: g10/trustdb.c:1045 +#, c-format +msgid "public key %08lX not found: %s\n" +msgstr "cheia publicã %08lX nu a fost gãsitã: %s\n" + +#: g10/trustdb.c:1589 +#, 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:1643 +msgid "no ultimately trusted keys found\n" +msgstr "nu am gãsit nici o cheie cu încredere supremã\n" + +#: g10/trustdb.c:1661 +#, c-format +msgid "public key of ultimately trusted key %08lX not found\n" +msgstr "cheia publicã a cheii cu încredere supremã %08lX nu a fost gãsitã\n" + +#. This should be valid=%d now, but I'm not changing it so I +#. don't break the translated strings in the stable branch. +#. Change it in devel. -dms +#: g10/trustdb.c:1736 +#, c-format +msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" +msgstr "verificare la nivel %d semnat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" + +#: g10/verify.c:110 +msgid "" +"the signature could not be verified.\n" +"Please remember that the signature file (.sig or .asc)\n" +"should be the first file given on the command line.\n" +msgstr "" +"semnãtura nu a putut fi verificatã.\n" +"Vã rugãm amintiþi-vã cã fiºierul de semnãturã (.sig sau .asc)\n" +"ar trebui sã fie primul dat în linia de comandã.\n" + +#: g10/verify.c:177 +#, c-format +msgid "input line %u too long or missing LF\n" +msgstr "linia de intrare %u prea lungã sau lipseºte LF\n" + +#: g10/skclist.c:129 g10/skclist.c:185 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "cheia nu este marcatã ca sigurã - nu o pot folosi cu GNA falsificat!\n" + +#: g10/skclist.c:157 +#, c-format +msgid "skipped `%s': duplicated\n" +msgstr "sãritã `%s': duplicatã\n" + +#: g10/skclist.c:164 g10/skclist.c:172 +#, c-format +msgid "skipped `%s': %s\n" +msgstr "sãritã `%s': %s\n" + +#: g10/skclist.c:168 +msgid "skipped: secret key already present\n" +msgstr "sãritã: cheia secretã deja prezentã\n" + +#: g10/skclist.c:179 +#, c-format +msgid "" +"skipped `%s': this is a PGP generated ElGamal key which is not secure for " +"signatures!\n" +msgstr "" +"sãritã `%s': aceasta este o cheie ElGamal generatã de PGP care nu e sigurã " +"pentru semnãturi!\n" + +#. do not overwrite +#: g10/openfile.c:84 +#, c-format +msgid "File `%s' exists. " +msgstr "Fiºierul `%s' existã. " + +#: g10/openfile.c:86 +msgid "Overwrite (y/N)? " +msgstr "Suprascriu (d/N)? " + +#: g10/openfile.c:119 +#, c-format +msgid "%s: unknown suffix\n" +msgstr "%s: sufix necunoscut\n" + +#: g10/openfile.c:141 +msgid "Enter new filename" +msgstr "Introduceþi un nou nume-fiºier" + +#: g10/openfile.c:184 +msgid "writing to stdout\n" +msgstr "scriu la stdout\n" + +#: g10/openfile.c:284 +#, c-format +msgid "assuming signed data in `%s'\n" +msgstr "presupun date semnate în `%s'\n" + +#: g10/openfile.c:352 +#, c-format +msgid "new configuration file `%s' created\n" +msgstr "fiºier de configurare nou `%s' creat\n" + +#: g10/openfile.c:354 +#, c-format +msgid "WARNING: options in `%s' are not yet active during this run\n" +msgstr "" +"AVERTISMENT: opþiunile din %s nu sunt încã active în timpul acestei rulãri\n" + +#: g10/openfile.c:383 +#, c-format +msgid "%s: can't create directory: %s\n" +msgstr "%s: nu pot crea director: %s\n" + +#: g10/openfile.c:386 +#, c-format +msgid "%s: directory created\n" +msgstr "%s: director creat\n" + +#: g10/encr-data.c:91 +msgid "" +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n" +msgstr "" +"AVERTISMENT: mesajul a fost cifrat cu o cheie slabã din cifrul simetric.\n" + +#: g10/encr-data.c:98 +msgid "problem handling encrypted packet\n" +msgstr "problemã cu mânuirea pachetului cifrat\n" + +#: g10/seskey.c:52 +msgid "weak key created - retrying\n" +msgstr "cheie slabã creatã - reîncerc\n" + +#: g10/seskey.c:57 +#, c-format +msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" +msgstr "nu pot evita cheie slabã pentru cifru simetric; am încercat %d ori!\n" + +#: g10/seskey.c:200 +msgid "DSA requires the use of a 160 bit hash algorithm\n" +msgstr "DSA necesitã folosirea unui algoritm cu hash de 160 biþi\n" + +#: g10/delkey.c:120 g10/delkey.c:127 +msgid "(unless you specify the key by fingerprint)\n" +msgstr "(dacã nu specificaþi cheia prin amprentã)\n" + +#: g10/delkey.c:126 +msgid "can't do that in batchmode without \"--yes\"\n" +msgstr "nu se poate face acest lucru în mod batch fãrã \"--yes\"\n" + +#: g10/delkey.c:150 +msgid "Delete this key from the keyring? " +msgstr "ªtergeþi aceastã cheie din inelul de chei? " + +#: g10/delkey.c:158 +msgid "This is a secret key! - really delete? " +msgstr "Aceasta este o cheie secretã! - chiar o ºtergeþi? " + +#: g10/delkey.c:168 +#, c-format +msgid "deleting keyblock failed: %s\n" +msgstr "stergere keyblock a eºuat: %s\n" + +#: g10/delkey.c:178 +msgid "ownertrust information cleared\n" +msgstr "informaþii încredere-proprietar curãþate\n" + +#: g10/delkey.c:206 +#, c-format +msgid "there is a secret key for public key \"%s\"!\n" +msgstr "existã o cheie secretã pentru cheia publicã \"%s\"!\n" + +#: g10/delkey.c:208 +msgid "use option \"--delete-secret-keys\" to delete it first.\n" +msgstr "" +"folosiþi opþiunea \"--delete-secret-keys\" pentru a o ºterge pe aceasta mai " +"întâi.\n" + +#: g10/helptext.c:47 +msgid "" +"It's up to you to assign a value here; this value will never be exported\n" +"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" +"to do with the (implicitly created) web-of-certificates." +msgstr "" +"Este sarcina d-voastrã sã atribuiþi o valoare aici; aceastã valoare\n" +"nu va fi niciodatã exportatã pentru o terþã parte. Trebuie sã\n" +"implementãm reþeaua-de-încredere; aceasta nu are nimic în comun cu\n" +"certificatele-de-reþea (create implicit)." + +#: g10/helptext.c:53 +msgid "" +"To build the Web-of-Trust, GnuPG needs to know which keys are\n" +"ultimately trusted - those are usually the keys for which you have\n" +"access to the secret key. Answer \"yes\" to set this key to\n" +"ultimately trusted\n" +msgstr "" +"Pentru a construi Reþeaua-de-Încredere, GnuPG trebuie sã ºtie care chei\n" +"au nivel de încredere suprem - acestea de obicei sunt cheile pentru care\n" +"aveþi acces la cheia secretã. Rãspundeþi \"da\" pentru a seta\n" +"aceastã cheie cu nivel de încredere suprem\n" + +#: g10/helptext.c:60 +msgid "If you want to use this revoked key anyway, answer \"yes\"." +msgstr "" +"Dacã doriþi oricum sã folosiþi aceastã cheie revocatã, rãspundeþi \"da\"." + +#: g10/helptext.c:64 +msgid "If you want to use this untrusted key anyway, answer \"yes\"." +msgstr "" +"Dacã doriþi oricum sã folosiþi aceastã cheie fãrã încredere, rãspundeþi \"da" +"\"." + +#: g10/helptext.c:68 +msgid "" +"Enter the user ID of the addressee to whom you want to send the message." +msgstr "Introduceþi ID-ul utilizator al destinatarului mesajului." + +#: g10/helptext.c:72 +msgid "" +"Select the algorithm to use.\n" +"\n" +"DSA (aka DSS) is the digital signature algorithm which can only be used\n" +"for signatures. This is the suggested algorithm because verification of\n" +"DSA signatures are much faster than those of ElGamal.\n" +"\n" +"ElGamal is an algorithm which can be used for signatures and encryption.\n" +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " +"only\n" +"and a sign+encrypt; actually it is the same, but some parameters must be\n" +"selected in a special way to create a safe key for signatures: this program\n" +"does this but other OpenPGP implementations are not required to understand\n" +"the signature+encryption flavor.\n" +"\n" +"The first (primary) key must always be a key which is capable of signing;\n" +"this is the reason why the encryption only ElGamal key is not available in\n" +"this menu." +msgstr "" +"Selectaþi algoritmul de folosit.\n" +"\n" +"DSA (sau DSS) este algoritmul de semnãturã digitalã care poate fi folosit\n" +"doar pentru semnãturi. Acesta este algoritmul sugerat pentru cã " +"verificarea\n" +"semnãturilor DSA este mult mai rapidã decât a celor ElGamal.\n" +"\n" +"ElGamal este un algoritm ce poate fi folosit pentru semnãturi ºi cifrare.\n" +"OpenPGP face distincþie între cele douã variante ale acestui algoritm: cel\n" +"numai pentru cifrare ºi cel pentru semnare+cifrare; algoritmul este acelaºi\n" +"dar câþiva parametrii trebuie selectaþi într-un mod special pentru a crea\n" +"o cheie sigurã pentru semnãturi: acest program face acest lucru, dar alte\n" +"implementãri OpenPGP ar putea sã nu înþeleagã varianta de semnare+cifrare.\n" +"\n" +"Prima cheie (primarã) trebuie sã fie întotdeauna capabilã de semnare;\n" +"acesta este motivul pentru care cheia ElGamal nu este disponibilã în\n" +"acest meniu." + +#: g10/helptext.c:92 +msgid "" +"Although these keys are defined in RFC2440 they are not suggested\n" +"because they are not supported by all programs and signatures created\n" +"with them are quite large and very slow to verify." +msgstr "" +"Deºî aceste chei sunt definite în RFC2440 ele nu sunt sugerate pentru\n" +"cã nu sunt suportate de toate programele ºi semnãturile create cu ele\n" +"sunt destul de lungi ºi verificarea lor este foarte lentã." + +#: g10/helptext.c:98 +msgid "" +"In general it is not a good idea to use the same key for signing and\n" +"encryption. This algorithm should only be used in certain domains.\n" +"Please consult your security expert first." +msgstr "" +"În general nu este o idee bunã sã folosiþi aceeaºi cheie ºi pentru\n" +"semnare ºi pentru cifrare. Acest algoritm ar trebui folosit numai\n" +"în anumite domenii. Vã rugãm consultaþi mai întâi un expert în domeniu." + +#: g10/helptext.c:105 +msgid "Enter the size of the key" +msgstr "Introduceþi lungimea cheii" + +#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158 +#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196 +msgid "Answer \"yes\" or \"no\"" +msgstr "Rãspundeþi \"da\" sau \"nu\"" + +#: g10/helptext.c:119 +msgid "" +"Enter the required value as shown in the prompt.\n" +"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" +"get a good error response - instead the system tries to interpret\n" +"the given value as an interval." +msgstr "" +"Introduceþi valoarea cerutã precum a arãtat la prompt.\n" +"Este posibil sã introduceþi o datã ISO (AAAA-LL-ZZ) dar nu veþi\n" +"obþine un rãspuns de eroare bun - în loc sistemul încearcã sã\n" +"interpreteze valoare datã ca un interval." + +#: g10/helptext.c:131 +msgid "Enter the name of the key holder" +msgstr "Introduceþi numele deþinãtorului cheii" + +#: g10/helptext.c:136 +msgid "please enter an optional but highly suggested email address" +msgstr "vã rugãm introduceþi o adresã de email (opþionalã dar recomandatã)" + +#: g10/helptext.c:140 +msgid "Please enter an optional comment" +msgstr "Vã rugãm introduceþi un comentriu opþional" + +#: g10/helptext.c:145 +msgid "" +"N to change the name.\n" +"C to change the comment.\n" +"E to change the email address.\n" +"O to continue with key generation.\n" +"Q to to quit the key generation." +msgstr "" +"N pentru a schimba numele.\n" +"C pentru a schimba comentariul.\n" +"E pentru a schimba adresa de email.\n" +"O pentru a continua cu generarea cheii.\n" +"T pentru a termina generarea cheii." + +#: g10/helptext.c:154 +msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." +msgstr "" +"Rãspundeþi \"da\" (sau numai \"d\") dacã sunteþi OK sã generaþi subcheia." + +#: g10/helptext.c:162 +msgid "" +"When you sign a user ID on a key, you should first verify that the key\n" +"belongs to the person named in the user ID. It is useful for others to\n" +"know how carefully you verified this.\n" +"\n" +"\"0\" means you make no particular claim as to how carefully you verified " +"the\n" +" key.\n" +"\n" +"\"1\" means you believe the key is owned by the person who claims to own it\n" +" but you could not, or did not verify the key at all. This is useful " +"for\n" +" a \"persona\" verification, where you sign the key of a pseudonymous " +"user.\n" +"\n" +"\"2\" means you did casual verification of the key. For example, this " +"could\n" +" mean that you verified the key fingerprint and checked the user ID on " +"the\n" +" key against a photo ID.\n" +"\n" +"\"3\" means you did extensive verification of the key. For example, this " +"could\n" +" mean that you verified the key fingerprint with the owner of the key in\n" +" person, and that you checked, by means of a hard to forge document with " +"a\n" +" photo ID (such as a passport) that the name of the key owner matches " +"the\n" +" name in the user ID on the key, and finally that you verified (by " +"exchange\n" +" of email) that the email address on the key belongs to the key owner.\n" +"\n" +"Note that the examples given above for levels 2 and 3 are *only* examples.\n" +"In the end, it is up to you to decide just what \"casual\" and \"extensive" +"\"\n" +"mean to you when you sign other keys.\n" +"\n" +"If you don't know what the right answer is, answer \"0\"." +msgstr "" +"Când semnaþi un ID utilizator pe o cheie ar trebui sã verificaþi mai întâi\n" +"cã cheia aparþine persoanei numite în ID-ul utilizator. Este util ºi " +"altora\n" +"sã ºtie cât de atent aþi verificat acest lucru.\n" +"\n" +"\"0\" înseamnã cã nu pretindeþi nimic despre cât de atent aþi verificat " +"cheia\n" +"\"1\" înseamnã cã credeþi cã cheia este a persoanei ce pretinde cã este\n" +" proprietarul ei, dar n-aþi putut, sau nu aþi verificat deloc cheia.\n" +" Aceasta este utilã pentru verificare \"persona\", unde semnaþi cheia\n" +" unui utilizator pseudonim.\n" +"\n" +"\"2\" înseamnã cã aþi fãcut o verificare supericialã a cheii. De exemplu,\n" +" aceasta ar putea însemna cã aþi verificat amprenta cheii ºi aþi " +"verificat\n" +" ID-ul utilizator de pe cheie cu un ID cu pozã.\n" +"\n" +"\"3\" înseamnã cã aþi fãcut o verificare extensivã a cheii. De exemplu,\n" +" aceasta ar putea însemna cã aþi verificat amprenta cheii cu " +"proprietarul\n" +" cheii în persoanã, cã aþi verificat folosind un document dificil de\n" +" falsificat cu pozã (cum ar fi un paºaport) cã numele proprietarului " +"cheii\n" +" este acelaºi cu numele ID-ului utilizator al cheii ºi cã aþi verificat\n" +" (schimbând emailuri) cã adresa de email de pe cheie aparþine " +"proprietarului\n" +"cheii.\n" +"\n" +"De notat cã exemplele date pentru nivelele 2 ºi 3 ceva mai sus sunt *numai*\n" +"exemple. La urma urmei, d-voastrã decideþi ce înseamnã \"superficial\" ºi\n" +"\"extensiv\" pentru d-voastrã când semnaþi alte chei.\n" +"\n" +"Dacã nu ºtiþi care este rãspunsul, rãspundeþi \"0\"." + +#: g10/helptext.c:200 +msgid "Answer \"yes\" is you want to sign ALL the user IDs" +msgstr "Rãspundeþi \"da\" dacã doriþi sã semnaþi TOATE ID-urile utilizator" + +#: g10/helptext.c:204 +msgid "" +"Answer \"yes\" if you really want to delete this user ID.\n" +"All certificates are then also lost!" +msgstr "" +"Rãspundeþi \"da\" dacã într-adevãr doriþi sã ºtergeþi acest ID utilizator.\n" +"Toate certificatele sunt de asemenea pierdute!" + +#: g10/helptext.c:209 +msgid "Answer \"yes\" if it is okay to delete the subkey" +msgstr "Rãspundeþi \"da\" dacã este OK sã ºtergeþi subcheia" + +#: g10/helptext.c:214 +msgid "" +"This is a valid signature on the key; you normally don't want\n" +"to delete this signature because it may be important to establish a\n" +"trust connection to the key or another key certified by this key." +msgstr "" +"Aceasta este o semnãturã validã pe cheie; în mod normal n-ar trebui\n" +"sã ºtergeþi aceastã semnãturã pentru cã aceasta ar putea fi importantãla " +"stabilirea conexiunii de încredere la cheie sau altã cheie certificatã\n" +"de aceastã cheie." + +#: g10/helptext.c:219 +msgid "" +"This signature can't be checked because you don't have the\n" +"corresponding key. You should postpone its deletion until you\n" +"know which key was used because this signing key might establish\n" +"a trust connection through another already certified key." +msgstr "" +"Aceastã semnãturã nu poate fi verificatã pentru cã nu aveþi cheia\n" +"corespunzãtoare. Ar trebui sã amânaþi ºtergerea sa pânã ºtiþi care\n" +"cheie a fost folositã pentru cã aceastã cheie de semnare ar putea\n" +"constitui o conexiune de încredere spre o altã cheie deja certificatã." + +#: g10/helptext.c:225 +msgid "" +"The signature is not valid. It does make sense to remove it from\n" +"your keyring." +msgstr "" +"Semnãtura nu este validã. Aceasta ar trebui ºtearsã de pe inelul\n" +"d-voastrã de chei." + +#: g10/helptext.c:229 +msgid "" +"This is a signature which binds the user ID to the key. It is\n" +"usually not a good idea to remove such a signature. Actually\n" +"GnuPG might not be able to use this key anymore. So do this\n" +"only if this self-signature is for some reason not valid and\n" +"a second one is available." +msgstr "" +"Aceasta este o semnãturã care leagã ID-ul utilizator de cheie.\n" +"De obicei nu este o idee bunã sã ºtergeþi o asemenea semnãturã.\n" +"De fapt, GnuPG ar putea sã nu mai poatã folosi aceastã cheie.\n" +"Aºa cã faceþi acest lucru numai dacã aceastã auto-semnãturã este\n" +"dintr-o oarecare cauzã invalidã ºi o a doua este disponibilã." + +#: g10/helptext.c:237 +msgid "" +"Change the preferences of all user IDs (or just of the selected ones)\n" +"to the current list of preferences. The timestamp of all affected\n" +"self-signatures will be advanced by one second.\n" +msgstr "" +"Schimbaþi toate preferinþele ale tuturor ID-urilor utilizator (sau doar\n" +"cele selectate) conform cu lista curentã de preferinþe. Timestamp-urile\n" +"tuturor auto-semnãturilor afectate vor fi avansate cu o secundã.\n" + +#: g10/helptext.c:244 +msgid "Please enter the passhrase; this is a secret sentence \n" +msgstr "" +"Vã rugãm introduceþi fraza-parolã; aceasta este o propoziþie secretã \n" + +#: g10/helptext.c:250 +msgid "Please repeat the last passphrase, so you are sure what you typed in." +msgstr "" +"Vã rugãm repetaþi ultima frazã-parolã, pentru a fi sigur(ã) ce aþi tastat." + +#: g10/helptext.c:254 +msgid "Give the name of the file to which the signature applies" +msgstr "Daþi numele fiºierului la care se aplicã semnãtura" + +#: g10/helptext.c:259 +msgid "Answer \"yes\" if it is okay to overwrite the file" +msgstr "Rãspundeþi \"da\" dacã este OK sã suprascrieþi fiºierul" + +#: g10/helptext.c:264 +msgid "" +"Please enter a new filename. If you just hit RETURN the default\n" +"file (which is shown in brackets) will be used." +msgstr "" +"Vã rugãm introduceþi un nou nume-fiºier. Dacã doar apãsaþi RETURN,\n" +"va fi folosit fiºierul implicit (arãtat în paranteze)." + +#: g10/helptext.c:270 +msgid "" +"You should specify a reason for the certification. Depending on the\n" +"context you have the ability to choose from this list:\n" +" \"Key has been compromised\"\n" +" Use this if you have a reason to believe that unauthorized persons\n" +" got access to your secret key.\n" +" \"Key is superseded\"\n" +" Use this if you have replaced this key with a newer one.\n" +" \"Key is no longer used\"\n" +" Use this if you have retired this key.\n" +" \"User ID is no longer valid\"\n" +" Use this to state that the user ID should not longer be used;\n" +" this is normally used to mark an email address invalid.\n" +msgstr "" +"Ar trebui sã specificaþi un motiv pentru certificare. În funcþie de\n" +"context aveþi posibilitatea sã alegeþi din aceastã listã:\n" +" \"Cheia a fost compromisã\"\n" +" Folosiþi aceastã opþiune dacã aveþi un motiv sã credeþi cã persoane\n" +" neautorizate au avut acces la cheia d-voastrã secretã.\n" +" \"Cheia este înlocuitã\"\n" +" Folosiþi aceastã opþiune dacã înlocuiþi cheia cu una nouã.\n" +" \"Cheia nu mai este folositã\"\n" +" Folosiþi aceastã opþiune dacã pensionaþi cheia.\n" +" \"ID-ul utilizator nu mai este valid\"\n" +" Folosiþi aceastã opþiune dacã ID-ul utilizator nu mai trebuie " +"folosit;\n" +" de obicei folositã pentru a marca o adresã de email ca invalidã.\n" + +#: g10/helptext.c:286 +msgid "" +"If you like, you can enter a text describing why you issue this\n" +"revocation certificate. Please keep this text concise.\n" +"An empty line ends the text.\n" +msgstr "" +"Dacã doriþi, puteþi introduce un text descriind de ce publicaþi acest\n" +"certificat de revocare. Vã rugãm fiþi concis.\n" +"O linie goalã terminã textul.\n" + +#: g10/helptext.c:301 +msgid "No help available" +msgstr "Nici un ajutor disponibil" + +#: g10/helptext.c:309 +#, c-format +msgid "No help available for `%s'" +msgstr "Nici un disponibil disponibil pentru `%s'" + +#: g10/keydb.c:185 +#, c-format +msgid "error creating keyring `%s': %s\n" +msgstr "eroare la crearea inelului de chei `%s': %s\n" + +#: g10/keydb.c:192 +#, c-format +msgid "keyring `%s' created\n" +msgstr "inelul de chei `%s' creat\n" + +#: g10/keydb.c:582 +#, c-format +msgid "failed to rebuild keyring cache: %s\n" +msgstr "am eºuat sã reconstruiesc cache-ul inelului de chei: %s\n" + +#: g10/keyring.c:1226 +msgid "WARNING: 2 files with confidential information exists.\n" +msgstr "AVERTISMENT: existã 2 fiºiere cu informaþii confidenþiale.\n" + +#: g10/keyring.c:1228 +#, c-format +msgid "%s is the unchanged one\n" +msgstr "%s este cel neschimbat\n" + +#: g10/keyring.c:1229 +#, c-format +msgid "%s is the new one\n" +msgstr "%s este cel nou\n" + +#: g10/keyring.c:1230 +msgid "Please fix this possible security flaw\n" +msgstr "Vã rugãm reparaþi aceastã deficienþã posibilã de securitate\n" + +#: g10/keyring.c:1350 +#, c-format +msgid "checking keyring `%s'\n" +msgstr "verific inelul de chei `%s'\n" + +#: g10/keyring.c:1388 +#, c-format +msgid "%lu keys so far checked (%lu signatures)\n" +msgstr "%lu chei pânã acum verificate (%lu semnãturi)\n" + +#: g10/keyring.c:1399 +#, c-format +msgid "%lu keys checked (%lu signatures)\n" +msgstr "%lu chei verificate (%lu semnãturi)\n" + +#: g10/keyring.c:1465 +#, c-format +msgid "%s: keyring created\n" +msgstr "%s: inelul de chei creat\n" + +#: g10/photoid.c:65 +msgid "" +"\n" +"Pick an image to use for your photo ID. The image must be a JPEG file.\n" +"Remember that the image is stored within your public key. If you use a\n" +"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" +msgstr "" +"\n" +"Alegeþi o imagine pentru a o folosi ca pozã ID. Imaginea trebuie sã fie un\n" +"fiºier JPEG. Amintiþi-vã cã imaginea este pãstratã în cheia d-voastrã " +"publicã.\n" +"Dacã folosiþi o imagine foarte largã, cheia d-voastrã va deveni de asemenea\n" +"foarte largã!\n" +"Încercaþi sã folosiþi o imagine de aproximativ 240x288 pixeli.\n" + +#: g10/photoid.c:79 +msgid "Enter JPEG filename for photo ID: " +msgstr "Introduceþi nume-fiºier JPEG pentru pozã ID: " + +#: g10/photoid.c:87 +#, c-format +msgid "Unable to open photo \"%s\": %s\n" +msgstr "Nu pot deschide poza \"%s\": %s\n" + +#: g10/photoid.c:97 +msgid "Are you sure you want to use it (y/N)? " +msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " + +#: g10/photoid.c:112 +#, c-format +msgid "\"%s\" is not a JPEG file\n" +msgstr "\"%s\" nu este un fiºier JPEG\n" + +#: g10/photoid.c:129 +msgid "Is this photo correct (y/N/q)? " +msgstr "Este aceastã pozã corectã (d/N/t)? " + +#: g10/photoid.c:331 +msgid "unable to display photo ID!\n" +msgstr "nu pot afiºa poza ID!\n" + +#: g10/exec.c:48 +msgid "no remote program execution supported\n" +msgstr "nu este suportatã execuþia nici unui program la distanþã\n" + +#: g10/exec.c:184 +#, c-format +msgid "can't create directory `%s': %s\n" +msgstr "nu pot crea directorul `%s': %s\n" + +#: g10/exec.c:325 +msgid "" +"external program calls are disabled due to unsafe options file permissions\n" +msgstr "" +"chemarea programelor externe sunt deactivate datoritã opþiunilor nesigure " +"pentru permisiunile fiºierului\n" + +#: g10/exec.c:355 +msgid "this platform requires temp files when calling external programs\n" +msgstr "" +"aceastã platformã necesitã fiºiere temporare când sunt chemate programe " +"externe\n" + +#. If we get this far the exec failed. Clean up and return. +#: g10/exec.c:432 +#, c-format +msgid "unable to execute %s \"%s\": %s\n" +msgstr "nu pot executa %s \"%s\": %s\n" + +#: g10/exec.c:513 +#, c-format +msgid "system error while calling external program: %s\n" +msgstr "eroare de sistem la chemarea programului extern: %s\n" + +#: g10/exec.c:524 g10/exec.c:583 +msgid "unnatural exit of external program\n" +msgstr "ieºire nenaturalã a programului extern\n" + +#: g10/exec.c:539 +msgid "unable to execute external program\n" +msgstr "nu pot executa programul extern\n" + +#: g10/exec.c:548 +#, c-format +msgid "unable to read external program response: %s\n" +msgstr "nu pot citi rãspunsul programului extern: %s\n" + +#: g10/exec.c:594 g10/exec.c:601 +#, c-format +msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" +msgstr "AVERTISMENT: nu pot ºterge fiºierul temporar (%s) `%s': %s\n" + +#: g10/exec.c:606 +#, c-format +msgid "WARNING: unable to remove temp directory `%s': %s\n" +msgstr "AVERTISMENT: nu pot ºterge directorul temporar `%s': %s\n" + +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 +msgid "never " +msgstr "niciodatã " + +#: g10/revoke.c:92 +msgid "key incomplete\n" +msgstr "cheie incompletã\n" + +#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 +#: g10/revoke.c:186 g10/revoke.c:568 +#, c-format +msgid "build_packet failed: %s\n" +msgstr "build_packet a eºuat: %s\n" + +#: g10/revoke.c:145 +#, c-format +msgid "key %08lX incomplete\n" +msgstr "cheie %08lX incompletã\n" + +#: g10/revoke.c:214 g10/revoke.c:433 +msgid "sorry, can't do this in batch mode\n" +msgstr "îmi pare rãu, nu pot face acest lucru în modul batch\n" + +#: g10/revoke.c:281 +msgid "To be revoked by:\n" +msgstr "Pentru a fi revocat de:\n" + +#: g10/revoke.c:293 +msgid "(This is a sensitive revocation key)\n" +msgstr "(Aceasta este o cheie de revocare senzitivã)\n" + +#: g10/revoke.c:297 g10/revoke.c:503 +msgid "Create a revocation certificate for this key? " +msgstr "Creaþi un certificat de revocare pentru aceastã cheie? " + +#: g10/revoke.c:310 g10/revoke.c:534 +msgid "ASCII armored output forced.\n" +msgstr "Ieºire în armurã ASCII forþatã.\n" + +#: g10/revoke.c:324 g10/revoke.c:548 +#, c-format +msgid "make_keysig_packet failed: %s\n" +msgstr "make_keysig_packet a eºuat: %s\n" + +#. and issue a usage notice +#: g10/revoke.c:387 +msgid "Revocation certificate created.\n" +msgstr "Certificat de revocare creat.\n" + +#: g10/revoke.c:393 +#, c-format +msgid "no revocation keys found for `%s'\n" +msgstr "nici o cheie de revocare gãsitã pentru `%s'\n" + +#: g10/revoke.c:447 +#, c-format +msgid "secret key `%s' not found: %s\n" +msgstr "cheia secretã `%s' nu a fost gãsitã: %s\n" + +#: g10/revoke.c:485 +#, c-format +msgid "no corresponding public key: %s\n" +msgstr "nici o cheie publicã corespunzãtoare: %s\n" + +#: g10/revoke.c:496 +msgid "public key does not match secret key!\n" +msgstr "cheia publicã nu se potriveºte cu cheia secretã!\n" + +#: g10/revoke.c:519 +msgid "unknown protection algorithm\n" +msgstr "algoritm de protecþie necunoscut\n" + +#: g10/revoke.c:523 +msgid "NOTE: This key is not protected!\n" +msgstr "NOTÃ: Aceastã cheie nu este protejatã!\n" + +#. and issue a usage notice +#: g10/revoke.c:574 +msgid "" +"Revocation certificate created.\n" +"\n" +"Please move it to a medium which you can hide away; if Mallory gets\n" +"access to this certificate he can use it to make your key unusable.\n" +"It is smart to print this certificate and store it away, just in case\n" +"your media become unreadable. But have some caution: The print system of\n" +"your machine might store the data and make it available to others!\n" +msgstr "" +"Certificat de revocare creat.\n" +"\n" +"Vã rugãm mutaþi-l pe un medium pe care îl puteþi ascunde; dacã cineva pune\n" +"mâna pe acest certificat l-ar putea folosi sã vã facã cheia inutilizabilã.\n" +"Este indicat sã tipãriþi acest certificat ºi sã-l pãstraþi undeva sigur, în\n" +"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:615 +msgid "Please select the reason for the revocation:\n" +msgstr "Vã rugãm selectaþi motivul pentru revocare:\n" + +#: g10/revoke.c:625 +msgid "Cancel" +msgstr "Renunþã" + +#: g10/revoke.c:627 +#, c-format +msgid "(Probably you want to select %d here)\n" +msgstr "(Probabil doriþi sã selectaþi %d aici)\n" + +#: g10/revoke.c:668 +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:696 +#, c-format +msgid "Reason for revocation: %s\n" +msgstr "Motiv pentru revocare: %s\n" + +#: g10/revoke.c:698 +msgid "(No description given)\n" +msgstr "(Nici o descriere datã)\n" + +#: g10/revoke.c:703 +msgid "Is this okay? " +msgstr "Este aceasta OK? " + +#: g10/tdbdump.c:104 +#, c-format +msgid "" +"# List of assigned trustvalues, created %s\n" +"# (Use \"gpg --import-ownertrust\" to restore them)\n" +msgstr "" +"# Listã cu valori de încredere atribuite, creatã %s\n" +"# (Folosiþi \"gpg --import-ownertrust\" pentru a le reface)\n" + +#: g10/tdbdump.c:140 +#, c-format +msgid "can't open file: %s\n" +msgstr "nu pot deschide fiºierul: %s\n" + +#: g10/tdbdump.c:151 +msgid "line too long\n" +msgstr "linie prea lungã\n" + +#: g10/tdbdump.c:159 +msgid "error: missing colon\n" +msgstr "eroare: `:' lipsã\n" + +#: g10/tdbdump.c:164 +msgid "error: invalid fingerprint\n" +msgstr "eroare: amprentã invalidã\n" + +#: g10/tdbdump.c:168 +msgid "error: no ownertrust value\n" +msgstr "eroare: nici o valoare încredere pentru proprietar\n" + +#. error +#: g10/tdbdump.c:204 +#, c-format +msgid "error finding trust record: %s\n" +msgstr "eroare gãsire înregistrare încredere: %s\n" + +#: g10/tdbdump.c:208 +#, c-format +msgid "read error: %s\n" +msgstr "eroare citire: %s\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "acest server de chei nu este în totalitate compatibil cu HKP\n" diff -urpP gnupg-1.2.2/po/sk.po gnupg-1.2.3/po/sk.po --- gnupg-1.2.2/po/sk.po 2003-05-01 14:38:29.000000000 +0000 +++ gnupg-1.2.3/po/sk.po 2003-08-21 20:05:33.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-28 00:00+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -44,7 +44,7 @@ msgstr "nie" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "ukonèi»" @@ -271,62 +271,62 @@ msgstr "... toto je chyba v programe (%s msgid "you found a bug ... (%s:%d)\n" msgstr "nájdená chyba v programe ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "nebol detekovaný ¾iadny modul na získanie entropie\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "nemô¾em otvori» `%s': %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "nemô¾em pou¾i» príkaz stat na `%s': %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' nie je normálny súbor - ignorované\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "poznámka: súbor random_seed je prázdny\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "varovanie: neplatná veµkos» random_seed - súbor nepou¾itý\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "nemô¾em èíta» `%s': %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "poznámka: súbor random_seed nie je aktualizovaný\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "nemô¾em vytvori» `%s': %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "nemô¾em zapisova» do `%s': %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "nemô¾em zavrie» `%s': %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "VAROVANIE: pou¾itý generátor náhodných èísel nie je bezpeèný!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -356,6 +356,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "hashovací algoritmus `%s' je len na èítanie v tejto verzii\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -365,7 +370,7 @@ msgstr "" "Prosím èakajte, získava sa entropia. Robte zatiaµ nejakú inú prácu\n" "aby ste sa nenudili a zvý¹ite tým kvalitu entropie.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -373,169 +378,169 @@ msgstr "" "@Príkazy:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[súbor]|vytvori» podpis" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[súbor]|vytvori» podpis v èitateµnom dokumente" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "vytvori» podpis oddelený od dokumentu" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "¹ifrova» dáta" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[súbor]|¹ifrova» súbor" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "¹ifrovanie len so symetrickou ¹ifrou" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "len ulo¾enie" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "de¹ifrova» dáta (implicitne)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[súbor]|de¹ifrova» súbor" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifikova» podpis" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "vypísa» zoznam kµúèov" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "vypísa» zoznam kµúèov a podpisov" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "skontrolova» podpisy kµúèov" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "vypísa» zoznam kµúèov a fingerprintov" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "vypísa» zoznam tajných kµúèov" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "vytvori» nový pár kµúèov" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "odstráni» kµúè zo súboru verejných kµúèov" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "odstráni» kµúè zo súboru tajných kµúèov" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "podpísa» kµúè" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "podpísa» kµúè lokálne" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "podpísa» kµúè bez mo¾nosti revokácie podpisu" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "" "podpísa» kµúè lokálne a bez mo¾nosti\n" " revokácie podpisu" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "podpísa» alebo modifikova» kµúè" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "vytvori» revokaèný certifikát" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportova» kµúèe" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportova» kµúèe na server kµúèov" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importova» kµúèe zo servera kµúèov" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "vyhµada» kµúèe na serveri kµúèov" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "aktualizova» v¹etky kµúèe zo servera kµúèov" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importova»/zlúèi» kµúèe" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "vypísa» len poradie paketov" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "" "exportova» hodnoty dôveryhodnosti\n" " vlastníka kµúèa" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "" "importova» hodnoty dôveryhodnosti\n" " vlastníka kµúèa" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "aktualizova» databázu dôvery" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "neinteraktívna aktualizácia databázy dôvery" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "opravi» naru¹enú databázu dôvery" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Dekódova» ASCII súbor alebo std. vstup" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Zakódova» súbor alebo std. vstup do ASCII" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [súbory]|vypí¹ hash" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -545,163 +550,163 @@ msgstr "" "Mo¾nosti:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "vytvor výstup zakódovaný pomocou ASCII" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|MENO|¹ifrova» pre MENO" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|MENO|pou¾i» MENO ako implicitného adresáta" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "" "pou¾i» implicitný kµúè ako implicitného\n" " adresáta" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "" "pou¾i» toto id u¾ívateµa na podpísanie\n" " alebo de¹ifrovanie" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|nastavi» úroveò komprimácie N (0 - ¾iadna\n" " komprimácia)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "pou¾i» kánonický textový mód" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "pou¾i» ako výstupný súbor" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "s dodatoènými informáciami" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "by» o trochu tich¹í" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "vôbec nepou¾íva» terminál" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "vynúti» podpisy verzie 3" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "nevynucova» podpisy verzie 3" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "vynúti» podpisy verzie 4" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "nevynucova» podpisy verzie 4" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "na ¹ifrovanie v¾dy pou¾i» MDC" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "na ¹ifrovanie nikdy nepou¾i» MDC" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "nevykona» ¾iadne zmeny" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "vy¾iada» potvrdenie pred prepísaním" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "pou¾ite gpg-agenta" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "dávkový re¾im: nikdy sa na niè nepýta»" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "automaticky odpoveda» áno na väè¹inu otázok" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "automaticky odpoveda» NIE na väè¹inu otázok" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "" "prida» tento súbor kµúèov do zoznamu\n" " pou¾ívaných súborov kµúèov" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "prida» tento súbor tajných kµúèov do zoznamu" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "uká¾ v ktorom súbore kµúèov je vypísaný kµúè" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|MENO|pou¾i MENO ako implicitný tajný kµúè" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "" "|POÈÍTAÈ|pou¾i tento server kµúèov na vyhµadávanie\n" " kµúèov" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|MENO|nastav znakovú sadu terminálu na MENO" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "èíta» nastavenia zo súboru" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|zapísa» informácie o stave do tohto FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[súbor]|zapí¹ informáciu o stave do súboru" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|kµúè|úplne dôverova» tomuto kµúèu" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|SÚBOR|nahra» roz¹irujúci modul SÚBOR" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "emulova» mód popísaný v RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "nastav v¹etky vlastnosti paketov, ¹ifier\n" " a hashov ako v OpenPGP" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "nastav v¹etky vlastnosti paketov, ¹ifier\n" @@ -751,7 +756,7 @@ msgstr "" "Nastavi» príkazový riadok na prehliadanie\n" " fotografického ID" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -760,7 +765,7 @@ msgstr "" "(Pou¾ite manuálové stránky pre kompletný zoznam v¹etkých príkazov a " "mo¾ností)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -780,17 +785,17 @@ msgstr "" " --list-keys [mená] vypísa» kµúèe\n" " --fingerprint [mená] vypísa» fingerprinty\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Chyby oznámte, prosím, na adresu .\n" "Pripomienky k prekladu .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou¾itie: gpg [mo¾nosti] [súbory] (-h pre pomoc)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -800,7 +805,7 @@ msgstr "" "podpísa», overi», ¹ifrova» alebo de¹ifrova»\n" "implicitné operácie závisia od vstupných dát\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -808,321 +813,361 @@ msgstr "" "\n" "Podporované algoritmy:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "Verejné kµúèe: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "©ifry: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Kompresia: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "pou¾itie: gpg [mo¾nosti] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "konfliktné príkazy\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitný súbor s mo¾nos»ami `%s ignorovaný'\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitný súbor s mo¾nos»ami `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "súbor s mo¾nos»ami `%s': %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "¹ifra \"%s\" nebola nahraná, preto¾e prístupové práva nie sú nastavené " "bezpeène\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie je platná znaková sada\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prepí¹e %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolené pou¾íva» %s s %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedáva s %s zmysel!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete vytvára» len oddelené podpisy alebo podpisy èitateµné " "ako text\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v móde --pgp2 nemo¾no súèasne ¹ifrova» a podpisova»\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v móde --pgp2 musíte pou¾i» súbor (nie rúru).\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrovanie správ v móde --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "táto správa nemusí by» s %s pou¾iteµná\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "kompresný algoritmus musí by» v rozmedzí %d..%d\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "polo¾ka max-cert-depth musí by» v rozmedzí od 1 do 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporuèovaný\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "neplatná implicitná úroveò kontroly; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "neplatné defaultné predvoµby\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "" +"pou¾itie %s nie je v móde %s dovolené\n" +"\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "" +"pou¾itie %s nie je v móde %s dovolené\n" +"\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "" +"pou¾itie %s nie je v móde %s dovolené\n" +"\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVANIE: daný adresát (-r) bez pou¾itia ¹ifrovania s verejným kµúèom\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [meno súboru]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [meno súboru]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [meno súboru]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [meno súboru]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno súboru]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [meno súboru]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [meno súboru]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key id u¾ívateµa" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ívateµa" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ívateµa" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ívateµa" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ívateµa [príkazy]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "nemo¾no otvori» %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ívateµa] [súbor s kµúèmi (keyring)]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "aktualizácia tajného kµúèa zlyhala: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[meno súboru]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Zaènite písa» svoju správu ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nemo¾no otvori» `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1130,19 +1175,19 @@ msgstr "" "meno mô¾e obsahova» len písmená, èíslice, bodky, podèiarníky alebo medzery a " "konèi» s '='\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "hodnota musí obsahova» znak '@'\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "hodnota nesmie obsahova» ¾iadne kontrolné znaky\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pre certifikaènú politiku je neplatné\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" @@ -1283,7 +1328,7 @@ msgstr "" "Nie je priradená ¾iadna hodnota dôvery k:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " alias \"" @@ -1341,7 +1386,7 @@ msgstr " s = preskoèi» tento kµúè\n" msgid " q = quit\n" msgstr " u = ukonèi»\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Va¹e rozhodnutie? " @@ -1519,91 +1564,91 @@ msgstr "%s: preskoèené: verejný kµúè je msgid "no valid addressees\n" msgstr "¾iadne platné adresy\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "predvoµba %c%lu nie je platná\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "duplicita predvoµby %c%lu\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "príli¹ veµa `%c' predvolieb\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "zapisujem podpis kµúèa ním samým (direct signature)\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "zapisujem podpis kµúèa sebou samým\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "zapisujem \"key-binding\" podpis\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná då¾ka kµúèa; pou¾ijem %u bitov\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "då¾ka kµúèa zaokrúhlená na %u bitov\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Prosím, vyberte druh kµúèa, ktorý chcete:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA a ElGamal (implicitný)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (len na podpis)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (len na ¹ifrovanie)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (na ¹ifrovanie a podpis)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (len na podpis)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (pro ¹ifrování a podpis)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Vá¹ výber? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1613,15 +1658,15 @@ msgstr "" "takto vytvorený kµúè pri komunikácii s pou¾ívateµmi PGP. Algoritmus je\n" "veµmi pomalý a nemusí by» taký bezpeèný ako ostatné.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Napriek tomu vytvori»? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Neplatný výber.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1634,21 +1679,21 @@ msgstr "" " implicitná veµkos» kµúèa je 1024 bitov\n" " najvy¹¹ia navrhovaná veµkos» kµúèa je 2048 bitov\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Akú veµkos» kµúèa si prajete? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "kµúè DSA musí ma» veµkos» od 512 do 1024 bitov.\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» pre RSA je 1024 " "bitov.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" "veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» je 768 bitov.\n" @@ -1661,12 +1706,12 @@ msgstr "" #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "veµkos» kµúèa je príli¹ veµká; maximálna povolená hodnota je %d.\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1674,11 +1719,11 @@ msgstr "" "Veµkosti kµúèov väè¹ie ako 2048 bitov se neodporúèajú, preto¾e\n" "výpoèty potom trvajú VE¥MI dlho!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Skutoène chcete vytvori» kµúè tejto då¾ky? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1686,17 +1731,17 @@ msgstr "" "Dobre, ale nezabúdajte, ¾e informácie mô¾u by» vyzradené z poèítaèa aj " "elektromagnetickým vy¾arovaním monitora alebo klávesnice!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná då¾ka kµúèa je %u bitov.\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokrúhlené na %u bitov\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1712,7 +1757,7 @@ msgstr "" " m = doba platnosti kµúèa skonèí za n mesiacov\n" " y = doba platnosti kµúèa skonèí za n rokov\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1728,30 +1773,30 @@ msgstr "" " m = doba platnosti podpisu skonèí za n mesiacov\n" " y = doba platnosti podpisu skonèí za n rokov\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Kµúè je platný na? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Podpis je platný na? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "platnos» %s neskonèí\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "platnos» %s skonèí %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1759,11 +1804,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Je to správne (a/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1779,44 +1824,44 @@ msgstr "" " \"Jozko Mrkvicka (student) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Meno a priezvisko: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Neplatný znak ve mene\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Meno nemô¾e zaèína» èíslicou\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Meno musí by» dlhé aspoò 5 znakov\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Komentár: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentári\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾ívate znakovú sadu `%s'.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1827,27 +1872,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Do poµa meno alebo komentár nepí¹te, prosím, e-mailovú adresu.\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "mMkKeEPpUu" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Najskôr, prosím, opravte chybu\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1855,16 +1900,16 @@ msgstr "" "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1876,7 +1921,7 @@ msgstr "" "tohto programu s parametrom \"--edit-key\".\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1888,53 +1933,53 @@ msgstr "" "pou¾íva» disky); vïaka tomu má generátor lep¹iu ¹ancu získa» dostatok " "entropie.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "Pár kµúèov DSA bude ma» då¾ku 1024 bitov.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Vytváranie kµúèa bolo zru¹ené.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujem verejný kµúè do `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, 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:2244 +#: g10/keygen.c:2264 #, 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:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, 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:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "verejný a tajný kµúè boli vytvorené a podpísané.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "kµúè oznaèený ako absolútne dôveryhodný.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1942,12 +1987,12 @@ msgstr "" "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:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1955,7 +2000,7 @@ msgstr "" "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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1963,25 +2008,25 @@ msgstr "" "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:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Skutoène vytvori»? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output pre tento príkaz nefunguje\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: nemô¾em otvori»: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "chyba pri vytváraní hesla: %s\n" @@ -1990,17 +2035,17 @@ msgstr "chyba pri vytváraní hesla: %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "v móde S2K nemo¾no pou¾i» symetrický ESK paket\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' je u¾ skomprimovaný\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: VAROVANIE: súbor je prázdny\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete ¹ifrova» len RSA kµúèom s då¾kou 2048 bitov a menej\n" @@ -2015,7 +2060,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "algoritmus IDEA nemo¾no pou¾i» na v¹etky kµúèe, pre ktoré ¹ifrujete.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "vy¾iadaná symetrická ¹ifra %s (%d) nevyhovuje predvoµbám príjemcu\n" @@ -2033,433 +2078,423 @@ msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s za¹ifrovaný pre: %s\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "chyba pri èítaní bloku kµúèa: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "kµúè %08lX: nie je vo formáte RFC 2440 - preskoèené\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "kµúè %08lX: nie je chránený - preskoèené\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "kµúè %08lX: PGP 2.x kµúè - preskoèené\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "VAROVANIE: niè nebolo vyexportované\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "príli¹ veµa polo¾iek v bufferi verejných kµúèov - vypnuté\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[User id not found]" # c-format -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Neplatný kµúè %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "existuje tajný kµúè pre tento verejný kµúè \"%s\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "pou¾ívam sekundárny kµúè %08lX namiesto primárneho kµúèa %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa - preskoèené\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d bol preskoèený\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu kµúèe boli doteraz spracované\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pri èítaní `%s': %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Celkovo spracovaných kµúèov: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " preskoèené nové kµúèe: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identifikátorov: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importované: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " bez zmien: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nové id u¾ívateµov: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nové podkµúèe: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nové podpisy: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nové revokácie kµúèov: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " preèítané tajné kµúèe: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " importované tajné kµúèe: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " tajné kµúèe nezmenené: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " neimportované: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "POZNÁMKA: Nájdený primárny kµúè Elgamal - import mô¾e chvíµu trva»\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "kµúè %08lX: chyba identifikátor u¾ívateµa\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "kµúè %08lX: HKP po¹kodenie podkµúèa opravené\n" # c-format -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" "kµúè %08lX: prijaté id u¾ívateµa '%s', ktorý nie je podpísaný ním samým\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "kµúè %08lX: chýba platný identifikátor u¾ívateµa\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "mô¾e to by» spôsobené chýbajúcim podpisom kµúèa ním samým\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "kµúè %08lX: verejný kµúè nenájdený: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "kµúè %08lX: nový kµúè - preskoèený\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "nenájdený zapisovateµný súbor kµúèov (keyring): %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "zapisujem do '%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "chyba pri zápise súboru kµúèov (keyring) `%s': %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "kµúè %08lX: verejný kµúè \"%s\" importovaný\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "kµúè %08lX: nezodpovedá na¹ej kópii\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "kµúè %08lX: nemô¾em nájs» originálny blok kµúèa: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "kµúè %08lX: nemô¾em èíta» originálny blok kµúèa: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "kµúè %08lX: \"%s\" 1 nový identifikátor u¾ívateµa\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "kµúè %08lX: \"%s\" %d nových identifikátorov u¾ívateµa\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "kµúè %08lX: \"%s\" 1 nový podpis\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "kµúè %08lX: \"%s\" %d nových podpisov\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "kµúè %08lX: \"%s\" 1 nový podkµúè\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "kµúè %08lX: \"%s\" %d nových podkµúèov\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "kµúè %08lX: \"%s\" bez zmeny\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa %d - preskoèené\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "nie je nastavený implicitný súbor tajných kµúèov %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "kµúè %08lX: tajný kµúè importovaný\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "kµúè %08lX: je u¾ v súbore tajných kµúèov\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "kµúè %08lX: nebol nájdený tajný kµúè: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "kµúè %08lX: chýba verejný kµúè - nemô¾em aplikova» revokaèný certifikát\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "kµúè %08lX: neplatný revokaèný certifikát: %s - zamietnuté\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "kµúè %08lX: \"%s\" revokaèný certifikát importovaný\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "kµúè %08lX: neexistuje id u¾ívateµa pre podpis\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "kµúè %08lX: nepodporovaný algoritmus verejného kµúèa u u¾ívateµského id \"%s" "\"\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "" "kµúè %08lX: neplatný podpis kµúèa ním samým u u¾ívateµského id \"%s\"\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "kµúè %08lX: neexistuje podkµúè pre viazanie kµúèov\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "kµúè %08lX: nepodporovaný algoritmus verejného kµúèa\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "kµúè %08lX: neplatná väzba podkµúèa\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "kµúè %08lX: zmazaná viacnásobná väzba podkµúèa\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "kµúè %08lX: neexistuje podkµúè na revokáciu kµúèa\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "kµúè %08lX: neplatný revokaèný podkµúè\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "kµúè %08lX: zmazaná viacnásobná revokácia podkµúèa\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "kµúè %08lX: identifikátor u¾ívateµa preskoèený '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "kµúè %08lX: podkµúè preskoèený\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "kµúè %08lX: podpis nie je exportovateµný (trieda %02x) - preskoèené\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "kµúè %08lX: revokaèný certifikát na zlom mieste - preskoèené \n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "kµúè %08lX: neplatný revokaèný certifikát: %s - preskoèené\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "kµúè %08lX: podpis subkµúèa na zlom mieste - preskoèené \n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "kµúè %08lX: neoèakávaná podpisová trieda (0x%02X) - preskoèené\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "kµúè %08lX: zistený duplikovaný identifikátor u¾ívateµa - zlúèený\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "VAROVANIE: kµúè %08lX mô¾e by» revokovaný: skú¹am získa» revokaèný kµúè %" "08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "VAROVANIE: kµúè %08lX mô¾e by» revokovaný: revokaèný kµúè %08lX nenájdený.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "kµúè %08lX: pridaný revokaèný certifikát \"%s\"\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "kµúè %08lX: podpis kµúèa ním samým (direct key signature)\n" @@ -2472,29 +2507,29 @@ msgstr "[revokácia]" msgid "[self-signature]" msgstr "[podpis kµúèa ním samým]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 zlý podpis\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d zlých podpisov\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 podpis neoverený, preto¾e chýba kµúè\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d podpisov neoverených, preto¾e chýba kµúè\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 podpis neoverený, preto¾e vznikla chyba\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d podpisov neoverených, preto¾e vznikli chyby\n" @@ -2514,20 +2549,27 @@ msgstr "" msgid "User ID \"%s\" is revoked." msgstr "U¾ívateµské ID \"%s\" je revokované." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Ste si istý, ¾e stále chcete podpísa» tento kµúè? (a/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Nemo¾no podpísa».\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "U¾ívateµské ID \"%s\" je revokované." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "VAROVANIE: ID u¾ívateµa \"%s\" nie je podpísané ním samým\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2536,11 +2578,11 @@ msgstr "" "Podpis kµúèa \"%s\" ním samým je\n" "podpis vo formáte PGP 2.x.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Prajete si ho zmeni» na formát OpenPGP? (a/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2550,13 +2592,13 @@ msgstr "" "je len lokálny.\n" "\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Chcete, aby platnos» Vá¹ho podpisu vypr¹ala v rovnakom èase? (A/n) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2566,54 +2608,54 @@ msgstr "" "je len lokálny.\n" "\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Prajete si ho zmeni» na plne exportovateµný podpis? (a/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" je u¾ lokálne podpísaný kµúèom %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" je u¾ podpísaný kµúèom %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Ste si istý, ¾e stále chcete podpísa» tento kµúè? (a/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Niè na podpísanie kµúèom %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Platnos» kµúèa vypr¹ala!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Platnos» kµúèa vypr¹í %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Chcete, aby platnos» Vá¹ho podpisu vypr¹ala v rovnakom èase? (A/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "" "Nemô¾ete vytvori» OpenPGP podpis kµúèa typu PGP 2.x, keï ste v --pgp2 móde.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "To by spôsobilo nepou¾itelnos» kµúèa v PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2623,31 +2665,35 @@ msgstr "" "patrí vy¹¹ie uvedenej osobe?\n" "Pokiaµ nepoznáte odpoveï, zadajte \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Neodpoviem.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr "de¹ifrova» dáta (implicitne)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Vôbec som to nekontroloval(a).%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Èiastoène som to overil(a).%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Veµmi dôkladne som to overil(a).%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2655,7 +2701,7 @@ msgstr "" "Ste si istý, ¾e chcete podpísa» tento kµúè\n" "svojím kµúèom: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2663,7 +2709,7 @@ msgstr "" "\n" "Ide o podpis kµúèa ním samým\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2671,7 +2717,7 @@ msgstr "" "\n" "VAROVANIE: podpis nebude oznaèený ako neexportovateµný.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2679,7 +2725,7 @@ msgstr "" "\n" "VAROVANIE: podpis nebude oznaèený ako neodvolateµný (non-revocable).\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2688,7 +2734,7 @@ msgstr "" "Podpis bude oznaèený ako neexportovateµný.\n" "\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2696,7 +2742,7 @@ msgstr "" "\n" "Podpis bude oznaèený ako neodvolateµný (non-revocable).\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2704,7 +2750,7 @@ msgstr "" "\n" "Vôbec som tento kµúè neoveril.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2712,7 +2758,7 @@ msgstr "" "\n" "Èiastoène som overil tento kµúè.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2720,34 +2766,34 @@ msgstr "" "\n" "Velmi dôkladne som overil tento kµúè.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Skutoène podpísa»? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "podpisovanie zlyhalo: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Tento kµúè nie je chránený.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Tajné èasti primárneho kµúèa nie sú dostupné.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "kµúè je chránený.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Nie je mo¾né editova» tento kµúè: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2755,7 +2801,7 @@ msgstr "" "Vlo¾te nové heslo (passphrase) pre tento tajný kµúè.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2763,493 +2809,493 @@ msgstr "" "Nechcete heslo - to je *zlý* nápad!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Skutoène to chcete urobi»? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "presúvam podpis kµúèa na správne miesto\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "ukonèi» toto menu" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "u" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "ulo¾i»" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "ulo¾i» a ukonèi»" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "ukáza» túto pomoc" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "vypísa» fingerprint" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "vypísa» zoznam kµúèov a id u¾ívateµov" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "vyberte identifikátor u¾ívateµa N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "vyberte sekundárny kµúè N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "vypísa» zoznam podpisov" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "podpísa» kµúè" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "podpísa» kµúè lokálne" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "podpísa» kµúè bez mo¾nosti odvola» podpis (non-revocably)" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "podpísa» kµúè lokálne a bez mo¾nosti odvola» podpis (non-revocably)" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "prida» identifikátor u¾ívateµa" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "prida» fotografické ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "zmaza» identifikátor u¾ívateµa" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "prida» sekundárny kµúè" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "zmaza» sekundárny kµúè" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "prida» revokaèný kµúè" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "zmaza» podpisy" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "zmeni» dobu platnosti" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "oznaèi» u¾ívateµské ID ako primárne" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "prepnú» medzi vypísaním zoznamu tajných a verejných kµúèov" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "vypísa» zoznam predvolieb (pre expertov)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "vypísa» zoznam predvolieb (podrobne)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "nastavi» zoznam predvolieb" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "aktualizova» predvoµby" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "zmeni» heslo" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "revokova» podpisy" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revsig" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "revokova» identifikátor u¾ívateµa" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "revokova» sekundárny kµúè" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "nastavi» kµúè ako neplatný (disable)" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "nastavi» kµúè ako platný (enable)" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "ukáza» fotografické ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "nemo¾no previes» v dávkovom móde\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Tajný kµúè je dostupný.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Príkaz> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Na vykonanie tejto operácie je potrebný tajný kµúè.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, najskôr pou¾ite príkaz \"toggle\" (prepnú»).\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Kµúè revokovaný." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápoveda: Vyberte id u¾ívateµa na podpísanie\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento príkaz nie je v módoch %s dovolený.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Musíte vybra» aspoò jedno id u¾ívateµa.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Nemô¾ete zmaza» posledné id u¾ívateµa!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Skutoène odstráni» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Skutoène odstráni» toto id u¾ívateµa? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Musíte vybra» aspoò jeden kµúè.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Skutoène chcete zmaza» vybrané kµúèe? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Skutoène chcete zmaza» tento kµúè? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Skutoène revokova» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Skutoène revokova» toto id u¾ívateµa? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Skutoène chcete revokova» vybrané kµúèe? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Skutoène chcete revokova» tento kµúè? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "Skutoène aktualizova» predvoµby pre vybrané id u¾ívateµa? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Skutoène aktualizova» predvoµby? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Ulo¾i» zmeny? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Ukonèi» bez ulo¾enia? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "aktualizácia zlyhala: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizácia tajného kµúèa zlyhala: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný príkaz (skúste \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Charakteristiky: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "Tento kµúè mô¾e by» revokovaný kµúèom %s " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr "(citlivá informácia)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX vytvorený: %s platnos» do: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Tento kµúè bol oznaèený za neplatný (disabled)" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! podkµúè bol revokovaný: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- nájdená falo¹ná revokácia\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problém overenia revokácie: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3257,7 +3303,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3266,45 +3318,45 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 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:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Zmaza» tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Zmaza» tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Zmaza» tento neznámy podpis? (a/N/u)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Zmazaný %d podpis.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Zmazaných %d podpisov.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Niè nebolo zmaznané.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3313,84 +3365,84 @@ msgstr "" "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:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 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" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "kµúè nemo¾no poveri» revokáciou ním samým\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "kµúè nemo¾no poveri» revokáciou ním samým\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 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:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Mením dobu platnosti sekundárneho kµúèa.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Mením dobu platnosti primárneho kµúèa.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 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:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundárny kµúè s indexom %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "id u¾ívateµa: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3399,7 +3451,7 @@ msgstr "" "\"\n" "podpísané Va¹ím kµúèom %08lX v %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3408,56 +3460,56 @@ msgstr "" "\"\n" "lokálne podpísané Va¹ím kµúèom %08lX v %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Podpísali ste nasledujúce identifikátory u¾ívateµa:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " podpísané %08lX v %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " revokované %08lX v %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte sa revokova» tieto podpisy:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " podpísané %08lX v %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "neexistuje tajný kµúè\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" @@ -3466,69 +3518,69 @@ msgstr "u¾ívateµské ID \"%s\" je u¾ revo #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Zobrazujem %s fotografické ID s veµkos»ou %ld pre kµúè 0x%08lX (uid %d)\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kritická podpisová politika: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "Podpisová politika: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "VAROVANIE: nájdený neplatný formát zápisu dátumu\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Kritická podpisová notácia: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "Podpisová notácia: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "nie je v priamo èitateµnom formáte" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "súbor kµúèov (keyring)" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [platnos» skonèí: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Primárny fingerprint kµúèa:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " Primárny fingerprint kµúèa:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Fingerprint kµúèa =" @@ -3616,104 +3668,113 @@ msgstr "POZNÁMKA: odosielateµ po¾adoval msgid "original file name='%.*s'\n" msgstr "pôvodné meno súboru='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "samostatný revokaèný certifikát - pou¾ite \"gpg --import\", ak ho chcete " "vyu¾i»\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notácie: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Politika: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "verifikácia podpisu potlaèená\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "neviem pracova» s týmito násobnými podpismi\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Podpis vytvorený %.*s pomocou %s kµúèa ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Pomoc nie je k dispozícii" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "ZLÝ podpis od \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Podpis s vypr¹anou platnos»ou od \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Dobrý podpis od \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[neistý] " -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s podpis od: \"%s\"\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primary" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "neznáma verzia" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Nemô¾em overi» podpis: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "toto nie je podpis oddelený od dokumentu\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 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:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "samostatný podpis triedy 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "podpis starého typu (PGP 2.x)\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "nájdený neplatný koreòový paket v proc_tree()\n" @@ -3742,75 +3803,80 @@ msgid "" msgstr "" "viac informácií nájdete v dokumente http://www.gnupg.cz/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: pou¾itie parametra \"%s\" sa neodporúèa\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VAROVÁNÍ: pou¾itie parametra \"%s\" sa neodporúèa\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "pou¾ite namiesto neho \"%s%s\" \n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "táto správa nemusí by» s %s pou¾iteµná\n" + +#: g10/parse-packet.c:121 #, c-format 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:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie je v tomto sedení dostupný\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "nemô¾em nastavi» PID klienta pre gpg-agenta\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "nemo¾no získa» server read file descriptor pre agenta\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "nemo¾no získa» server write file descriptor pre agenta\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verzie %d nie je podporovaný\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemô¾em sa pripoji» k `%s': %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikácii s gpg-agentom\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavné ID kµúèa %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3821,32 +3887,32 @@ msgstr "" "\"%.*s\"\n" "kµúè s då¾kou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Opakova» heslo\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Vlo¾i» heslo\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "heslo je príli¹ dlhé\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "neplatná reakcia od agenta\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "zru¹ené u¾ívateµom\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3856,20 +3922,20 @@ msgstr "" "Musíte pozna» heslo, abyste odomkli tajný kµúè pre\n" "u¾ívateµa: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "då¾ka %u bitov, typ %s, ID %08lX, vytvorený %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "v dávkovom re¾ime sa nemô¾em pýta» na heslo\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -3961,8 +4027,8 @@ msgid "failed sending to `%s': status=%u msgstr "zlyhalo posielanie na `%s': (status=%u)\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "tento keyserver nie je plne kompatibilný s HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4001,11 +4067,11 @@ msgid "generating the deprecated 16-bit msgstr "" "generujem zastaralý 16 bitový kontrolný súèet na ochranu tajného kµúèa\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "VAROVANIE: konflikt hashu podpisu v správe\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4014,17 +4080,17 @@ msgstr "" "kµúè %08lX: toto je kµúè algoritmu ElGamal vygenerovaný v PGP - podpisy ním " "vytvorené NIE SÚ bezpeèné!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "verejný kµúè %08lX je o %lu sekund nov¹í ne¾ podpis\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "verejný kµúè %08lX je o %lu sekund nov¹í ne¾ podpis\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4033,7 +4099,7 @@ msgstr "" "kµúè %08lX bol vytvorený %lu sekund v budúcnosti (do¹lo ku zmene èasu alebo\n" "je problém so systémovým èasom)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4042,50 +4108,55 @@ msgstr "" "kµúè %08lX bol vytvorený %lu sekund v budúcnosti (do¹lo ke zmene èasu alebo\n" "je problém so systémovým èasom)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "POZNÁMKA: podpisovému kµúèu %08lX skonèila platnos» %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX 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:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "kµúè %08lX: neexistuje podkµúè pre revokáciu kµúèa\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "kµúè %08lX: neexistuje podkµúè pre viazanie kµúèov\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "VAROVANIE: nemo¾no %%-expandova» notácie (príli¹ dlhé). Pou¾ité " "neexpandované.\n" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4114,12 +4185,12 @@ msgstr "" "v móde --pgp2 mô¾ete vytvori» len oddelený podpis (detach-sign)s kµúèa vo " "formáte PGP-2.x\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4135,7 +4206,7 @@ msgstr "" "v móde --pgp2 mô¾ete vytvára» èitateµné podpisy len s kµúèmi formátu PGP-2." "x\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "bude pou¾ité ¹ifrovanie %s\n" @@ -4150,12 +4221,12 @@ msgstr "nemô¾em pracova» s riadkami dlh¹ msgid "input line longer than %d characters\n" msgstr "vstupný riadok je dlh¹í ako %d znakov\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4164,122 +4235,122 @@ msgstr "záznam v databáze dôvery %lu: zá msgid "trustdb transaction too large\n" msgstr "transakcia s databázou dôvery je príli¹ dlhá\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: nemô¾em pristupova» k: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: adresár neexistuje!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: nemô¾em vytvori» zámok\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: nemô¾em zamknú»\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: nepodarilo sa vytvori» záznam verzie: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: vytvorená neplatná databáza dôvery\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: databáza dôvery vytvorená\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "POZNÁMKA: do trustdb nemo¾no zapisova»\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: neplatná databáze dôvery\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nepodarilo sa vytvori» hashovaciu tabuµku: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: chyba pri èítaní záznamu verzie: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: chyba pri zápise záznamu verzie: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: nie je súbor databázy dôvery\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: záznam verzie s èíslom %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: neplatná verzia súboru %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, 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:1380 +#: g10/tdbio.c:1385 #, 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:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: vynulovanie záznamu zlyhalo: %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: pridanie záznamu zlyhalo: %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 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" @@ -4329,39 +4400,39 @@ msgstr "záznam dôvery %lu, typ %d: zápis msgid "trustdb: sync failed: %s\n" msgstr "databáza dôvery: synchronizácia zlyhala %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹ia kontrola databázy dôvery %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "kontrolujem databázu dôvery\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "verejný kµúè %08lX nebol nájdený: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "verejný kµúè k absolútne dôveryhodnému kµúèu %08lX nebol nájdený\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "verejný kµúè k absolútne dôveryhodnému kµúèu %08lX nebol nájdený\n" @@ -4369,7 +4440,7 @@ msgstr "verejný kµúè k absolútne dôveryh #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "kontrola v håbke %d podpísané=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4925,17 +4996,17 @@ msgstr "Prosím, opravte tento mo¾ný bezp msgid "checking keyring `%s'\n" msgstr "kontrolujem súbor kµúèov (keyring) `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "%lu kµúèov u¾ skontrolovaných (%lu podpisov)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu kµúèov skontrolovaných (%lu podpisov)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: súbor kµúèov (keyring) vytvorený\n" @@ -5037,7 +5108,7 @@ msgstr "VAROVANIE: nemô¾em vymaza» doèas msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný adresár `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "nikdy " @@ -5132,33 +5203,33 @@ msgstr "" "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:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "Prosím výberte dôvod na revokáciu:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Zru¹i»" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Pravdepodobne ste chceli vybra» %d)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 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:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Dôvod na revokáciu: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "(®iadny popis)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Je to v poriadku? " @@ -5203,6 +5274,9 @@ msgstr "chyba pri hµadaní záznamu dôvery msgid "read error: %s\n" msgstr "chyba pri èítaní: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "tento keyserver nie je plne kompatibilný s HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "" #~ "Pou¾itie tohto algoritmu sa u¾ neodporúèa - chcete ho aj tak vytvori»? " diff -urpP gnupg-1.2.2/po/sv.po gnupg-1.2.3/po/sv.po --- gnupg-1.2.2/po/sv.po 2003-05-01 14:38:31.000000000 +0000 +++ gnupg-1.2.3/po/sv.po 2003-08-21 20:05:35.000000000 +0000 @@ -15,12 +15,12 @@ # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.11.2.6 2003/05/01 11:02:45 werner Exp $ +# $Id: sv.po,v 1.11.2.11 2003/08/21 17:18:43 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.1\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" "PO-Revision-Date: 2003-04-30 18:47+0200\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -60,7 +60,7 @@ msgstr "nej" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "avsluta" @@ -288,62 +288,62 @@ msgstr "... detta är ett fel i programme msgid "you found a bug ... (%s:%d)\n" msgstr "du har hittat ett fel i programmet ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "kan inte öppna \"%s\": %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "kan inte ta status på \"%s\": %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "\"%s\" är inte än vanlig fil - ignorerad\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "notera: filen random_seed är tom\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "kan inte läsa \"%s\": %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "notera: random_seed uppdaterades inte\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "kan inte skapa \"%s\": %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "kan inte skriva till \"%s\": %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "kan inte stänga \"%s\": %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "VARNING: använder en osäker slumptalsgenerator!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -375,6 +375,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -382,7 +387,7 @@ msgid "" "of the entropy.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -390,163 +395,163 @@ msgstr "" "@Kommandon:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[fil]|skapa en signatur" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[fil]|skapa en klartext-signatur" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "skapa en signatur i en separat fil" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "kryptera data" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[filer]|kryptera filer" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "endast symetrisk kryptering" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "endast lagring" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "dekryptera data (normalläge)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[files]|dekryptera filer" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "verifiera en signatur" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "räkna upp nycklar" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "räkna upp nycklar och signaturer" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "verifiera nyckelsignaturer" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "räkna upp nycklar och fingeravtryck" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "räkna upp hemliga nycklar" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "generera ett nytt nyckelpar" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "ta bort nycklar från den offentliga (publika)nyckelringen" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "ta bort nycklar från den hemliga nyckelringen" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "signera en nyckel" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "signera en nyckel lokalt" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "signera en nyckel utan möjlighet till återkallelse" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "signera en nyckel lokalt utan möjlighet till återkallelse" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "signera eller redigera en nyckel" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "generera ett spärrcertifikat" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "exportera nycklar" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "exportera nycklar till en nyckelserver" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "importera nycklar från en nyckelserver" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "sök efter nycklar hos en nyckelserver" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "uppdatera alla nycklar nycklar från en nyckelserver" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "importera/slå ihop nycklar" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "skriv endast ut paketsekvensen" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "exportera de värden som representerar ägartillit" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "importera värden som representerar ägartillit" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "uppdatera tillitsdatabasen" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "uppdaterar tillitsdatabasen utan mänsklig tillsyn" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "reparera en korrupt tillitsdatabas" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Skala av en fil eller standard in" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Skapa ett skal för en fil eller standard in" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [filer]|skriv ut kontrollsummor" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -556,154 +561,154 @@ msgstr "" "Flaggor:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "skapa utdata med ett ascii-skal" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|NAMN|kryptera för NAMN" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|NAMN|använd NAMN som standardvärdet för mottagare" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "använd standardnyckeln som standardmottagare" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "använd denna användaridentitet för att signera eller dekryptera" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|sätt kompressionsnivån till N (0 för att slå av kompression)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "använd \"ursprunglig text\"-läget" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "använd som fil för utdata" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "utförlig" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "var något tystare" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "använd inte terminalen alls" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "använd v3-signaturer" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "använd inte v3-signaturer" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "använd v4-nyckelsignaturer" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "använd inte v4-nyckelsignaturer" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "använd alltid en MDC för kryptering" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "använd aldrig en MDC för kryptering" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "gör inga ändringar" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "" # syftar på ett användargränsnitt i ett separat program, till exempel gpa -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "använd gpg-agenten" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "batch-läge: fråga aldrig" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "anta att svaret är ja på de flesta frågor" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "anta att svaret är nej på de flesta frågor" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "lägg till denna nyckelring till listan av nyckelringar" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "lägg till denna hemliga nyckelring till listan" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "visa vilken nyckelring den listade nyckeln hör till" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|NAMN|använd NAMN som förvald hemlig nyckel" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "läs flaggor från fil" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|skriv statusinformation till denna FD" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[fil]|skriv statusinformation till fil" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|NYCKELID|lita ovillkorligen på denna nyckel" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|FIL|ladda tilläggsmodul FIL" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "imitera läget som beskrivs i RFC1991" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg " "följer OpenPGP-standarden" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg " @@ -749,7 +754,7 @@ msgstr "Visa inte fotoidentifikation" msgid "Set command line to view Photo IDs" msgstr "Sätt komandoraden för att visa fotoientifikation" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -757,7 +762,7 @@ msgstr "" "@\n" "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -777,17 +782,17 @@ msgstr "" "--list-keys [namn] visa nycklar\n" "--fingerprint [namn] visa fingeravtryck\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Rapportera gärna fel till .\n" "Rapportera gärna fel eller synpunkter på översättningen till .\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -797,7 +802,7 @@ msgstr "" "signera, kontrollera, kryptera eller dekryptera\n" "vilken operation som utförs beror på programmets indata\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -805,176 +810,170 @@ msgstr "" "\n" "Stödda algoritmer:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "" -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "" -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "" -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 #, fuzzy msgid "Compression: " msgstr "Kommentar: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "användning: gpg [flaggor] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "motstridiga kommandon\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VARNING: %s osäker ägare till %s\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "OBSERVERA: inställningsfilen \"%s\" används inte\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "OBSERVERA: inställningsfilen \"%s\" saknas\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "inställningsfil \"%s\": %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "läser flaggor från \"%s\"\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s är ingen giltig teckentabell\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s: felaktiga importalternativ %d\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "felaktiga importalternativ\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s: felaktiga exportalternativ %d\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "felaktiga exportalternativ\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte sätta exec-sökvägen till %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBSERVERA: %s är inte för normal användning!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s är inte tillåten tillsammans med %s!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "det är ingen poäng att använda %s tillsammans med %s!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "du kan bara skapa frånkopplade signaturereller klartextsignaturer\n" "tillsammans med --pgp2\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "du kan inte både signera och kryptera samtidigt tillsammans med --pgp2\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du måste använda filer (och inte rör) tillsammans med --pgp2\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "detta meddelande kanske inte kan användas av %s\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen är ogiltig\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är ogiltig\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är ogiltig\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n" @@ -985,150 +984,190 @@ msgstr "kompressionsalgoritmen måste var # är ändå litet. Eventuellt borde meddelandena inte alls # översättas för att göra eventuell felsökning lättare # för internationella felsökare -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" måste vara större än 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBSERVERA: enkelt S2K-läge (0) rekommenderas inte\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 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/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "ogiltig standardvärde för test-nivå; måste vara 0, 1, 2 eller 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "ogiltiga standardinställningar\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "felaktiga inställningar av krypteringsalgoritm\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "felaktiga inställningar av checksummealgoritm\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "felaktiga inställningar av kompressionsalgoritm\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "du kan inte använda %s när du är i %s läge\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "du kan inte använda %s när du är i %s läge\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "du kan inte använda %s när du är i %s läge\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key användaridentitet" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key användaridentitet" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key användaridentitet" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key användaridentitet" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key användaridentitet [kommandon]" # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon # fixa en patch? -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "misslyckades med att uppdatera hemligheten: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "misslyckades med att ta bort skalet: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "misslyckades med att skapa skal: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "felaktig hash-algoritm \"%s\"\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[filnamn]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Skriv ditt meddelande här ...\n" # se förra kommentaren -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan inte öppna \"%s\"\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1136,20 +1175,20 @@ msgstr "" "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n" "understrykningstecken och sluta med ett likhetstecken\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n" @@ -1294,7 +1333,7 @@ msgstr "" "Inget tillitsvärde tilldelat till:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " även känd som \"" @@ -1359,7 +1398,7 @@ msgstr " s = hoppa över denna nyckel\n" msgid " q = quit\n" msgstr " q = avsluta\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Vad väljer du? " @@ -1537,108 +1576,108 @@ msgstr "%s: hoppade över: den offentliga msgid "no valid addressees\n" msgstr "inga giltiga adresser\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "inställningen %c%lu är inte giltig\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "inställningen %c%lu är dubblerad\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "för många `%c' inställningar\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "Ogiltigt tecken i inställningssträngen\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 #, fuzzy msgid "writing direct signature\n" msgstr "skriver självsignatur\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "skriver egensignatur\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "skriver signatur knuten till nyckeln\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ogiltig nyckelstorlek; använder %u bitar\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nyckelstorleken avrundad uppåt till %u bitar\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Välj vilken typ av nyckel du vill ha:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA och ElGamal (standardvalet)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (endast signering)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (endast kryptering)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (signering och kryptering)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (endast signering)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (endast kryptering)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (signering och kryptering)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Vad väljer du? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" "very slow, and may not be as secure as the other choices.\n" msgstr "" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 #, fuzzy msgid "Create anyway? " msgstr "Vill du använda nyckeln trots det? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Felaktigt val.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1651,20 +1690,20 @@ msgstr "" " den förvalda nyckelstorleken är 1024 bitar\n" " den största föreslagna nyckelstorleken är 2048 bitar\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Vilken nyckelstorlek vill du ha? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för RSA.\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "nyckelstorleken är för liten; 768 är det minsta tillåtna värdet.\n" @@ -1676,12 +1715,12 @@ msgstr "nyckelstorleken är för liten; 76 #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1689,11 +1728,11 @@ msgstr "" "Nyckelstorlekar större än 2048 är inte att rekommendera\n" "eftersom beräkningar tar MYCKET lång tid!\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Är du säker på att du vill ha denna nyckelstorlek? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1701,18 +1740,18 @@ msgstr "" "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n" "avslöjande strålning som kan avlyssnas!\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Den efterfrågade nyckelstorleken är %u bitar\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, 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:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1729,7 +1768,7 @@ msgstr "" " 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:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1745,30 +1784,30 @@ msgstr "" " m = signaturen blir ogiltig efter n månader\n" " y = signaturen blir ogiltig efter n år\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "För hur lång tid är nyckeln giltig? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "För hur lång tid är signaturen giltig? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "ogiltigt värde\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "Giltighetstiden för %s går aldrig ut\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "Giltighetstiden för %s går ut vid följande tidpunkt: %s\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1776,11 +1815,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Stämmer detta (j/n)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1796,44 +1835,44 @@ msgstr "" " \"Gustav Vasa (Brutal kung) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Namn: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ogiltigt tecken i namnet\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Namnet får inte börja med en siffra\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "Namnet måste vara åtminstone 5 tecken långt\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "Epostadress: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "Epostadressen är ogiltig\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Ogiltigt tecken i kommentaren\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du använder teckenuppsättningen \"%s\"\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1844,28 +1883,28 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ange inte epostadressen som namn eller kommentar\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnKkEeOoAa" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Rätta först felet\n" # fel kapitalisering i originalet? -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1873,16 +1912,16 @@ msgstr "" "Du behöver en lösenmening för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "lösenmeningen upprepades inte korrekt; försök igen." -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1893,7 +1932,7 @@ msgstr "" "Jag kommer att göra det ändå. Du kan ändra din lösenmening när som helst\n" "om du använder detta program med flaggan \"--edit-key\".\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1905,53 +1944,53 @@ msgstr "" "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n" "en större chans att samla ihop en tillräcklig mängd entropi.\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Skapandet av nycklar avbröts.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentlig (publik) nyckel till \"%s\"\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "hittade ingen offentlig (publik) nyckelring: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fel vid skrivning av offentliga (publika) nyckelringen \"%s\": %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "offentlig (publik) och hemlig nyckel är skapade och signerade.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "Nyckeln har ultimat förtroende (som din egen nyckel).\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1960,13 +1999,13 @@ msgstr "" "att vilja använda kommandot \"--edit-key\" för att generera en sekundär\n" "nyckel för detta syfte.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" # c-format behövs inte i singularis -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -1974,7 +2013,7 @@ msgstr "" "nyckeln är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1982,25 +2021,25 @@ msgstr "" "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Vill du verkligen skapa? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kan inte öppna: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "fel vid skapandet av lösenmening: %s\n" @@ -2009,17 +2048,17 @@ msgstr "fel vid skapandet av lösenmening msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "kan inte använda symetriska ESK-paket pga S2K-läge\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' är redan komprimerad\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: VARNING: tom fil\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "du kan endast krypterar till RSA nycklar som är högst 2048 bitar långa i --" @@ -2035,7 +2074,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2054,439 +2093,429 @@ msgstr "" 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äge\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s krypterad för: \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, fuzzy, c-format msgid "key `%s' not found: %s\n" msgstr "användaren \"%s\" hittades inte: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, fuzzy, c-format msgid "error reading keyblock: %s\n" msgstr "fel vid läsning av \"%s\": %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "nyckeln %08lX följer inte standarden RFC2440 - överhoppad\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "nyckeln %08lX är inte skyddad - överhoppad\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - överhoppad\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "VARNING: exporterade ingenting\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "för många poster i pk-cachen - inaktiverad\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Hittade inte användaridentiteten]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Ogiltig nyckel %08lX tvingat giltig med --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2009 +#: g10/getkey.c:2072 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "det finns en hemlig nyckel tillhörande denna offentliga (publika) nyckel!\"%s" "\"!\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" "nyckel %08lX: hemlig nyckel utan offentlig (publik) nyckel - hoppade över\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "hoppar över block av typen %d\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "har behandlat %lu nycklar hittills\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "fel vid läsning av \"%s\": %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr " Totalt antal behandlade enheter: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " överhoppade nya nycklar: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " utan användaridentiteter: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " importerade: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " oförändrade: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " nya användaridentiteter: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " nya undernycklar: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " nya signaturer: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " nya spärrar av nycklar: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " antal lästa hemliga nycklar: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr "antal importerade hemliga nycklar: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "antal oförändrade hemliga nycklar: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " inte importerade: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "nyckel %08lX: ingen användaridentitet\n" # eller är det en skadad HKP-nyckel som reparerats? -#: g10/import.c:634 +#: g10/import.c:587 #, fuzzy, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "nyckel %08lX: HKP-skadad undernyckel reparerad\n" # vad innebär fnutten i slutet? -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "" "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "nyckel %08lX: inga giltiga användaridentiteter\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "detta kan bero på att det saknas en egensignatur\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "nyckel %08lX: hittade ingen offentlig (publik) nyckel: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "nyckeln %08lX: ny nyckel - överhoppad\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "skriver till \"%s\"\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n" # fixme: I appended the %s -wk -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "nyckel %08lX: importerade offentlig (publik) nyckel (\"%s\")\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "nyckel %08lX: matchar inte vår lokala kopia\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n" -#: g10/import.c:788 +#: g10/import.c:739 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "nyckel %08lX: %d nya användaridentiteter\n" -#: g10/import.c:791 +#: g10/import.c:742 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "nyckel %08lX: 1 ny signatur\n" -#: g10/import.c:794 +#: g10/import.c:745 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "nyckel %08lX: %d nya signaturer\n" -#: g10/import.c:797 +#: g10/import.c:748 #, fuzzy, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "nyckel %08lX: 1 ny undernyckel\n" -#: g10/import.c:800 +#: g10/import.c:751 #, fuzzy, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "nyckel %08lX: %d nya undernycklar\n" -#: g10/import.c:819 +#: g10/import.c:770 #, fuzzy, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "nyckel %08lX: inte förändrad\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "" "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade " "över\n" -#: g10/import.c:896 +#: g10/import.c:847 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "ingen förvald publik nyckel\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "nyckel %08lX: offentlig (publik) nyckel saknas - kan inte spärra nyckeln med " "spärrcertifikatet (revocation certificate)\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n" # fixme: I appended the %s -wk -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "nyckel %08lX: algoritmen för offentlig (publik) nyckel stöds inte (\"%s\")\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, fuzzy, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "nyckel %08lX: ogiltig egensignatur\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "nyckel %08lX: algoritmen för offentlig (publik) nyckel stöds inte\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "nyckel %08lX: ogiltig undernyckelbindning\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, fuzzy, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "nyckel %08lX: ogiltig undernyckelbindning\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "nyckel %08lX: tog bort ogiltig spärr av undernyckel\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "nyckel %08lX: hoppade över användaridentitet '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "nyckel %08lX: hoppade över undernyckel\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "nyckel %08lX: spärrcertifikat (revocation certificate) på fel plats - " "hoppade över\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" "nyckel %08lX: felaktigt spärrcertifikat (revocation certificate): %s - " "hoppade över\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "nyckel %08lX: signatur på undernyckel på fel plats - hoppade över\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, fuzzy, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "nyckel %08lX: användaridentitet hittades två gånger - slog ihop\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, fuzzy, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "nyckel %08lX: lade till spärrcertifikat (revocation certificate)\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %08lX: direct key signature added\n" msgstr "nyckel %08lX: %d nya signaturer\n" @@ -2499,29 +2528,29 @@ msgstr "[spärrad]" msgid "[self-signature]" msgstr "[egensignatur]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 felaktig signatur\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d felaktiga signaturer\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signaturer verifierades inte eftersom fel uppstod\n" @@ -2540,21 +2569,28 @@ msgstr "%d användaridentiteter utan gilt msgid "User ID \"%s\" is revoked." msgstr "Användar-ID \"%s\" är spärrat." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Är du säker på att du vill ha denna nyckelstorlek? " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Kan inte signera.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Användar-ID \"%s\" är spärrat." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "VARNING: användar-ID \"%s\" saknar egensignatur.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2563,18 +2599,18 @@ msgstr "" "Egensignaturen på \"%s\"\n" "är en signatur av PGP 2.x-typ.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Will du göra om den till en egensignatur av OpenPGP-typ? (j/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 #, fuzzy msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" @@ -2582,52 +2618,52 @@ msgstr "" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, fuzzy, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "Redan signerad av nyckeln %08lX\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 #, fuzzy msgid "Do you want to sign it again anyway? (y/N) " msgstr "Är du säker på att du vill ha denna nyckelstorlek? " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Det finns inget att signera med nyckeln %08lX\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Notera: Giltighetstiden för denna nyckel har gått ut!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Denna nyckels giltighetstid går ut vid %s.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "" "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2635,11 +2671,11 @@ msgstr "" "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-" "läge\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2648,32 +2684,36 @@ msgstr "" "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n" "personen som nämns ovan? Om du inte vet vad du ska svara, svara \"0\".\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr "" " (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (standard)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Jag har inte kontrollerat identiteten alls.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Jag har gjort viss kontroll av identiteten.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Jag har gjort en noggrann kontroll av identiteten.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2681,7 +2721,7 @@ msgstr "" "Är du verkligen säker på att du vill signera denna nyckel\n" "med din nyckel: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2689,7 +2729,7 @@ msgstr "" "\n" "Detta kommer att bli en egensignatur\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2698,7 +2738,7 @@ msgstr "" "VARNING: Signaturen kommer att markeras som icke exporterbar.\n" "\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2707,7 +2747,7 @@ msgstr "" "VARNING: Signaturen kommer att markeras som icke möjlig att återkalla.\n" "\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2716,7 +2756,7 @@ msgstr "" "Signaturen kommer att markeras som icke exporterbar.\n" "\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2725,7 +2765,7 @@ msgstr "" "Signaturen kommer att markeras som icke möjlig att återkalla.\n" "\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2733,7 +2773,7 @@ msgstr "" "\n" "Jag har inte kontrollerat identiteten alls.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2741,7 +2781,7 @@ msgstr "" "\n" "Jag har gjort viss kontroll av identiteten.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2749,34 +2789,34 @@ msgstr "" "\n" "Jag har gjort en noggrann kontroll av identiteten.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "signeringen misslyckades: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Denna nyckel är inte skyddad.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 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:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Nyckeln är skyddad.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Kan inte redigera denna nyckel: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2784,7 +2824,7 @@ msgstr "" "Skriv in den nya lösenmening för denna hemliga nyckel.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2792,556 +2832,562 @@ msgstr "" "Du vill inte ha någon lösenmening - detta är sannolikt en dålig idé!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Vill du verkligen göra detta? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "flyttar en nyckelsignatur till den rätta platsen\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "avsluta denna meny" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "spara och avsluta" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "visa denna hjälp" # skall dessa översättas? -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "visa fingeravtryck" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "räkna upp nycklar och användaridentiteter" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "välj användaridentitet N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "välj sekundär nyckel N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "räkna upp signaturer" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "signera nyckeln" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "signera nyckeln lokalt" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "signera nyckeln utan möjlighet att återkalla signaturen" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 #, fuzzy msgid "sign the key locally and non-revocably" msgstr "signera nyckeln lokalt och utan möjlighet att återkalla signaturen" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "lägg till en användaridentitet" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "lägg till bild" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "lägg till en användaridentitet med foto" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "ta bort en användaridentitet" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "ta bort bild" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "lägg till en sekundär nyckel" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "ta bort en sekundär nyckel" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "Ange spärrnyckel" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "lägg till en spärrnyckel" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "ta bort signaturer" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "ändra utgångsdatum" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primär" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "markera användar-ID:t som primärt" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "hoppa mellan utskrift av hemliga och offentliga (publika) nycklar" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "skriv ut inställningar (expertläge)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "skriv ut inställningar (utförligt)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "ange inställningslista" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "uppdaterat inställningar" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "ändra lösenmening" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" # originalet borde ha ett value -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "ändra ägartillitsvärdet" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "återkalla signaturer" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revuid" msgstr "revsig" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 #, fuzzy msgid "revoke a user ID" msgstr "lägg till en användaridentitet" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "spärra en sekundär nyckel" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "deaktivera en nyckel" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "aktivera en nyckel" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "visa bild" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "visa bild-ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "kan inte göra detta i batch-läge\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Den hemliga nyckeln finns tillgänglig.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Kommando> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Den hemliga nyckeln behövs för att göra detta.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "Använd kommandot \"toggle\" först.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Nyckeln är spärrad." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Vill du verkligen signera alla användaridentiteter? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Tips: Välj det användarid du vill signera\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "Du måste välja åtminstone en användaridentitet.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Du kan inte ta bort den sista användaridentiteten!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Vill du verkligen ta bort alla valda användaridentiteter? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Vill du verkligen ta bort denna användaridentitet? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "Du måste välja åtminstone en nyckel.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Vill du verkligen ta bort valda nycklar? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Vill du verkligen ta bort denna nyckel? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 #, fuzzy msgid "Really revoke all selected user IDs? " msgstr "Vill du verkligen ta bort alla valda användaridentiteter? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 #, fuzzy msgid "Really revoke this user ID? " msgstr "Vill du verkligen ta bort denna användaridentitet? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Vill du verkligen spärra de valda nycklarna? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Vill du verkligen spärra denna nyckel? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Vill du verkligen ändra inställningarna för alla valda användaridentiteter? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 #, fuzzy msgid "Really update the preferences? " msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)" -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "Spara ändringarna? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Avsluta utan att spara? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "uppdateringen misslyckades: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 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:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Ogiltigt kommando (försök med \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "" -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, fuzzy, c-format msgid "This key may be revoked by %s key " msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (känsligt)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX skapad: %s går ut: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " tillit: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Denna nyckel har deaktiverats" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "revoked! en undernyckel har spärrats: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- hittade förfalskad spärr av nyckeln\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? problem vid kontroll av spärren: %s\n" -#: g10/keyedit.c:1920 +#: g10/keyedit.c:1957 #, fuzzy msgid "[revoked] " msgstr "revkey" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1959 #, fuzzy msgid "[expired] " msgstr "expire" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Du kan inte ange några inställningar för ett användar-ID av PGP 2.x-typ.\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Är du säker på att du vill ha denna nyckelstorlek? " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Vill du radera denna korrekta signatur? (j/N/a)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Vill du radera denna okända signatur? (j/N/a)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Vill du verkligen radera denna egensignatur? (j/N)" # skulle lika gärna kunna heta 1 signatur va? -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "Raderade %d signatur.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "Raderade %d signaturer.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Ingenting raderat.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3350,86 +3396,86 @@ msgstr "" "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna " "nyckel inte användas i vissa versioner av PGP.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Ange ID för önskad spärrnyckel" -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Det går inte att använda en PGP 2-nyckel som spärrnyckel\n" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 +#: g10/keyedit.c:2517 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n" -#: g10/keyedit.c:2452 +#: g10/keyedit.c:2523 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n" -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Tag bort markeringar från de hemliga nycklarna.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Välj som mest en sekundär nyckel.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändrar giltighetstid för en sekundär nyckel.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "Ändrar giltighetstid för den primära nyckeln.\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Du måste välja åtminstone en användaridentitet.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, fuzzy, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "nyckel %08lX: ogiltig självsignatur\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen användaridentitet med index %d\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen sekundär nyckel med index %d\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "användaridentitet: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3438,7 +3484,7 @@ msgstr "" "\"\n" "signerad med din nyckel %08lX %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3447,16 +3493,16 @@ msgstr "" "\"\n" "lokalt signerad med din nyckel %08lX vid %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "%s-signatur från: %s\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" @@ -3464,43 +3510,43 @@ msgstr "" "signatur? (j/N)" #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Du har signerat följande användaridentiteter:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, fuzzy, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " signerad av %08lX %s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " spärrad av %08lX %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Du står i begrepp att återkalla dessa signaturer:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, fuzzy, c-format msgid " signed by %08lX at %s%s\n" msgstr " signerad av %08lX %s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Vill du verkligen skapa spärrcertifikaten? (j/N)" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Användar-ID \"%s\" är spärrat." @@ -3509,76 +3555,76 @@ msgstr "Användar-ID \"%s\" är spärrat." #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -#: g10/keylist.c:91 +#: g10/keylist.c:112 #, fuzzy msgid "Critical signature policy: " msgstr "%s-signatur från: %s\n" -#: g10/keylist.c:93 +#: g10/keylist.c:114 #, fuzzy msgid "Signature policy: " msgstr "%s-signatur från: %s\n" -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "VARNING: ogiltig notationsdata hittades\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 #, fuzzy msgid "Critical signature notation: " msgstr "Notation: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 #, fuzzy msgid "Signature notation: " msgstr "Notation: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "inte möjlig att läsa för människor" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Nyckelring" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr "[går ut: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 #, fuzzy msgid "Primary key fingerprint:" msgstr "räkna upp nycklar och fingeravtryck" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeravtryck:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 #, fuzzy msgid " Primary key fingerprint:" msgstr " Fingeravtryck:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeravtryck:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 #, fuzzy msgid " Key fingerprint =" msgstr " Fingeravtryck:" @@ -3674,104 +3720,113 @@ msgstr "OBSERVERA: avsändaren efterfråga msgid "original file name='%.*s'\n" msgstr "ursprungligt filnamn=\"%.*s\"\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "fristående spärrcertifikat - använd \"gpg --import\" för\n" "att applicera\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Notation: " # finns det någon bra svensk översättning av policy? -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Policy: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "signaturen verifierades inte\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "kan inte hantera dessa multipla signaturer\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "Det finns ingen hjälp tillgänglig" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "FELAKTIG signatur från \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Giltighetstiden har upphört för signatur från \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "Korrekt signatur från \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[osäkert]" -#: g10/mainproc.c:1491 +#: g10/mainproc.c:1514 #, fuzzy, c-format msgid "Signature expired %s\n" msgstr "%s-signatur från: %s\n" -#: g10/mainproc.c:1496 +#: g10/mainproc.c:1519 #, fuzzy, c-format msgid "Signature expires %s\n" msgstr "%s-signatur från: %s\n" -#: g10/mainproc.c:1499 +#: g10/mainproc.c:1522 #, fuzzy, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s-signatur från: %s\n" -#: g10/mainproc.c:1500 +#: g10/mainproc.c:1523 #, fuzzy msgid "binary" msgstr "primär" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" msgstr "" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 #, fuzzy msgid "unknown" msgstr "okänd version" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Kan inte verifiera signaturen: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "ingen frikopplad signatur\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "fristående signatur av klassen 0x%02x\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "signatur av den gamla (PGP 2.x) typen\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "felaktigt rotpaket hittades i proc_tree()\n" @@ -3800,76 +3855,81 @@ msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, fuzzy, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "VARNING: %s är en förlegad flagga\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, fuzzy, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "VARNING: %s är en förlegad flagga\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, fuzzy, c-format msgid "please use \"%s%s\" instead\n" msgstr "använd \"--keyserver-options %s\" istället\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "detta meddelande kanske inte kan användas av %s\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "kan inte hantera algoritm %d för offentlig (publik) nyckelhantering\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, 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" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "kunde inte få tillgång till någon gpg-agent i denna session\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "skyddsalgoritmen %d stöds inte\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 #, fuzzy msgid "problem with the agent - disabling agent use\n" msgstr "problem med agenten: agenten returnerar 0x%lx\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (huvudnyckelns identitet %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3880,32 +3940,32 @@ msgstr "" "användaren: \"%.*s\"\n" "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Repetera lösenordsfrasen\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Ange lösenmening\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "lösenmeningen är för lång\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "felaktigt svar från agenten\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "avbruten av användaren\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med agenten: agenten returnerar 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3915,20 +3975,20 @@ msgstr "" "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n" "användaren: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "kan inte fråga efter lösenmening i batch-läge\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Ange lösenmening: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Repetera lösenmeningen: " @@ -4021,8 +4081,8 @@ msgid "failed sending to `%s': status=%u msgstr "misslyckades sända till \"%s\": status=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "denna nyckelserver är inte helt kompatibel med HKP\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4062,11 +4122,11 @@ msgstr "VARNING: Upptäckte en svag nycke msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, fuzzy, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4076,20 +4136,20 @@ msgstr "" "signaturer!\n" # behövs verkligen c-format här? -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "" "den offentliga (publika) nyckeln %08lX är %lu sekund nyare än signaturen\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "" "den offentlig (publik) nyckeln %08lX är %lu sekunder nyare än signaturen\n" # c-format behövs inte i singularis -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, fuzzy, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4098,7 +4158,7 @@ msgstr "" "nyckeln är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, fuzzy, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4107,47 +4167,52 @@ msgstr "" "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "OBSERVERA: signaturnyckeln %08lX, gick ut vid %s\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, fuzzy, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "antar att signaturen är felaktig eftersom en okänd kritisk bit är satt\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "nyckel %08lX: ingen undernyckel för spärr av undernyckel\n" -#: g10/sign.c:78 +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n" + +#: g10/sign.c:84 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "Det går inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/sign.c:86 +#: g10/sign.c:92 #, fuzzy msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "Det går inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -#: g10/sign.c:134 +#: g10/sign.c:137 #, fuzzy msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "Det går inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4175,12 +4240,12 @@ msgstr "" "du kan bara skapa frånkopplade signaturereller klartextsignaturer\n" "tillsammans med --pgp2\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "kan inte skapa %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, fuzzy, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inställningarna\n" @@ -4193,7 +4258,7 @@ msgstr "signerar:" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, fuzzy, c-format msgid "%s encryption will be used\n" msgstr "dekrypteringen misslyckades: %s\n" @@ -4208,12 +4273,12 @@ msgstr "kan inte hantera text med rader msgid "input line longer than %d characters\n" msgstr "indataraden är längre än %d tecken\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n" @@ -4222,122 +4287,122 @@ msgstr "tillitsdatabasposten %lu: skrivn msgid "trustdb transaction too large\n" msgstr "tillitsdatabastransaktion för stor\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: ingen åtkomst: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: katalogen finns inte!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: kan inte skapa lås\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, fuzzy, c-format msgid "%s: can't make lock\n" msgstr "%s: kan inte skapa lås\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kan inte skapa: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: misslyckades med att skapa versionspost: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: felaktig tillitsdatabas skapad\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: tillitsdatabas skapad\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "OBS: det går inte att skriva till tillitsdatabasen\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: felaktig tillitsdatabas\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: misslyckades med att skapa hash-tabell: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: fel vid uppdatering av versionspost: %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: fel vid läsning av versionspost: %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: fel vid skrivning av versionspost: %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "tillitsdatabas: lseek misslyckades: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: detta är inte en tillitsdatabasfil\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: versionspost med postnummer %lu\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: ogiltig filversion %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: fel vid läsning av ledig post: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: fel vid läsning av katalogpost: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, 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:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n" @@ -4390,44 +4455,44 @@ msgstr "tillitspost: %lu, typ %d: kunde msgid "trustdb: sync failed: %s\n" msgstr "tillitsdatabas: synkronisering misslyckades: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, fuzzy, c-format msgid "next trustdb check due at %s\n" msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" msgstr "" # originalet borde ha ett value -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 #, fuzzy msgid "checking the trustdb\n" msgstr "ändra ägartillitsvärdet" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "hittade inte den offentliga (publika) nyckeln %08lX :%s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1619 +#: g10/trustdb.c:1643 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "" "Hittar inte den offentliga (publika) nyckeln tillhörande den ultimat " "betrodda nyckeln %08lX \n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" @@ -4437,7 +4502,7 @@ msgstr "" #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -5007,17 +5072,17 @@ msgstr "Lös detta potentiella säkerhetsp msgid "checking keyring `%s'\n" msgstr "kontrollerar nyckelringen `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "har behandlat %lu nycklar hittills (% lu signaturer)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu nycklar och %lu signaturer har kontrollerats\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: nyckelring skapad\n" @@ -5113,7 +5178,7 @@ msgstr "" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "" @@ -5208,34 +5273,34 @@ msgid "" "your machine might store the data and make it available to others!\n" msgstr "" -#: g10/revoke.c:614 +#: g10/revoke.c:615 #, fuzzy msgid "Please select the reason for the revocation:\n" msgstr "Anledning till spärren: " -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, fuzzy, c-format msgid "Reason for revocation: %s\n" msgstr "Anledning till spärren: " -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" msgstr "" -#: g10/revoke.c:702 +#: g10/revoke.c:703 #, fuzzy msgid "Is this okay? " msgstr "Vill du använda nyckeln trots det? " @@ -5284,6 +5349,9 @@ msgstr "%s: fel vid läsning av katalogpo msgid "read error: %s\n" msgstr "skal: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "denna nyckelserver är inte helt kompatibel med HKP\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "Användanadet av denna algoritm är förlegat - skapa ändå? " diff -urpP gnupg-1.2.2/po/tr.po gnupg-1.2.3/po/tr.po --- gnupg-1.2.2/po/tr.po 2003-05-01 14:38:32.000000000 +0000 +++ gnupg-1.2.3/po/tr.po 2003-08-21 20:05:37.000000000 +0000 @@ -1,12 +1,12 @@ # Turkish translations for GnuPG messages. # Copyright (C) 2003 Free Software Foundation, Inc. -# Nilgün Belma Bugüner , 2001,..., 2003. +# Nilgün Belma Bugüner , 2001, ...,2003. # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.2rc2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-04-25 04:28+0200\n" +"Project-Id-Version: gnupg 1.2.2\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-21 11:08+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" @@ -48,9 +48,9 @@ msgstr "hayır" msgid "nN" msgstr "hH" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" -msgstr "çıkış" +msgstr "quit" #: util/miscutil.c:336 msgid "qQ" @@ -275,62 +275,62 @@ msgstr "... bu bir yazılım hatası (%s msgid "you found a bug ... (%s:%d)\n" msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "rasgele bayt elde etme modülü bulunamadı\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "`%s' açılamıyor: %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "`%s' durumlanamıyor: %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' düzenli bir dosya deÄŸil - görülmedi\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "not: \"random_seed\" dosyası boÅŸ\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "\"%s\" okunamıyor: %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "bilgi: \"random_seed\" dosyası güncel deÄŸil\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "\"%s\" oluÅŸturulamıyor: %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "\"%s\" yazılamıyor: %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "\"%s\" kapatılamıyor: %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli deÄŸil!!\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -359,7 +359,12 @@ msgstr "" #: cipher/md.c:140 #, c-format msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "özümleme algoritması `%s' bu dağıtımda salt-okunurdur\n" +msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n" + +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" #: cipher/rndegd.c:204 msgid "" @@ -367,11 +372,10 @@ msgid "" "keep you from getting bored, because it will improve the quality\n" "of the entropy.\n" msgstr "" -"Lütfen bekleyin, rastgele baytlar toplanmaya çalışılıyor. Sıkıntınızı\n" -"giderecekse baÅŸka iÅŸler yapın, çünkü bu iÅŸlem sizin güvenliÄŸinizi\n" -"arttırmak için yapılıyor.\n" +"Lütfen bekleyin rasgele baytlar toplanıyor. Bu iÅŸlem sırasında baÅŸka\n" +"iÅŸlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını saÄŸlayacak.\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -379,163 +383,163 @@ msgstr "" "@Komutlar:\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[dosya]|bir imza yapar" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[dosya]|açıkça okunabilen bir imza yapar" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "bağımsız bir imza yapar" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "veriyi ÅŸifreler" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[dosyalar]|dosyalar ÅŸifrelenir" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "sadece simetrik ÅŸifre ile ÅŸifreler" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "sadece saklar" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "veri ÅŸifresini açar (öntanımlı)" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[dosyalar]|dosyaların ÅŸifresi açılır" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "bir imzayı doÄŸrular" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "anahtarları listeler" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "anahtarları ve imzaları listeler" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "anahtar imzalarını kontrol eder" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "anahtarları ve parmak izlerini listeler" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "gizli anahtarları listeler" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "yeni bir anahtar çifti üretir" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "anahtarları genel anahtar zincirinden siler" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "anahtarları gizli anahtar zincirinden siler" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "bir anahtarı imzalar" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "bir anahtarı yerel olarak imzalar" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "bir anahtarı iptal edilemez olarak imzalar" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "bir anahtarı düzenler ve imzalar" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "bir yürürlükten kaldırma sertifikası üretir" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "anahtarları gönderir" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "anahtarları bir anahtar sunucusuna gönderir" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "anahtarları bir anahtar sunucusundan indirir" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "bir anahtar sunucusunda anahtarları arar" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "anahtarları bir anahtar sunucusundan günceller" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "anahtarları indirir/katıştırır" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "sadece paketlerin silsilesini listeler" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "sahibiningüvencesi deÄŸerlerini gönderir" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "sahibiningüvencesi deÄŸerlerini indirir" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "güvence veritabanını günceller" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "bakımsız güvence veritabanının güncellemesi" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "bozulan güvence veritabanını onarır" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "Bir dosya veya standart girdinin zırhını kaldırır" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "Bir dosya veya standart girdiyi zırhlar" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -545,151 +549,151 @@ msgstr "" "Seçenekler:\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "ascii zırhlı çıktı oluÅŸturur" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|Ä°SÄ°M|Ä°SÄ°M için ÅŸifreleme yapar" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|Ä°SÄ°M|öntanımlı alıcı olarak Ä°SÄ°M kullanılır" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "imzalamak ya da ÅŸifre çözmek için bu kullanıcı kimliÄŸi kullanılır" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "kurallı metin kipini kullanır" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "çıktı dosyası olarak kullanılır" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" msgstr "çok detaylı" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "daha az detaylı" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "terminali hiç kullanma" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "v3 imzalarına zorlar" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "v3 imzalara zorlamaz" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "v4 imzalara zorlar" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "v4 imzalara zorlamaz" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "ÅŸifreleme için daima bir MDC kullanılır" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "ÅŸifreleme için asla bir MDC kullanılmaz" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "hiçbir deÄŸiÅŸiklik yapmaz" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "üzerine yazmadan önce sorar" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "gpg-agent kullan" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "önceden belirlenmiÅŸ iÅŸlemler kipi: hiç sormaz" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "soruların çoÄŸunda cevap evet farzedilir" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "soruların çoÄŸunda cevap hayır farzedilir" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "bu gizli anahtar zincirini listeye ekler" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduÄŸunu gösterir" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|Ä°SÄ°M|öntanımlı gizli anahtar olarak Ä°SÄ°M kullanılır" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|MAKÄ°NA|anahtarları aramak için bu anahtar sunucusu kullanılır" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|Ä°SÄ°M|terminal karakter setini Ä°SÄ°M olarak ayarlar" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "seçenekleri dosyadan okur" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|durum bilgisini bu FD'ye yazar" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|ANHKÄ°ML|bu anahtar son derece güvenli" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|DOSYA|geniÅŸletme modülü olarak DOSYA yüklenir" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "RFC1991 de açıklanan kipi uygular" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "tüm paket, ÅŸifre ve özümleme seçeneklerini OpenPGP tarzında ayarlar" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "tüm paket, ÅŸifre ve özümleme seçeneklerini PGP 2.x'e göre ayarlar" @@ -735,7 +739,7 @@ msgstr "Foto kimliklerini göstermez" msgid "Set command line to view Photo IDs" msgstr "Komut satırını foto kimliklerini göstermeye ayarlar" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -743,7 +747,7 @@ msgstr "" "@\n" "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -763,15 +767,15 @@ msgstr "" " --list-keys [isimler] anahtarları listeler\n" " --fingerprint [isimler] parmak izlerini gösterir\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Yazılım hatalarını lütfen adresine bildirin.\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -781,7 +785,7 @@ msgstr "" "imzalama, kontrol, ÅŸifreleme veya çözme\n" "öntanımlı iÅŸlem girilen veriye bağımlıdır\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -789,316 +793,350 @@ msgstr "" "\n" "Desteklenen algoritmalar:\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "GenAnah: " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "Åžifre: " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "Sıkıştırma: " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "kullanımı: gpg [seçenekler] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "çeliÅŸen komutlar\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "grup tanımı \"%s\" içinde = iÅŸareti yok\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de güvensiz izinler\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin iyeliÄŸi\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin izinleri\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "BÄ°LGÄ°: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "BÄ°LGÄ°: \"%s\" öntanımlı seçenek dosyası yok\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "seçenek dosyası \"%s\": %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "\"%s\"den seçenekler okunuyor\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ÅŸifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s geçerli bir karakter seti deÄŸil\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyası oluÅŸturabilir!\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i aşıyor\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "BÄ°LGÄ°: %s normal kullanım için deÄŸil!\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullanılmaz!\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 kipinde aynı anda hem imzalama hem de ÅŸifreleme yapamazsınız\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "bu ileti %s tarafından kullanılamayabilir\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "seçilen özümleme algoritması geçersiz\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan büyük olmalı\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den büyük olmalı\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "öntanımlı denetim seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "öntanımlı tercihler geçersiz\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "kiÅŸisel ÅŸifre tercihleri geçersiz\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "kiÅŸisel özümleme tercihleri geçersiz\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "kiÅŸisel sıkıştırma tercihleri geçersiz\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "UYARI: alıcılar (-r) genel anahtar ÅŸifrelemesi kullanılmadan belirtilmiÅŸ\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key KULL-KML" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key KULL-KML" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullanıcı-kimliÄŸi [komutlar]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "%s açılamadı: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullanıcı-kimliÄŸi] [anahtar-zinciri]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "gizliyi güncelleme baÅŸarısız: %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "zırhın kaldırılması baÅŸarısız: %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "zırhlama baÅŸarısız: %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritması geçersiz\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[dosyaismi]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" msgstr "Ä°letinizi yazın ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "`%s' açılamadı\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1106,29 +1144,29 @@ msgstr "" "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve " "sonuna bir '=' gelir.\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "bir niteleme deÄŸerinde kontrol karakterleri kullanılamaz\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "belirtilen sertifika güvence adresi geçersiz\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" #: g10/gpgv.c:68 msgid "take the keys from this keyring" -msgstr "anahtarlar, bu anahtar zincirinden alınır" +msgstr "anahtarlar bu anahtarlıktan alınır" #: g10/gpgv.c:70 msgid "make timestamp conflicts only a warning" -msgstr "zaman damgası çeliÅŸkilerinde sadece uyarı verilir" +msgstr "zaman damgası çeliÅŸkilerini uyarı olarak bildirir" #: g10/gpgv.c:99 msgid "Usage: gpgv [options] [files] (-h for help)" @@ -1140,7 +1178,7 @@ msgid "" "Check signatures against known trusted keys\n" msgstr "" "Kullanımı: gpg [seçenekler] [dosyalar]\n" -"Anahtarların güvenceli olduÄŸu bilinmesine raÄŸmen imzaları kontrol eder\n" +"Bilinen güvenli anahtarlara göre imzaları kontrol eder\n" #: g10/armor.c:321 #, c-format @@ -1259,7 +1297,7 @@ msgstr "" "Güven derecesi belirtilmemiÅŸ:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " den \"" @@ -1317,7 +1355,7 @@ msgstr " a = bu anahtarı atla\n" msgid " q = quit\n" msgstr " k = çık\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "Kararınız? " @@ -1494,91 +1532,91 @@ msgstr "%s: atlandı: genel anahtar ipta msgid "no valid addressees\n" msgstr "geçerli adresler yok\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "%c%lu tercihi geçersiz\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "%c%lu tercihi yinelendi\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "`%c' tercih çok fazla\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "tercih dizgesindeki karakter geçersiz\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "doÄŸrudan imza yazılıyor\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "öz-imza yazılıyor\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "anahtarı garantileyen imzayı yazıyor\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "anahtar uzunluÄŸu geçersiz; %u bit kullanılıyor\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "anahtar uzunluÄŸu %u bite yuvarlandı\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "Lütfen istediÄŸiniz anahtarı seçiniz:\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA ve ElGamal (öntanımlı)\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (yalnız imzalamak için)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (yalnız ÅŸifrelemek için)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (imzalamak ve ÅŸifrelemek için)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sadece imzalamak için)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (imzalamak ve ÅŸifrelemek için)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "Seçiminiz? " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1588,15 +1626,15 @@ msgstr "" "Bu anahtarı PGP kullanıcıları ile haberleÅŸmek için kullanamayacaksınız\n" "Bu algoritma ayrıca çok yavaÅŸ ve diÄŸer seçimler kadar güvenli olmayabilir.\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "Yine de oluÅŸturulsun mu? " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Seçim geçersiz.\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1609,20 +1647,20 @@ msgstr "" " öntanımlı anahtar uzunluÄŸu: 1024 bit\n" " önerilebilecek en büyük anahtar uzunluÄŸu: 2048 bit\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA anahtarının uzunluÄŸu 512 ile 1024 bit arasında olabilir\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" "anahtar uzunluÄŸu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "anahtar uzunluÄŸu çok küçük; en küçük anahtar uzunluÄŸu 768 bit'tir.\n" @@ -1634,12 +1672,12 @@ msgstr "anahtar uzunluÄŸu çok küçük; #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "anahtar uzunluÄŸu çok büyük; izin verilen en büyük deÄŸer: %d bit\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1647,11 +1685,11 @@ msgstr "" "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n" "2048 bitten fazlası tavsiye edilmez.\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "Bu anahtar uzunluÄŸunu istediÄŸinizden emin misiniz? " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1659,17 +1697,17 @@ msgstr "" "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından " "kendinizi uzak tutun! (ne demekse...)\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "%u bite yuvarlandı\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1685,7 +1723,7 @@ msgstr "" " m = anahtar n ay geçerli\n" " y = anahtar n yıl geçerli\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1701,30 +1739,30 @@ msgstr "" " m = imza n ay geçerli\n" " y = imza n yıl geçerli\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "Anahtar ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "Ä°mza ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "deÄŸer hatalı\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s hep geçerli olacak\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s %s sonra geçersiz olacak\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1732,11 +1770,11 @@ msgstr "" "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:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "Bu doÄŸru mu? (e/h)? " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1752,44 +1790,44 @@ msgstr "" "\t\"Fatih Sultan Mehmed (Padisah) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "Adınız ve Soyadınız: " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "Ad ve soyadınızda geçersiz karakter var\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "Ad ve soyadınız bir rakamla baÅŸlamamalı\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 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:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "E-posta adresiniz: " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "geçerli bir E-posta adresi deÄŸil\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "Önbilgi: " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "Önbilgi alanında geçersiz karakter var\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "`%s' karakter kümesini kullanıyorsunuz.\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1800,29 +1838,29 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "AaYyEeTtKk" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 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:1340 +#: g10/keygen.c:1350 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:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "Lütfen önce hatayı düzeltin\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1830,18 +1868,18 @@ msgstr "" "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "" "ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " "tekrarlanacak" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1853,7 +1891,7 @@ msgstr "" "seçeneÄŸi ile kullanarak her zaman deÄŸiÅŸtirebilirsiniz.\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1866,53 +1904,53 @@ msgstr "" "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n" "üretecine yardımcı olur. \n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA anahtar çifti 1024 bit olacak.\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "Anahtar üretimi durduruldu.\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "genel anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, 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:2265 +#: g10/keygen.c:2285 #, 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:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "anahtar son derece güvenli olarak imlendi.\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1920,19 +1958,19 @@ msgstr "" "Bu anahtar ÅŸifreleme için kullanılamaz. Åžifreleme için ikinci bir anahtarı\n" "\"--edit-key\" seçeneÄŸini kullanarak üretebilirsiniz.\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, 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:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -1940,26 +1978,26 @@ msgstr "" "anahtar bundan %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 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:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "Gerçekten oluÅŸturulsun mu? " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output seçeneÄŸi bu komutla çalışmaz\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: açılamıyor: %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "anahtar parolası oluÅŸturulurken hata: %s\n" @@ -1968,17 +2006,17 @@ msgstr "anahtar parolası oluÅŸturulurke msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' zaten sıkıştırılmış\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: UYARI: dosya boÅŸ\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile ÅŸifreleme " @@ -1994,7 +2032,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "tüm anahtarları ÅŸifrelemek için IDEA ÅŸifresi kullanılamaz.\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" @@ -2012,438 +2050,429 @@ msgstr "" msgid "you may not use %s while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s \"%s\" için ÅŸifrelendi\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "anahtar `%s' yok: %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "anahtar bloÄŸu okunurken hata: %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "%08lX anahtarı: bir RFC2440 anahtarı deÄŸil - atlandı\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "%08lX anahtarı: korunmamış - atlandı\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "UYARI: gizli anahtar %08lX basit bir SK saÄŸlamasına sahip deÄŸil\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "UYARI: hiçbir ÅŸey dışarı aktarılmadı\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "pk belleÄŸinde çok fazla girdi - iptal edildi\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[Kullanıcı kimliÄŸi bulunamadı]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli " "oldu\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n" +msgstr "" +"yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "%d. tür blok atlandı\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "ÅŸu ana kadar herÅŸey yolunda giderek %lu anahtar iÅŸlenmiÅŸ\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "\"%s\" okunurken hata: %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Ä°ÅŸlenmiÅŸ toplam miktar: %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " yeni anahtarlar atlandı: %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " kullanıcı kimliksiz: %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" -msgstr " indirildi: %lu" +msgstr " alınan: %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " deÄŸiÅŸmedi: %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " yeni kullanıcı kimliÄŸi: %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " yeni yardımcı anahtarlar: %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " yeni imzalar: %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " yeni anahtar iptalleri: %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " gizli anahtarlar okundu: %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " gizli anahtarlar indirildi: %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " gizli anahtarlar deÄŸiÅŸmedi: %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " alınamadı: %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" "BÄ°LGÄ°: Elgamal birincil anahtarı saptandı - alınması biraz zaman alacak\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi yok\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliÄŸi '%s' kabul edildi\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi geçersiz\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "anahtar %08lX: yeni anahtar - atlandı\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "yazılabilir bir anahtar zinciri yok: %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "\"%s\"e yazıyor\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "\"%s\" anahtar zincirine yazarken hata oluÅŸtu: %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "anahtar %08lX: bizim kopyamızla eÅŸleÅŸmiyor\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliÄŸi\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliÄŸi\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "anahtar %08lX: \"%s\" %d yeni imza\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "anahtar %08lX: \"%s\" deÄŸiÅŸmedi\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "%08lX anahtarı: geçersiz ÅŸifreli (%d) gizli anahtar - atlandı\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "öntanımlı gizli anahtar zinciri yok: %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "anahtar %08lX: gizli anahtar indirildi\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "anahtar %08lX: genel anahtar deÄŸil - yürürlükten kaldırma sertifikası " "uygulanamaz\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "anahtar %08lX: imza için kullanıcı kimliÄŸi yok\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliÄŸi \"%s\" için " "desteklenmiyor\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi \"%s\" için öz-imza geçersiz\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "anahtar %08lX: çok sayıda yardımcı anahtar baÄŸlantısı silindi\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "" "anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "" "anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "anahtar %08lX: kullanıcı kimliÄŸi atlandı: '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "anahtar %08lX: yardımcı anahtar atlandı\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "anahtar %08lX: imza gönderilebilir deÄŸil (%02x sınıfı) - atlandı\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "anahtar %08lX: çift kullanıcı kimliÄŸi saptandı - katıştırıldı\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" "UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma " "anahtarı %08lX alınıyor\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" "UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma " "anahtarı %08lX mevcut deÄŸil.\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "anahtar %08lX: doÄŸrudan anahtar imzası eklendi\n" @@ -2456,29 +2485,29 @@ msgstr "[yürürlükten kaldırma]" msgid "[self-signature]" msgstr "[öz-imza]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 kötü imza\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d kötü imza\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 imza bir hata yüzünden kontrol edilmedi\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d imza hatalardan dolayı kontrol edilmedi\n" @@ -2497,20 +2526,27 @@ msgstr "%d öz-imzası geçersiz kullanÄ msgid "User ID \"%s\" is revoked." msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " Ä°mzalanamıyor.\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "UYARI: kullanıcı kimliÄŸi \"%s\" öz-imzalı deÄŸil.\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2519,27 +2555,27 @@ msgstr "" "\"%s\" üzerindeki öz-imza\n" "bir PGP 2.x tarzı imza.\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" "\"%s\" üzerindeki imzanızın\n" -"süresi dolmuÅŸ.\n" +"kullanım süresi dolmuÅŸ.\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" -"Süresi dolan imzanızın yenisiyle deÄŸiÅŸtirilmesini ister misiniz? (E/h) " +"Yeni imzanızın süresi dolmuÅŸ biriyle deÄŸiÅŸtirilmesini ister misiniz? (e/H) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2548,44 +2584,44 @@ msgstr "" "\"%s\" üzerindeki imzanız\n" "dahili bir imza.\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "" "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " -msgstr "Onu yine de tekrar imzalamak istiyor musunuz? (e/H) " +msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "%08lX anahtarı ile imzalanacak hiçbir ÅŸey yok\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "Bu anahtarın kullanım süresi dolmuÅŸ!" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitiyor.\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Ä°mzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2593,11 +2629,11 @@ msgstr "" "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası " "uygulanamayabilir.\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2606,31 +2642,35 @@ msgstr "" "Bu anahtarın ismi yukarda yazılı kiÅŸiye ait olduÄŸunu ne kadar dikkatli\n" "doÄŸruladınız? Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) Cevabı bilmiyorum. %s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (öntanımlı)" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) Tamamen kontrol edildi.%s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) Ä°liÅŸkisel denetim yaptım.%s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2638,7 +2678,7 @@ msgstr "" "Bu anahtarı kendi anahtarınızla imzalamak istediÄŸinize gerçekten\n" "emin misiniz?: \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2646,7 +2686,7 @@ msgstr "" "\n" "Bu bir öz-imza olacak.\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2654,7 +2694,7 @@ msgstr "" "\n" "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2662,7 +2702,7 @@ msgstr "" "\n" "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2670,7 +2710,7 @@ msgstr "" "\n" "Ä°mza dışarı gönderilemez olarak imlenecek.\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2678,15 +2718,15 @@ msgstr "" "\n" "Ä°mza yürürlükten kaldırılamaz olarak imlenecek.\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" msgstr "" "\n" -"Her ÅŸeyiyle bu anahtarı kontol edemedim.\n" +"Her ÅŸeyiyle bu anahtarı kontrol edemedim.\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2694,7 +2734,7 @@ msgstr "" "\n" "Bu anahtarı karşılaÅŸtırmalı kontrol ettim.\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2702,34 +2742,34 @@ msgstr "" "\n" "Bu anahtarı çok dikkatli kontrol ettim.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "Gerçekten imzalayacak mısınız? " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "imzalama baÅŸarısız: %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "Bu anahtar korunmamış.\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "Anahtar korunmuÅŸ.\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2737,7 +2777,7 @@ msgstr "" "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2745,496 +2785,494 @@ msgstr "" "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "Gerçekten bunu yapmak istiyor musunuz? " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "bir anahtar imzası doÄŸru yere taşınıyor\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "bu menüden çık" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "k" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" -msgstr "kaydet" +msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "kaydet ve çık" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" -msgstr "yardım" +msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "bunu gösterir " -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" -msgstr "piz" +msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" -msgstr "parmak izini göster" +msgstr "parmak izini gösterir" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" -msgstr "listele" +msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" -msgstr "anahtarı ve kullanıcı kimliÄŸini göster" +msgstr "anahtarı ve kullanıcı kimliÄŸini gösterir" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" -msgstr "kullkim" +msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "N kullanıcı kimliÄŸini seçer" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" -msgstr "anahtar" +msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "N yardımcı anahtarını seçer" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" -msgstr "kontrol" +msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" -msgstr "imzaları listele" +msgstr "imzaları listeler" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "k" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" -msgstr "imzala" +msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "anahtarı imzalar" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "i" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" -msgstr "yimza" +msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "anahtarı yerel olarak imzala" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" -msgstr "yksızimza" +msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" -msgstr "yürürlükten kaldırılamayan imza" +msgstr "yürürlükten kaldırılamayan imza yapar" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" -msgstr "içyksızimza" +msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" -msgstr "yürürlükten kaldırılamayan yerel imza" +msgstr "yürürlükten kaldırılamayan yerel imza yapar" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" -msgstr "hata ayıklama" +msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" -msgstr "kullkimEkle" +msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "bir kullanıcı kimliÄŸi ekler" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" -msgstr "fotoekle" +msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "bir foto kimliÄŸi ekler" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" -msgstr "kullkimSil" +msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "kullanıcı kimliÄŸini siler" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" -msgstr "fotosil" +msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" -msgstr "anhEkle" +msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "bir yardımcı anahtar ekler" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" -msgstr "anhSil" +msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "bir yardımcı anahtar siler" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" -msgstr "iptalEkle" +msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "bir yürürlükten kaldırma anahtarı ekler" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" -msgstr "imzaSil" +msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "imzaları siler" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" -msgstr "sontarih" +msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "son kullanım tarihini deÄŸiÅŸtirir" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" -msgstr "asıl" +msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "kullanıcı kimliÄŸini asıl olarak imler" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" -msgstr "seçmece" +msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "genel ve gizli anahtar listeleri arasında yer deÄŸiÅŸtirir" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "b" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" -msgstr "önayar" +msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "tercihleri listeler (uzman)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" -msgstr "tercihgöst" +msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "tercihleri listeler (ayrıntılı)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" -msgstr "tercihyap" +msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "tercih listesi oluÅŸturmak için" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" -msgstr "tercgüncel" +msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "güncelenmiÅŸ tercihler" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" -msgstr "aparola" +msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "anahtar parolasını deÄŸiÅŸtirir" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" -msgstr "güvence" +msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "sahibiningüvencesini deÄŸiÅŸtirir" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" -msgstr "imzayürkal" +msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "imzaları yürürlükten kaldırır" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" -msgstr "kulkimsil" +msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" -msgstr "bir kullanıcı kimliÄŸi iptal eder" +msgstr "bir kullanıcı kimliÄŸi yürürlükten kaldırır" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" -msgstr "yürkalanh" +msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "bir yardımcı anahtarı yürürlükten kaldırır" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" -msgstr "iptal" +msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "bir anahtarı iptal eder" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" -msgstr "kullan" +msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "bir anahtarı kullanıma sokar" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" -msgstr "fotogöst" +msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "foto kimliÄŸini gösterir" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "bu önceden belirlenmiÅŸ iÅŸlemler kipinde (in batchmode) yapılamaz\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "gizli anahtar bloÄŸu `%s' okunurken hata oluÅŸtu: %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "Gizli anahtar mevcut.\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "Komut> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "Bunu yapmak için gizli anahtar gerekli.\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "Anahtar yürürlükten kaldırıldı." -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "Ä°pucu: Ä°mzalamak için bir kullanıcı kimliÄŸi seçiniz\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s kipindeyken bu komut kullanılamaz.\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "En az bir kullanıcı kimliÄŸi seçmelisiniz.\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "Son kullanıcı kimliÄŸini silemezsiniz!\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "Bu kullanıcı kimliÄŸi gerçekten silinecek mi? " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "En az bir anahtar seçmelisiniz.\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "Bu kullanıcı kimliÄŸi gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "" "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor " "musunuz? " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "Kaydetmeden çıkılsın mı? " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "gizliyi güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "Güncelleme gereÄŸi olmadığından anahtar deÄŸiÅŸmedi.\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "Özümlenen: " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "Özellikler: " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "" "Bu anahtar %s tarafından ÅŸu anahtarla yürürlükten kaldırılmış olabilir: " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " (duyarlı)" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "%s%c %4u%c/%08lX üretildi: %s son kullanma tarihi: %s" +msgstr "%s%c %4u%c/%08lX üretildi: %s zamanaşımı: %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" -msgstr " güven derecesi: %c/%c" +msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "Bu anahtar iptal edilmiÅŸti" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "yürkalanh" +msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "sontarih" +msgstr "[süresi doldu] " -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 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:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3242,7 +3280,13 @@ msgstr "" "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:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3251,45 +3295,45 @@ msgstr "" "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:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "Onu yine de eklemek istiyor musunuz? (e/H) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 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:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "Bu geçersiz imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "Hiçbir ÅŸey silinmedi.\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3299,18 +3343,18 @@ msgstr "" " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n" " ile sonuçlanabilir.\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 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:2402 +#: g10/keyedit.c:2473 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:2417 +#: g10/keyedit.c:2488 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ı " @@ -3319,75 +3363,73 @@ msgstr "" #. 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:2427 +#: g10/keyedit.c:2498 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:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak " -"kullanamazsınız\n" +"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar baÅŸka amaçla\n" +" kullanılamaz!\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " msgstr "" -"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak " -"kullanamazsınız\n" +"bir anahtarın, yürürlükten kaldıran anahtar olmasını istediÄŸinizden emin " +"misiniz? (e/H): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "Bir yardımcı anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 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:2571 +#: g10/keyedit.c:2645 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:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, 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:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "%d endeksine sahip yardımcı anahtar yok\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "Kullanıcı kimliÄŸi: \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3396,7 +3438,7 @@ msgstr "" "\"\n" " %08lX anahtarınızla %s de imzalandı\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3405,130 +3447,130 @@ msgstr "" "\"\n" "%08lX anahtarınızla %s de yerel olarak imzalı\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 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:3052 +#: g10/keyedit.c:3128 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) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " %08lX ile %s%s%s de imzalanmış\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " %08lX tarafından %s de yürürlükten kaldırılmış\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " %08lX ile %s%s de imzalanmış\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 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:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "gizli anahtar yok\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "Kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" +msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" #. Okay, this is a problem. The user ID selfsig was #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, 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:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" "Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliÄŸi " "gösteriliyor\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "Kritik imza guvencesi: " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "imza guvencesi: " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "UYARI: geçersiz niteleme verisi bulundu\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "Kritik imza niteleyici: " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "imza niteleyici: " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "insan okuyabilir deÄŸil" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Anahtar Zinciri" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr "[son kullanma tarihi: %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " Anahtar parmak izi =" @@ -3615,102 +3657,111 @@ msgstr "BÄ°LGÄ°: gönderen \"yalnız-gö msgid "original file name='%.*s'\n" msgstr "özgün dosya adı = '%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "Niteleme: " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "Güvence: " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "imza doÄŸrulama engellendi\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "bu çoklu imzalar elde edilemiyor\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliÄŸi ile yapıldı\n" +msgstr "" +"%.*s imzası, %s anahtarı ve\n" +" %08lX kullanıcı kimliÄŸi ile yapılmış\n" + +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "yardım mevcut deÄŸil" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "KÖTÃœ imza: \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "Kullanım tarihi geçmiÅŸ imza: \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" -msgstr "DoÄŸru imza: \"" +msgstr "Kullanıcı kimliÄŸi: \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[şüpheli]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" -msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" +msgstr "Bu imzanın geçerliliÄŸi %s de bitti.\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" +msgstr "Bu imzanın geçerliliÄŸi %s de bitecek.\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s imza: \"%s\"den\n" +msgstr "%s imzası, %s özümleme algoritması\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "asıl" +msgstr "ikili" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "metinkipi" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "bilinmeyen sürüm" +msgstr "bilinmeyen" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "Ä°mza kontrol edilemedi: %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "bir bağımsız imza deÄŸil\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "0x%02x sınıfı tek başına imza\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "eski stil (PGP 2.x) imza\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() içinde geçersiz kök paket saptandı\n" @@ -3740,75 +3791,80 @@ msgstr "" "adresine\n" "bakınız.\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, 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:513 +#: g10/misc.c:537 #, 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:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "lütfen yerine \"%s%s\" kullanınız\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "bu ileti %s tarafından kullanılamayabilir\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "%d genel anahtar algoritması kullanılamadı\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d tipi alt paket kritik bit kümesine sahip\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent bu oturumda kullanılamaz\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "istemci pid'i belirlenemiyor\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO çevre deÄŸiÅŸkeni hatalı\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna baÄŸlanılamadı: %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleÅŸme problemi\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (asıl anahtar kimliÄŸi %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3819,32 +3875,32 @@ msgstr "" "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n" "%u bitlik %s anahtarı, kimlik %08lX, oluÅŸturulan %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "Parolayı tekrar yazınız\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "Anahtar parolasını giriniz\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "Parola çok uzun\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "yanıt geçersiz\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "kullanıcı tarafından durduruldu\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3854,20 +3910,22 @@ msgstr "" "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n" "Anahtarın sahibi: \"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "%u bitlik %s anahtarı, kimlik: %08lX, oluÅŸturuldu %s" +msgstr "" +"%u bitlik %s anahtarı, %08lX kimliÄŸi ile\n" +"%s tarihinde üretilmiÅŸ" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "önceden tanımlanmış iÅŸlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "Anahtar parolasını girin: " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -3959,8 +4017,8 @@ msgid "failed sending to `%s': status=%u msgstr "\"%s\" adresine gönderme iÅŸlemi baÅŸarısız (durum=%u)\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "bu anahtar sunucusu tamamen HKP uyumlu deÄŸil\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -4002,11 +4060,11 @@ msgstr "" "gizli anahtarın güvenliÄŸi için eski tarz 16 bitlik saÄŸlama toplamı " "üretiliyor\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "UYARI: iletideki imza özümlemesi çeliÅŸkili\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -4015,17 +4073,17 @@ msgstr "" "anahtar %08lX: Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal " "anahtarı!\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni.\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -4034,7 +4092,7 @@ msgstr "" "%08lX anahtarı %lu saniye gelecekte üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -4043,57 +4101,53 @@ msgstr "" "%08lX anahtarı %lu saniye gelecekte üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "BÄ°LGÄ°: %08lX imza anahtarının kullanım süresi %s sularında dolmuÅŸ\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" "hatalı imzanın bilinmeyen bir kritik bitten dolayı %08lX anahtarından " "kaynaklandığı sanılıyor\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" "anahtar %08lX: anahtarı yürürlükten kaldıracak yardımcı anahtar paketi yok\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "" -"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " -"olarak atanamaz\n" +msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "" -"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " -"olarak atanamaz\n" +msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" "UYARI: %%-geniÅŸletmesi imkansız (çok büyük).\n" "Uzatılmadan kullanılıyor.\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "" -"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " -"olarak atanamaz\n" +msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "" +msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" @@ -4121,12 +4175,12 @@ msgid "you can only detach-sign with PGP msgstr "" "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "%s oluÅŸturulamıyor: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" @@ -4139,9 +4193,11 @@ msgstr "imzalanıyor:" #: g10/sign.c:895 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imza yapabilirsiniz\n" +msgstr "" +"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama " +"yapabilirsiniz\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s ÅŸifrelemesi kullanılmayacak\n" @@ -4156,12 +4212,12 @@ msgstr "%d karakterden daha uzun metin s msgid "input line longer than %d characters\n" msgstr "girdi satırı %d karakterden daha uzun\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, 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:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, 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" @@ -4170,122 +4226,122 @@ msgstr "güvence veritabanı %lu kaydı: msgid "trustdb transaction too large\n" msgstr "güvence veritabanı iÅŸlemi çok uzun\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: eriÅŸilemedi: %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: dizin yok!\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: kilit oluÅŸturulamadı\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: kilitleme yapılamadı\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: oluÅŸturulamadı: %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: sürüm kaydı oluÅŸturmada baÅŸarısız: %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: geçersiz güvence veritabanı oluÅŸturuldu\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: güvence veritabanı oluÅŸturuldu\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "BÄ°LGÄ°: güvence veritabanına yazılamıyor\n" -#: g10/tdbio.c:579 +#: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s: güvence veritabanı geçersiz\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: nitelemeli tablo oluÅŸturulamadı: %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, 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:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, 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:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, 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:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "güvence veritabanı: eriÅŸim baÅŸarısız: %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, 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:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: bir güvence veritabanı dosyası deÄŸil\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, 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:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: dosya sürümü %d geçersiz\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: serbest kaydı okuma hatası: %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: dizin kaydını yazma hatası: %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, 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:1420 +#: g10/tdbio.c:1425 #, 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:1465 +#: g10/tdbio.c:1470 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" @@ -4335,39 +4391,38 @@ msgstr "güvence veritabanının %lu. ka msgid "trustdb: sync failed: %s\n" msgstr "güvence veritabanı: eÅŸzamanlama baÅŸarısız: %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "sonraki güvence veritabanı denetimi %s de\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "lütfen bir --check-trustdb yapın\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "güvence veritabanı denetleniyor\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "%08lX genel anahtarı yok: %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "son derece güvenli %08lX genel anahtarı yok\n" +msgstr "son derece güvenli bir anahtar yok\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "son derece güvenli %08lX genel anahtarı yok\n" @@ -4375,7 +4430,7 @@ msgstr "son derece güvenli %08lX genel #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" @@ -4921,17 +4976,17 @@ msgstr "Lütfen bu güvenlik çatlağın msgid "checking keyring `%s'\n" msgstr "`%s' anahtar zinciri denetleniyor\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "ÅŸimdiye dek %lu anahtar denetlendi (%lu imza)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "%lu anahtar denetlendi (%lu imza)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: anahtar zinciri oluÅŸturuldu\n" @@ -4945,42 +5000,40 @@ msgid "" "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" "\n" -"Foto kimliÄŸiniz için kullanılacak bir resim. Resim bir JPEG dosya " -"olmalıdır.\n" -"Resim genel anahtarınızın içinde saklanacağından büyük bir resim dosyası\n" -"kullanırsanız, anahtarınız çok büyük olacaktır.\n" -"Resim yaklaşık olarak 240x288 boyutlarında olursa iyi olur.\n" +"Foto kimliÄŸi olarak kullanılmak üzere bir resim seçiniz. Resim bir JPEG\n" +"dosyası olmalıdır. Bu resim genel anahtarınızda saklanacağından, çok büyük\n" +"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:79 msgid "Enter JPEG filename for photo ID: " -msgstr "Foto KimliÄŸinin JPEG dosya ismini girin: " +msgstr "Foto kimliÄŸi için JPEG dosya ismini giriniz: " #: g10/photoid.c:87 #, c-format msgid "Unable to open photo \"%s\": %s\n" -msgstr "Foto \"%s\" açılamıyor: %s\n" +msgstr "\"%s\" resmi açılamıyor: %s\n" #: g10/photoid.c:97 msgid "Are you sure you want to use it (y/N)? " -msgstr "Onu kullanamak istediÄŸinizden emin misiniz? (e/H) " +msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " #: g10/photoid.c:112 #, c-format msgid "\"%s\" is not a JPEG file\n" -msgstr "\"%s\": bir JPEG dosyası deÄŸil\n" +msgstr "\"%s\" bir JPEG dosyası deÄŸil\n" #: g10/photoid.c:129 msgid "Is this photo correct (y/N/q)? " -msgstr "Bu foto doÄŸru mu? (e/H/s)? " +msgstr "Bu foto doÄŸru mu? (e/H/ç)? " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" +msgstr "foto kimliÄŸi gösterilemiyor!\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" -msgstr "uzaktan program çalıştırma desteÄŸi yok\n" +msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n" #: g10/exec.c:184 #, c-format @@ -4991,55 +5044,55 @@ msgstr "`%s' dizini oluÅŸturulamıyor: % msgid "" "external program calls are disabled due to unsafe options file permissions\n" msgstr "" -"harici program çaÄŸrıları güvensiz seçenekler dosyası izinlerinden dolayı " -"iptal edildi\n" +"güvensiz options dosyası yetkilerinden dolayı dış program çaÄŸrıları iptal\n" +"edildi\n" #: g10/exec.c:355 msgid "this platform requires temp files when calling external programs\n" msgstr "" -"bu platform harici programları çağırırken geçici dosyalara ihtiyaç duyuyor\n" +"bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n" #. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" -msgstr "%s \"%s\" çalıştırılamıyor: %s\n" +msgstr " %s \"%s\" çalıştırılamıyor: %s\n" #: g10/exec.c:513 #, c-format msgid "system error while calling external program: %s\n" -msgstr "harici program çaÄŸrılırken sistem hatası: %s\n" +msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n" #: g10/exec.c:524 g10/exec.c:583 msgid "unnatural exit of external program\n" -msgstr "harici programın doÄŸal olmayan çıkışı\n" +msgstr "Dış uygulamamnın doÄŸal olmayan çıkışı\n" #: g10/exec.c:539 msgid "unable to execute external program\n" -msgstr "harici program çalıştırılamadı\n" +msgstr "dış uygulama çalıştırılamıyor\n" #: g10/exec.c:548 #, c-format msgid "unable to read external program response: %s\n" -msgstr "harici programın yanıtı okunamadı: %s\n" +msgstr "dış uygulamanın yanıtı okunamıyor: %s\n" #: g10/exec.c:594 g10/exec.c:601 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "UYARI: geçici dosya kaldırılamadı (%s) `%s': %s\n" +msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n" #: g10/exec.c:606 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" -msgstr "UYARI: `%s' geçici dizini silinemedi: %s\n" +msgstr "UYARI: %s geçici dizini silinemiyor: %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " -msgstr "asla " +msgstr "asla " #: g10/revoke.c:92 msgid "key incomplete\n" -msgstr "anahtar eksik\n" +msgstr "anahtarın içi boÅŸ\n" #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 #: g10/revoke.c:186 g10/revoke.c:568 @@ -5050,11 +5103,11 @@ msgstr "build_packet baÅŸarısız: %s\n" #: g10/revoke.c:145 #, c-format msgid "key %08lX incomplete\n" -msgstr "anahtar %08lX eksik\n" +msgstr "anahtar %08lX: içi boÅŸ\n" #: g10/revoke.c:214 g10/revoke.c:433 msgid "sorry, can't do this in batch mode\n" -msgstr "bu, betik kipinde yapılamaz\n" +msgstr "pardon, bu betik kipinde yapılamaz\n" #: g10/revoke.c:281 msgid "To be revoked by:\n" @@ -5062,15 +5115,15 @@ msgstr "Yürürlükten kaldıran:\n" #: g10/revoke.c:293 msgid "(This is a sensitive revocation key)\n" -msgstr "(Bu bir duyarlı yürürlükten kadırma anahtarı)\n" +msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n" #: g10/revoke.c:297 g10/revoke.c:503 msgid "Create a revocation certificate for this key? " -msgstr "Bu anahtar için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? " +msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? " #: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "ASCII zırhlı çıktı yapılacak.\n" +msgstr "ASCII zırhlı çıktı istendi.\n" #: g10/revoke.c:324 g10/revoke.c:548 #, c-format @@ -5080,7 +5133,7 @@ msgstr "make_keysig_packet baÅŸarısız: #. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" -msgstr "Yürürlükten kaldırma sertifikası oluÅŸturuldu.\n" +msgstr "Yürürlükten kaldırma sertifikası üretildi.\n" #: g10/revoke.c:393 #, c-format @@ -5095,15 +5148,15 @@ msgstr "gizli anahtar `%s' yok: %s\n" #: g10/revoke.c:485 #, c-format msgid "no corresponding public key: %s\n" -msgstr "ilgili genel anahtarı yok: `%s\n" +msgstr "karşılığı olan genel anahtar yok: `%s\n" #: g10/revoke.c:496 msgid "public key does not match secret key!\n" -msgstr "genel anahtar, gizli anahtarla eÅŸleÅŸmiyor!\n" +msgstr "genel anahtar gizli anahtarla uyuÅŸmuyor!\n" #: g10/revoke.c:519 msgid "unknown protection algorithm\n" -msgstr "bilinmeyen koruma algoritması\n" +msgstr "bilinmeyen sıkıştırma algoritması\n" #: g10/revoke.c:523 msgid "NOTE: This key is not protected!\n" @@ -5120,42 +5173,42 @@ msgid "" "your media become unreadable. But have some caution: The print system of\n" "your machine might store the data and make it available to others!\n" msgstr "" -"Yürürlükten kaldırma setifikası oluÅŸturuldu.\n" +"Yürürlükten kaldırma sertifikası üretildi.\n" "\n" -"Lütfen onu herkesin eriÅŸemeyeceÄŸi bir ortama taşıyın; EÄŸer Mallory\n" -"bu setifikaya eriÅŸebilirse onu anahtarınızı kullanışsız yapmakta\n" -"kullanabilir. Saklama ortamının da bozulabileceÄŸi gözönüne alınırsa\n" -"bu sertifikayı yazdırıp saklamak daha iyi olur. Ama dikkat: Yazdırma\n" -"sisteminiz gizlilik gerektiren bu bilgiyi herkesin okuyabileceÄŸi\n" -"duruma getirmesin!\n" +"Sertifika baÅŸkalarının kolayca eriÅŸebileceÄŸi yerlerde saklanmamalıdır.\n" +"Aksi takdirde, yürürlükten kaldırma sertifikanız bilginiz dışında\n" +"yayınlandığında geçerli olan genel anahtarınızın geçersiz hale gelebilir.\n" +"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n" +"bir kasada da muhafaza edebilirsiniz.\n" -#: g10/revoke.c:614 +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" -msgstr "Lütfen yürürlükten kaldırma sebebini seçiniz:\n" +msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "Ä°ptal" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "(%d 'i belki burada seçmek istersiniz)\n" +msgstr "(Burada %d seçtiÄŸiniz varsayılıyor)\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "Bir istemlik açıklama girin ve boÅŸ bir satır ile sonlandırın:\n" +msgstr "" +"Ä°steÄŸe baÄŸlı açıklamayı girebilirsiniz; BoÅŸ bir satır iÅŸlemi sonlandırır:\n" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "Yürürlükten kaldırma sebebi: %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" -msgstr "(Açıklama verilmemiÅŸ)\n" +msgstr "(açıklama verilmedi)\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "Bu tamam mı? " @@ -5165,8 +5218,8 @@ msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# Atanmış güvencedeÄŸerleri listesi, oluÅŸturuldu %s\n" -"# (Onları almak için \"gpg --import-ownertrust\" kullanın)\n" +"# Atanan güvencedeÄŸerlerinin listesi %s oluÅŸturuldu\n" +"# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n" #: g10/tdbdump.c:140 #, c-format @@ -5179,7 +5232,7 @@ msgstr "satır çok uzun\n" #: g10/tdbdump.c:159 msgid "error: missing colon\n" -msgstr "hata: iki nokta üstüste eksik\n" +msgstr "hata: \":\" eksik\n" #: g10/tdbdump.c:164 msgid "error: invalid fingerprint\n" @@ -5187,19 +5240,22 @@ msgstr "hata: parmakizi geçersiz\n" #: g10/tdbdump.c:168 msgid "error: no ownertrust value\n" -msgstr "hata: sahibiningüvencesi deÄŸeri yok\n" +msgstr "hata: hiç sahibiningüvencesi deÄŸeri yok\n" #. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" -msgstr "güvence kaydı bulunurken hata: %s\n" +msgstr "güvence kaydını ararken hata: %s\n" #: g10/tdbdump.c:208 #, c-format msgid "read error: %s\n" msgstr "okuma hatası: %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "bu anahtar sunucusu tamamen HKP uyumlu deÄŸil\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "Bu algoritmanın kullanımı uygun deÄŸil - Yine de oluÅŸturulsun mu?" diff -urpP gnupg-1.2.2/po/zh_TW.po gnupg-1.2.3/po/zh_TW.po --- gnupg-1.2.2/po/zh_TW.po 2003-05-01 14:38:34.000000000 +0000 +++ gnupg-1.2.3/po/zh_TW.po 2003-08-21 20:05:38.000000000 +0000 @@ -1,5 +1,6 @@ # 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. # # Special thanks to "Autrijus Tang ". @@ -7,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"POT-Creation-Date: 2003-05-01 13:05+0200\n" -"PO-Revision-Date: 2003-05-01 12:00+0200\n" +"POT-Creation-Date: 2003-08-21 18:22+0200\n" +"PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" "MIME-Version: 1.0\n" @@ -47,7 +48,7 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:333 g10/keyedit.c:941 +#: util/miscutil.c:333 g10/keyedit.c:978 msgid "quit" msgstr "quit" @@ -274,62 +275,62 @@ msgstr "... ³o¬O­Ó·å²« (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "©p§ä¨ì¤@­Ó·å²«¤F ... (%s:%d)\n" -#: cipher/random.c:157 +#: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "°»´ú¤£¨ì¶Ã¼Æ»`¶°¼Ò²Õ\n" -#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196 +#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "µLªk¶}±Ò `%s' ¡G %s\n" -#: cipher/random.c:385 +#: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" msgstr "µLªk¨ú±oÀÉ®× `%s' ªº¸ê°T¡G %s\n" -#: cipher/random.c:390 +#: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "`%s' ¤£¬O¤@­Ó¼Ð·ÇªºÀÉ®× ¢w ¤w²¤¹L\n" -#: cipher/random.c:395 +#: cipher/random.c:401 msgid "note: random_seed file is empty\n" msgstr "½Ðª`·N¡G random_seed Àɮ׬OªÅªº\n" -#: cipher/random.c:401 +#: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "ĵ§i¡G random_seed Àɮפj¤pµL®Ä ¢w ¤£¤©±Ä¥Î\n" -#: cipher/random.c:409 +#: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" msgstr "µLªkŪ¨ú `%s' ¡G %s\n" -#: cipher/random.c:447 +#: cipher/random.c:453 msgid "note: random_seed file not updated\n" msgstr "½Ðª`·N¡G random_seed ÀÉ®×¥¼³Q§ó·s\n" -#: cipher/random.c:467 g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "µLªk«Ø¥ß `%s' ¡G %s\n" -#: cipher/random.c:474 +#: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" msgstr "µLªk¼g¤J `%s' ¡G %s\n" -#: cipher/random.c:477 +#: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" msgstr "µLªkÃö³¬ `%s' ¡G %s\n" -#: cipher/random.c:723 +#: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" msgstr "ĵ§i¡G¥¿¦b¨Ï¥Î¤£¦w¥þªºÀH¾÷¼Æ¦r²£¥Í¾¹¡I¡I\n" -#: cipher/random.c:724 +#: cipher/random.c:729 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -359,6 +360,11 @@ msgstr "" msgid "digest algorithm `%s' is read-only in this release\n" msgstr "`%s' ºK­nºtºâªk¦b³o¦¸ÄÀ¥Xªºª©¥»¤¤°ßŪ\n" +#: cipher/md.c:147 +#, c-format +msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +msgstr "" + #: cipher/rndegd.c:204 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" @@ -368,7 +374,7 @@ msgstr "" "½Ðµy«Ý¤ù¨è¡A¨t²Î¦¹®É¥¿¦b»`¶°¶Ã¼Æ¡C¦pªG©p·|ı±oµL²áªº¸Ü¡A\n" "¤£§«°µ¨Ç§Oªº¨Æ¡A³o¼Ë¤l¬Æ¦Ü¯à°÷Åý¶Ã¼Æªº«~½è§ó¦n¡C\n" -#: g10/g10.c:307 +#: g10/g10.c:305 msgid "" "@Commands:\n" " " @@ -376,163 +382,163 @@ msgstr "" "@«ü¥O¡G\n" " " -#: g10/g10.c:309 +#: g10/g10.c:307 msgid "|[file]|make a signature" msgstr "|[ÀÉ®×]|«Ø¥ß¤@¥÷ñ³¹" -#: g10/g10.c:310 +#: g10/g10.c:308 msgid "|[file]|make a clear text signature" msgstr "|[ÀÉ®×]|«Ø¥ß¤@¥÷©ú¤åñ³¹" -#: g10/g10.c:311 +#: g10/g10.c:309 msgid "make a detached signature" msgstr "«Ø¥ß¤@¥÷¤ÀÂ÷¦¡Ã±³¹" -#: g10/g10.c:312 +#: g10/g10.c:310 msgid "encrypt data" msgstr "¥[±K¸ê®Æ" -#: g10/g10.c:313 +#: g10/g10.c:311 msgid "|[files]|encrypt files" msgstr "|[ÀÉ®×]|¥[±KÀÉ®×" -#: g10/g10.c:314 +#: g10/g10.c:312 msgid "encryption only with symmetric cipher" msgstr "¶È¨Ï¥Î¹ïºÙ¦¡½s±Kªk¨Ó¥[±K" -#: g10/g10.c:315 +#: g10/g10.c:313 msgid "store only" msgstr "¶ÈÀx¦s" -#: g10/g10.c:316 +#: g10/g10.c:314 msgid "decrypt data (default)" msgstr "¸ê®Æ¸Ñ±K(¹w³])" -#: g10/g10.c:317 +#: g10/g10.c:315 msgid "|[files]|decrypt files" msgstr "|[ÀÉ®×]|Àɮ׸ѱK" -#: g10/g10.c:318 +#: g10/g10.c:316 msgid "verify a signature" msgstr "ÅçÃÒ¬Y¥÷ñ³¹" -#: g10/g10.c:320 +#: g10/g10.c:318 msgid "list keys" msgstr "¦C¥Xª÷Æ_" -#: g10/g10.c:322 +#: g10/g10.c:320 msgid "list keys and signatures" msgstr "¦C¥Xª÷Æ_©Mñ³¹" -#: g10/g10.c:323 +#: g10/g10.c:321 msgid "check key signatures" msgstr "Àˬdª÷Æ_ñ³¹" -#: g10/g10.c:324 +#: g10/g10.c:322 msgid "list keys and fingerprints" msgstr "¦C¥Xª÷Æ_©M«ü¯¾" -#: g10/g10.c:325 +#: g10/g10.c:323 msgid "list secret keys" msgstr "¦C¥X¨pÆ_" -#: g10/g10.c:326 +#: g10/g10.c:324 msgid "generate a new key pair" msgstr "²£¥Í¤@¥÷·sªºª÷Æ_¹ï" -#: g10/g10.c:327 +#: g10/g10.c:325 msgid "remove keys from the public keyring" msgstr "±q¤½Æ_Æ_°Í°é¸Ì²¾¥hª÷Æ_" -#: g10/g10.c:329 +#: g10/g10.c:327 msgid "remove keys from the secret keyring" msgstr "±q¨pÆ_Æ_°Í°é¸Ì²¾¥hª÷Æ_" -#: g10/g10.c:330 +#: g10/g10.c:328 msgid "sign a key" msgstr "ñ¸p¬Y§âª÷Æ_" -#: g10/g10.c:331 +#: g10/g10.c:329 msgid "sign a key locally" msgstr "¶È¦b¥»¦añ¸p¬Y§âª÷Æ_" -#: g10/g10.c:332 +#: g10/g10.c:330 msgid "sign a key non-revocably" msgstr "¥H¤£¥iºM¾P¼Ò¦¡¨Óñ¸p¬Y§âª÷Æ_" -#: g10/g10.c:333 +#: g10/g10.c:331 msgid "sign a key locally and non-revocably" msgstr "¶È¦b¥»¦a¥H¤£¥iºM¾P¼Ò¦¡¨Óñ¸p¬Y§âª÷Æ_" -#: g10/g10.c:334 +#: g10/g10.c:332 msgid "sign or edit a key" msgstr "ñ¸p©Î½s¿è¬Y§âª÷Æ_" -#: g10/g10.c:335 +#: g10/g10.c:333 msgid "generate a revocation certificate" msgstr "²£¥Í¤@¥÷ºM¾P¾ÌÃÒ" -#: g10/g10.c:337 +#: g10/g10.c:335 msgid "export keys" msgstr "¶×¥Xª÷Æ_" -#: g10/g10.c:338 +#: g10/g10.c:336 msgid "export keys to a key server" msgstr "§âª÷Æ_¶×¥X¦Ü¬Y­Óª÷Æ_¦øªA¾¹¤W" -#: g10/g10.c:339 +#: g10/g10.c:337 msgid "import keys from a key server" msgstr "±q¬Y­Óª÷Æ_¦øªA¾¹¤W¶×¤Jª÷Æ_" -#: g10/g10.c:341 +#: g10/g10.c:339 msgid "search for keys on a key server" msgstr "¦b¬Y­Óª÷Æ_¦øªA¾¹¤W·j´Mª÷Æ_" -#: g10/g10.c:343 +#: g10/g10.c:341 msgid "update all keys from a keyserver" msgstr "±q¬Y­Óª÷Æ_¦øªA¾¹¤W§ó·s©Ò¦³ªºª÷Æ_" -#: g10/g10.c:347 +#: g10/g10.c:345 msgid "import/merge keys" msgstr "¶×¤J/¦X¨Öª÷Æ_" -#: g10/g10.c:349 +#: g10/g10.c:347 msgid "list only the sequence of packets" msgstr "¶È¦C¥X«Ê¥]§Ç¦C" -#: g10/g10.c:351 +#: g10/g10.c:349 msgid "export the ownertrust values" msgstr "¶×¥X¥DÆ[«H¥ô­È" -#: g10/g10.c:353 +#: g10/g10.c:351 msgid "import ownertrust values" msgstr "¶×¤J¥DÆ[«H¥ô­È" -#: g10/g10.c:355 +#: g10/g10.c:353 msgid "update the trust database" msgstr "§ó·s«H¥ô¸ê®Æ®w" -#: g10/g10.c:357 +#: g10/g10.c:355 msgid "unattended trust database update" msgstr "§ó·s¥¼ªþ¥[ªº«H¥ô¸ê®Æ®w" -#: g10/g10.c:358 +#: g10/g10.c:356 msgid "fix a corrupted trust database" msgstr "­×´_¬Y­Ó¤w·l·´ªº«H¥ô¸ê®Æ®w" -#: g10/g10.c:359 +#: g10/g10.c:357 msgid "De-Armor a file or stdin" msgstr "±qÀɮשμзǿé¤J¸Ñ¶}«Ê¸Ë" -#: g10/g10.c:361 +#: g10/g10.c:359 msgid "En-Armor a file or stdin" msgstr "±qÀɮשμзǿé¤J¶i¦æ«Ê¸Ë" -#: g10/g10.c:363 +#: g10/g10.c:361 msgid "|algo [files]|print message digests" msgstr "|ºtºâªk [ÀÉ®×]|¦L¥X°T®§ºK­n" -#: g10/g10.c:367 g10/gpgv.c:64 +#: g10/g10.c:365 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -542,151 +548,151 @@ msgstr "" "¿ï¶µ¡G\n" " " -#: g10/g10.c:369 +#: g10/g10.c:367 msgid "create ascii armored output" msgstr "«Ø¥ß¥H ASCII «Ê¸Ë¹Lªº¿é¥X" -#: g10/g10.c:371 +#: g10/g10.c:369 msgid "|NAME|encrypt for NAME" msgstr "|¦W¦r|¥H¡u¦W¦r¡v§@¬°¥[±K¹ï¶H" -#: g10/g10.c:374 +#: g10/g10.c:372 msgid "|NAME|use NAME as default recipient" msgstr "|¦W¦r|¥H¡u¦W¦r¡v¿ï¬°¹w³]ªº¦¬¥óªÌ" -#: g10/g10.c:376 +#: g10/g10.c:374 msgid "use the default key as default recipient" msgstr "§â¹w³]ªºª÷Æ_·í§@¹w³]ªº¦¬¥óªÌ" -#: g10/g10.c:382 +#: g10/g10.c:380 msgid "use this user-id to sign or decrypt" msgstr "¨Ï¥Î³o­Ó¨Ï¥ÎªÌ ID ¨Óñ¸p©Î¸Ñ±K" -#: g10/g10.c:383 +#: g10/g10.c:381 msgid "|N|set compress level N (0 disables)" msgstr "|N|³]©wÀ£ÁYµ¥¯Å¬° N (0 ªí¥Ü¤£À£ÁY)" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "use canonical text mode" msgstr "¨Ï¥Î¼Ð·Çªº¤å¦r¼Ò¦¡" -#: g10/g10.c:393 +#: g10/g10.c:391 msgid "use as output file" msgstr "·í§@¿é¥XÀɮרӨϥÎ" -#: g10/g10.c:394 g10/gpgv.c:66 +#: g10/g10.c:392 g10/gpgv.c:66 msgid "verbose" -msgstr "Åo­ö" +msgstr "Åo­ö¼Ò¦¡" -#: g10/g10.c:395 g10/gpgv.c:67 +#: g10/g10.c:393 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "ºÉ¶q¦wÀR¨Ç" -#: g10/g10.c:396 +#: g10/g10.c:394 msgid "don't use the terminal at all" msgstr "§¹¥þ¤£­n¨Ï¥Î²×ºÝ" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "force v3 signatures" msgstr "±j­¢¨Ï¥Î²Ä¤Tª©Ã±³¹" -#: g10/g10.c:398 +#: g10/g10.c:396 msgid "do not force v3 signatures" msgstr "¤£­n±j­¢¨Ï¥Î²Ä¤Tª©Ã±³¹" -#: g10/g10.c:399 +#: g10/g10.c:397 msgid "force v4 key signatures" msgstr "±j­¢¨Ï¥Î²Ä¥|ª©ª÷Æ_ñ³¹" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "do not force v4 key signatures" msgstr "¤£­n±j­¢¨Ï¥Î²Ä¥|ª©ª÷Æ_ñ³¹" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "always use a MDC for encryption" msgstr "Á`¬O¥Î MDC ¨Ó¥[±K" -#: g10/g10.c:403 +#: g10/g10.c:401 msgid "never use a MDC for encryption" msgstr "¥Ã»·¤£­n¥Î MDC ¨Ó¥[±K" -#: g10/g10.c:405 +#: g10/g10.c:403 msgid "do not make any changes" msgstr "¤£­n°µ¥ô¦ó§ïÅÜ" -#: g10/g10.c:406 +#: g10/g10.c:404 msgid "prompt before overwriting" msgstr "Âмg«e¥ý¸ß°Ý" -#: g10/g10.c:407 +#: g10/g10.c:405 msgid "use the gpg-agent" msgstr "¨Ï¥Î gpg-agent ¥N²zµ{¦¡" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "batch mode: never ask" msgstr "§å¦¸¼Ò¦¡¡G¥Ã»·¤£¸ß°Ý" -#: g10/g10.c:411 +#: g10/g10.c:409 msgid "assume yes on most questions" msgstr "°²³]¤j¦h¼Æ°ÝÃDªº¦^µª¬°¡u¬O¡v" -#: g10/g10.c:412 +#: g10/g10.c:410 msgid "assume no on most questions" msgstr "°²³]¤j¦h¼Æ°ÝÃDªº¦^µª¬°¡u§_¡v" -#: g10/g10.c:413 +#: g10/g10.c:411 msgid "add this keyring to the list of keyrings" msgstr "§â³o­ÓÆ_°Í°é¥[¶iÆ_°Í°é²M³æ¤¤" -#: g10/g10.c:414 +#: g10/g10.c:412 msgid "add this secret keyring to the list" msgstr "§â³o­Ó¨pÆ_Æ_°Í°é¥[¶i²M³æ¤¤" -#: g10/g10.c:415 +#: g10/g10.c:413 msgid "show which keyring a listed key is on" msgstr "Åã¥Ü³Q¦C¥Xªºª÷Æ_¦b­þ¤@­ÓÆ_°Í°é¤W" -#: g10/g10.c:416 +#: g10/g10.c:414 msgid "|NAME|use NAME as default secret key" msgstr "|¦W¦r|¨Ï¥Î¡u¦W¦r¡v·í§@¹w³]¨pÆ_" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|HOST|use this keyserver to lookup keys" msgstr "|¥D¾÷|¨Ï¥Î³o­Óª÷Æ_¦øªA¾¹¨Ó´M§äª÷Æ_" -#: g10/g10.c:421 +#: g10/g10.c:419 msgid "|NAME|set terminal charset to NAME" msgstr "|¦WºÙ|³]©w²×ºÝ¦r¤¸¶°¬°¡u¦WºÙ¡v" -#: g10/g10.c:422 +#: g10/g10.c:420 msgid "read options from file" msgstr "±qÀÉ®×Ū¨ú¿ï¶µ" -#: g10/g10.c:426 g10/gpgv.c:71 +#: g10/g10.c:424 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|ÀÉ®×´y­z|§âª¬ºA¸ê°T¼g¤J¦¹ÀÉ®×´y­z" -#: g10/g10.c:428 +#: g10/g10.c:426 msgid "|[file]|write status info to file" msgstr "|[ÀÉ®×]|§âª¬ºA¸ê°T¼g¤JÀÉ®×" -#: g10/g10.c:440 +#: g10/g10.c:438 msgid "|KEYID|ultimately trust this key" msgstr "|ª÷Æ_ID|¹ý©³«H¥ô¦¹ª÷Æ_" -#: g10/g10.c:441 +#: g10/g10.c:439 msgid "|FILE|load extension module FILE" msgstr "|ÀÉ®×|¸ü¤J©µ¦ù¼Ò²ÕÀÉ®×" -#: g10/g10.c:442 +#: g10/g10.c:445 msgid "emulate the mode described in RFC1991" msgstr "ºÉ¶q¼Ò¥é RFC1991 ¸Ì©Ò´y­zªº¼Ò¦¡" -#: g10/g10.c:443 +#: g10/g10.c:447 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "§â©Ò¦³ªº«Ê¥]¡B½s±Kªk©MºK­n¿ï¶µ½Õ¾ã¦¨ OpenPGP ª¬ºA" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "§â©Ò¦³ªº«Ê¥]¡B½s±Kªk©MºK­n¿ï¶µ½Õ¾ã¦¨ PGP 2.x ª¬ºA" @@ -730,7 +736,7 @@ msgstr "¤£Åã¥Ü·Ó¤ù ID" msgid "Set command line to view Photo IDs" msgstr "³]©wÆ[¬Ý·Ó¤ù ID ®É­n¥Îªº©R¥O¦C" -#: g10/g10.c:471 +#: g10/g10.c:472 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -738,7 +744,7 @@ msgstr "" "@\n" "(½Ð°Ñ·Ó½u¤W»¡©ú­¶­±¨Ó¨ú±o©Ò¦³©R¥O©M¿ï¶µªº§¹¾ã²M³æ)\n" -#: g10/g10.c:474 +#: g10/g10.c:475 msgid "" "@\n" "Examples:\n" @@ -758,15 +764,15 @@ msgstr "" " --list-keys [¦W¦r] Åã¥Üª÷Æ_\n" " --fingerprint [¦W¦r] Åã¥Ü«ü¯¾\n" -#: g10/g10.c:634 g10/gpgv.c:95 +#: g10/g10.c:635 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "½Ð¦V ¦^³øµ{¦¡·å²«¡C\n" -#: g10/g10.c:638 +#: g10/g10.c:639 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "¥Îªk¡G gpg [¿ï¶µ] [ÀÉ®×] (©Î¥Î -h ¨D§U)" -#: g10/g10.c:641 +#: g10/g10.c:642 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -776,7 +782,7 @@ msgstr "" "ñ¸p¡BÀˬd¡B¥[±K©Î¸Ñ±K\n" "¹w³]ªº¾Þ§@·|¨Ì¿é¤J¸ê®Æ¦Ó©w\n" -#: g10/g10.c:652 +#: g10/g10.c:653 msgid "" "\n" "Supported algorithms:\n" @@ -784,333 +790,367 @@ msgstr "" "\n" "¤w³Q¤ä´©ªººtºâªk¡G\n" -#: g10/g10.c:655 +#: g10/g10.c:656 msgid "Pubkey: " msgstr "¤½Æ_¡G " -#: g10/g10.c:661 g10/keyedit.c:1531 +#: g10/g10.c:662 g10/keyedit.c:1568 msgid "Cipher: " msgstr "½s±Kªk¡G " -#: g10/g10.c:667 +#: g10/g10.c:668 msgid "Hash: " msgstr "Âø´ê¡G " -#: g10/g10.c:673 g10/keyedit.c:1577 +#: g10/g10.c:674 g10/keyedit.c:1614 msgid "Compression: " msgstr "À£ÁY¡G " -#: g10/g10.c:756 +#: g10/g10.c:757 msgid "usage: gpg [options] " msgstr "¥Îªk¡G gpg [¿ï¶µ] " -#: g10/g10.c:824 +#: g10/g10.c:825 msgid "conflicting commands\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/g10.c:842 +#: g10/g10.c:843 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "¦b¡u%s¡v¸s²Õ©w¸q¸Ì§ä¤£¨ì = °O¸¹\n" -#: g10/g10.c:1010 +#: g10/g10.c:1011 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "ĵ§i¡G %s \"%s\" ªº©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1013 +#: g10/g10.c:1014 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "ĵ§i¡G %s \"%s\" ªº³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1016 +#: g10/g10.c:1017 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1020 +#: g10/g10.c:1021 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1196 +#: g10/g10.c:1197 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "½Ðª`·N¡G¦³ªº¹w³]¿ï¶µÀÉ `%s' ¤w³Q©¿²¤\n" -#: g10/g10.c:1232 +#: g10/g10.c:1233 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "½Ðª`·N¡G¨S¦³¹w³]¿ï¶µÀÉ `%s'\n" -#: g10/g10.c:1236 +#: g10/g10.c:1237 #, c-format msgid "option file `%s': %s\n" msgstr "¿ï¶µÀÉ `%s' ¡G %s\n" -#: g10/g10.c:1243 +#: g10/g10.c:1244 #, c-format msgid "reading options from `%s'\n" msgstr "±q `%s' Ū¨ú¿ï¶µ\n" -#: g10/g10.c:1429 +#: g10/g10.c:1430 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "½s±Kªk©µ¦ù¼Ò²Õ \"%s\" ¦]¬°³\¥i¤£¦w¥þ¦Ó¥¼³Q¸ü¤J\n" -#: g10/g10.c:1569 +#: g10/g10.c:1563 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ¤£¬O¤@­Ó¦³®Äªº¦r¤¸¶°\n" -#: g10/g10.c:1587 +#: g10/g10.c:1581 msgid "could not parse keyserver URI\n" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/g10.c:1596 +#: g10/g10.c:1590 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:1599 +#: g10/g10.c:1593 msgid "invalid import options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:1606 +#: g10/g10.c:1600 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:1609 +#: g10/g10.c:1603 msgid "invalid export options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:1615 +#: g10/g10.c:1609 #, c-format msgid "unable to set exec-path to %s\n" msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n" -#: g10/g10.c:1742 +#: g10/g10.c:1736 msgid "WARNING: program may create a core file!\n" msgstr "ĵ§i¡Gµ{¦¡¥i¯à·|¶É¦L¥X®Ö¤ßÀÉ¡I\n" -#: g10/g10.c:1746 +#: g10/g10.c:1740 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ĵ§i¡G %s ·|¨Ï±o %s ¥¢®Ä\n" -#: g10/g10.c:1753 g10/g10.c:1764 +#: g10/g10.c:1747 g10/g10.c:1758 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "½Ðª`·N¡G¤@¯ë±¡ªp¤U¤£·|¥Î¨ì %s¡I\n" -#: g10/g10.c:1755 g10/g10.c:1774 +#: g10/g10.c:1749 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ¤£³Q¤¹³\¸ò %s ¨Ö¥Î\n" -#: g10/g10.c:1758 +#: g10/g10.c:1752 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:1784 +#: g10/g10.c:1773 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "©p¬é¦³¦b --pgp2 ¼Ò¦¡¤UÅׯవ¥X¤ÀÂ÷¦¡©Î©ú¤åñ³¹\n" -#: g10/g10.c:1790 +#: g10/g10.c:1779 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U®É¡A¤£¯à¦P®Éñ¸p©M¥[±K\n" -#: g10/g10.c:1796 +#: g10/g10.c:1785 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "±Ò¥Î --pgp2 ®É©p¬éÀ³¸Ó¨Ï¥ÎÀɮסA¦Ó«DºÞ¹D\n" -#: g10/g10.c:1809 +#: g10/g10.c:1798 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¦b --pgp2 ¼Ò¦¡¤U¥[±K°T®§»Ý­n IDEA ½s±Kªk\n" -#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725 -#: g10/sign.c:650 g10/sign.c:897 -#, c-format -msgid "this message may not be usable by %s\n" -msgstr "³o­Ó°T®§¤]³\¤£¬O %s ©Ò¯à¥Îªº\n" - -#: g10/g10.c:1890 g10/g10.c:1908 +#: g10/g10.c:1869 g10/g10.c:1887 msgid "selected cipher algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:1896 g10/g10.c:1914 +#: g10/g10.c:1875 g10/g10.c:1893 msgid "selected digest algorithm is invalid\n" msgstr "©Ò¿ïªººK­nºtºâªkµL®Ä\n" -#: g10/g10.c:1902 +#: g10/g10.c:1881 msgid "selected certification digest algorithm is invalid\n" msgstr "©Ò¿ïªº¾ÌÃÒºK­nºtºâªkµL®Ä\n" -#: g10/g10.c:1917 +#: g10/g10.c:1896 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "À£ÁYºtºâªk¤@©w­n¤¶©ó %d ¨ì %d ¤§¶¡\n" -#: g10/g10.c:1919 +#: g10/g10.c:1898 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ¤@©w­n¤j©ó 0\n" -#: g10/g10.c:1921 +#: g10/g10.c:1900 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ¤@©w­n¤j©ó 1\n" -#: g10/g10.c:1923 +#: g10/g10.c:1902 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth ¤@©w­n¤¶©ó 1 ©M 255 ¤§¶¡\n" -#: g10/g10.c:1926 +#: g10/g10.c:1905 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "½Ðª`·N¡G±j¯P¤£«Øij¨Ï¥Î³æ¯Âªº S2K ¼Ò¦¡ (0)\n" -#: g10/g10.c:1930 +#: g10/g10.c:1909 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "µL®Äªº S2K ¼Ò¦¡¡F¤@©w­n¬O 0 ¡B 1 ©Î 3\n" -#: g10/g10.c:1934 +#: g10/g10.c:1913 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:1940 +#: g10/g10.c:1919 msgid "invalid default preferences\n" msgstr "µL®Äªº¹w³]°¾¦n\n" -#: g10/g10.c:1948 +#: g10/g10.c:1927 msgid "invalid personal cipher preferences\n" msgstr "µL®Äªº­Ó¤H½s±Kªk°¾¦n\n" -#: g10/g10.c:1952 +#: g10/g10.c:1931 msgid "invalid personal digest preferences\n" msgstr "µL®Äªº­Ó¤HºK­n°¾¦n\n" -#: g10/g10.c:1956 +#: g10/g10.c:1935 msgid "invalid personal compress preferences\n" msgstr "µL®Äªº­Ó¤HÀ£ÁY°¾¦n\n" -#: g10/g10.c:2042 +#: g10/g10.c:1978 +#, fuzzy, c-format +msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" +msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" + +#: g10/g10.c:1983 +#, fuzzy, c-format +msgid "you may not use digest algorithm \"%s\" while in %s mode\n" +msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" + +#: g10/g10.c:1988 +#, fuzzy, c-format +msgid "you may not use compression algorithm \"%s\" while in %s mode\n" +msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" + +#: g10/g10.c:2081 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/g10.c:2052 +#: g10/g10.c:2091 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "ĵ§i¡Gµ¹©wªº¦¬¥óªÌ (-r) ¥¼¨Ï¥Î¤½Æ_¥[±K\n" -#: g10/g10.c:2062 +#: g10/g10.c:2101 msgid "--store [filename]" msgstr "--store [ÀɦW]" -#: g10/g10.c:2069 +#: g10/g10.c:2108 msgid "--symmetric [filename]" msgstr "--symmetric [ÀɦW]" -#: g10/g10.c:2077 +#: g10/g10.c:2116 msgid "--encrypt [filename]" msgstr "--encrypt [ÀɦW]" -#: g10/g10.c:2094 +#: g10/g10.c:2133 msgid "--sign [filename]" msgstr "--sign [ÀɦW]" -#: g10/g10.c:2107 +#: g10/g10.c:2146 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:2121 +#: g10/g10.c:2160 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ÀɦW]" -#: g10/g10.c:2130 +#: g10/g10.c:2169 msgid "--clearsign [filename]" msgstr "--clearsign [ÀɦW]" -#: g10/g10.c:2148 +#: g10/g10.c:2187 msgid "--decrypt [filename]" msgstr "--decrypt [ÀɦW]" -#: g10/g10.c:2159 +#: g10/g10.c:2198 msgid "--sign-key user-id" msgstr "--sign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:2167 +#: g10/g10.c:2206 msgid "--lsign-key user-id" msgstr "--lsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:2175 +#: g10/g10.c:2214 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:2183 +#: g10/g10.c:2222 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:2191 +#: g10/g10.c:2230 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¨Ï¥ÎªÌID [«ü¥O]" -#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801 +#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801 #, c-format msgid "can't open %s: %s\n" msgstr "µLªk¶}±Ò %s: %s\n" -#: g10/g10.c:2262 +#: g10/g10.c:2301 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¨Ï¥ÎªÌID] [Æ_°Í°é]" -#: g10/g10.c:2354 +#: g10/g10.c:2339 +#, fuzzy, c-format +msgid "keyserver send failed: %s\n" +msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" + +#: g10/g10.c:2341 +#, fuzzy, c-format +msgid "keyserver receive failed: %s\n" +msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" + +#: g10/g10.c:2343 +#, fuzzy, c-format +msgid "key export failed: %s\n" +msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" + +#: g10/g10.c:2355 +#, fuzzy, c-format +msgid "keyserver search failed: %s\n" +msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" + +#: g10/g10.c:2365 +#, fuzzy, c-format +msgid "keyserver refresh failed: %s\n" +msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" + +#: g10/g10.c:2406 #, c-format msgid "dearmoring failed: %s\n" msgstr "¸Ñ¶}«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:2362 +#: g10/g10.c:2414 #, c-format msgid "enarmoring failed: %s\n" msgstr "¶i¦æ«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:2449 +#: g10/g10.c:2501 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "µL®Äªº `%s' Âø´êºtºâªk\n" -#: g10/g10.c:2535 +#: g10/g10.c:2587 msgid "[filename]" msgstr "[ÀɦW]" -#: g10/g10.c:2539 +#: g10/g10.c:2591 msgid "Go ahead and type your message ...\n" -msgstr "¶}©lÁä¤J©pªº°T®§ ...\n" +msgstr "½Ð¶}©lÁä¤J©pªº°T®§ ...\n" -#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 +#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "µLªk¶}±Ò `%s'\n" -#: g10/g10.c:2815 +#: g10/g10.c:2867 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" -msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡vµ²§À\n" +msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡v¨Óµ²§À\n" -#: g10/g10.c:2824 +#: g10/g10.c:2876 msgid "a user notation name must contain the '@' character\n" msgstr "¨Ï¥ÎªÌ¼Ð°O¦WºÙ¤@©w­n§t¦³¡u@¡v¦r²Å\n" -#: g10/g10.c:2832 +#: g10/g10.c:2886 msgid "a notation value must not use any control characters\n" msgstr "¼Ð°O­È¤@©w¤£¯à¨Ï¥Î¥ô¦óªº±±¨î¦r²Å\n" -#: g10/g10.c:2869 +#: g10/g10.c:2921 msgid "the given certification policy URL is invalid\n" msgstr "µ¹©wªºªº¾ÌÃÒ­ì«h URL µL®Ä\n" -#: g10/g10.c:2871 +#: g10/g10.c:2923 msgid "the given signature policy URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" @@ -1249,7 +1289,7 @@ msgstr "" "¤U¦C¶µ¥Ø¨S¦³¹ïÀ³ªº«H¥ô­È¡G\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 g10/mainproc.c:1428 +#: g10/pkclist.c:290 g10/mainproc.c:1451 msgid " aka \"" msgstr " ¥ç§Y \"" @@ -1306,7 +1346,7 @@ msgstr " s = ¸õ¹L³o§âª÷Æ_¤£³B²z\n" msgid " q = quit\n" msgstr " q = °h¥X\n" -#: g10/pkclist.c:326 g10/revoke.c:631 +#: g10/pkclist.c:326 g10/revoke.c:632 msgid "Your decision? " msgstr "©pªº¨M©w¬O¬Æ»ò¡H " @@ -1478,91 +1518,91 @@ msgstr "%s: ¤w¸õ¹L¡G¤½Æ_¤w¸g³Q¸T¥Î¤F\n" msgid "no valid addressees\n" msgstr "¨S¦³¦³®Äªº¦a§}\n" -#: g10/keygen.c:191 +#: g10/keygen.c:196 #, c-format msgid "preference %c%lu is not valid\n" msgstr "°¾¦n³]©w %c%lu µL®Ä\n" -#: g10/keygen.c:198 +#: g10/keygen.c:203 #, c-format msgid "preference %c%lu duplicated\n" msgstr "°¾¦n³]©w %c%lu ­«½Æ¤F\n" -#: g10/keygen.c:203 +#: g10/keygen.c:208 #, c-format msgid "too many `%c' preferences\n" msgstr "°¾¦n³]©w `%c' ¤Ó¦h\n" -#: g10/keygen.c:273 +#: g10/keygen.c:278 msgid "invalid character in preference string\n" msgstr "°¾¦n³]©w¦r¦ê¸Ì¦³µL®Äªº¦r²Å\n" -#: g10/keygen.c:533 +#: g10/keygen.c:538 msgid "writing direct signature\n" msgstr "¥¿¦b¼g¤Jª½±µÃ±³¹\n" -#: g10/keygen.c:572 +#: g10/keygen.c:577 msgid "writing self signature\n" msgstr "¥¿¦b¼g¤J¦Û§Úñ³¹\n" -#: g10/keygen.c:616 +#: g10/keygen.c:621 msgid "writing key binding signature\n" msgstr "¥¿¦b¼g¤JªþÆ_ñ³¹\n" -#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845 +#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ª÷Æ_¤Ø¤oµL®Ä¡F§ï¥Î %u ¦ì¤¸\n" -#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850 +#: g10/keygen.c:680 g10/keygen.c:764 g10/keygen.c:855 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "ª÷Æ_¤Ø¤o¼W¤j¨ì %u ¦ì¤¸\n" -#: g10/keygen.c:950 +#: g10/keygen.c:955 msgid "Please select what kind of key you want:\n" msgstr "½Ð¿ï¾Ü©p­n¨Ï¥Îªºª÷Æ_ºØÃþ¡G\n" -#: g10/keygen.c:952 +#: g10/keygen.c:957 #, c-format msgid " (%d) DSA and ElGamal (default)\n" msgstr " (%d) DSA ©M ElGamal (¹w³])\n" -#: g10/keygen.c:953 +#: g10/keygen.c:958 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (¶È¯àñ¸p¥Î)\n" -#: g10/keygen.c:955 +#: g10/keygen.c:960 #, c-format msgid " (%d) ElGamal (encrypt only)\n" msgstr " (%d) ElGamal (¶È¯à¥[±K¥Î)\n" -#: g10/keygen.c:957 +#: g10/keygen.c:962 #, c-format msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (¯àñ¸p¤Î¥[±K)\n" -#: g10/keygen.c:958 +#: g10/keygen.c:963 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (¶È¯àñ¸p¥Î)\n" -#: g10/keygen.c:960 +#: g10/keygen.c:965 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (¶È¯à¥[±K¥Î)\n" -#: g10/keygen.c:962 +#: g10/keygen.c:967 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (¯àñ¸p¤Î¥[±K)\n" -#: g10/keygen.c:965 g10/keyedit.c:616 +#: g10/keygen.c:970 msgid "Your selection? " msgstr "©p­n¿ï­þ¤@­Ó¡H " -#: g10/keygen.c:991 +#: g10/keygen.c:996 msgid "" "The use of this algorithm is only supported by GnuPG. You will not be\n" "able to use this key to communicate with PGP users. This algorithm is also\n" @@ -1572,15 +1612,15 @@ msgstr "" "·|¨S¦³¿ìªk¸ò PGP ¨Ï¥ÎªÌ¤¬³q¡C¦P®É³o­Óºtºâªk«D±`¦a½wºC¡A\n" "¦Ó¥B¥i¯à¤]¤£¦p¨ä¥Lºtºâªk¨Ó±o¦w¥þ¡C\n" -#: g10/keygen.c:996 +#: g10/keygen.c:1001 msgid "Create anyway? " msgstr "µL½×¦p¦óÁÙ¬O­n«Ø¥ß¶Ü¡H " -#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664 +#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "µL®Äªº¿ï¾Ü¡C\n" -#: g10/keygen.c:1024 +#: g10/keygen.c:1032 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1593,19 +1633,19 @@ msgstr "" " ¹w³]ªºª÷Æ_¤Ø¤o¬O 1024 ¦ì¤¸\n" " «Øijªº³Ì¤jª÷Æ_¤Ø¤o¬O 2048 ¦ì¤¸\n" -#: g10/keygen.c:1033 +#: g10/keygen.c:1041 msgid "What keysize do you want? (1024) " msgstr "©p·Q­n¥Î¦h¤jªºª÷Æ_¤Ø¤o¡H (1024) " -#: g10/keygen.c:1038 +#: g10/keygen.c:1046 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA ªºª÷Æ_¤Ø¤o¬é¯à¤¶©ó 512 ©M 1024 ¤§¶¡\n" -#: g10/keygen.c:1040 +#: g10/keygen.c:1048 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F RSA ªºª÷Æ_¤Ø¤o³Ì°_½X¥²¶·­n¦³ 1024 ¡C\n" -#: g10/keygen.c:1043 +#: g10/keygen.c:1051 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F³Ì°_½X¥²¶·­n¦³ 768 ¡C\n" @@ -1617,12 +1657,12 @@ msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F³Ì°_½X¥²¶·­n¦³ 768 #. * So, before you complain about this limitation, I suggest that #. * you start a discussion with Marvin about this theme and then #. * do whatever you want. -#: g10/keygen.c:1054 +#: g10/keygen.c:1062 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "ª÷Æ_¤Ø¤o¤Ó¤j¡F³Ì¤j¬é¯à°÷¥Î¨ì %d ¡C\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1067 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1630,27 +1670,27 @@ msgstr "" "¤£«Øij¨Ï¥Î¤j©ó 2048 ªºª÷Æ_¤Ø¤o¡A\n" "¦]¬°­pºâ *¯uªº* ·|ªá¥h«Ü¦h®É¶¡¡I\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1070 msgid "Are you sure that you want this keysize? " msgstr "©p½T©w­n¥Î³o­Óª÷Æ_¤Ø¤o¶Ü¡H " -#: g10/keygen.c:1063 +#: g10/keygen.c:1071 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" msgstr "¦n¡A¦ý¬O½Ð°O¦í©pªº¿Ã¹õ©MÁä½L¤]¬O¬Û·í®e©ö³Q¿sµøªº®zÂI¡I\n" -#: g10/keygen.c:1072 +#: g10/keygen.c:1080 #, c-format msgid "Requested keysize is %u bits\n" msgstr "©p©Ò­n¨Dªºª÷Æ_¤Ø¤o¬O %u ¦ì¤¸\n" -#: g10/keygen.c:1075 g10/keygen.c:1079 +#: g10/keygen.c:1083 g10/keygen.c:1087 #, c-format msgid "rounded up to %u bits\n" msgstr "¥[¤j¨ì %u ¦ì¤¸\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1138 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1666,7 +1706,7 @@ msgstr "" " m = ª÷Æ_¦b n ¤ë«á·|¹L´Á\n" " y = ª÷Æ_¦b n ¦~«á·|¹L´Á\n" -#: g10/keygen.c:1139 +#: g10/keygen.c:1147 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1682,30 +1722,30 @@ msgstr "" " m = ñ³¹¦b n ¤ë«á·|¹L´Á\n" " y = ñ³¹¦b n ¦~«á·|¹L´Á\n" -#: g10/keygen.c:1161 +#: g10/keygen.c:1169 msgid "Key is valid for? (0) " msgstr "ª÷Æ_ªº¦³®Ä´Á­­¬O¦h¤[¡H (0) " -#: g10/keygen.c:1163 +#: g10/keygen.c:1171 msgid "Signature is valid for? (0) " msgstr "ñ³¹ªº¦³®Ä´Á­­¬O¦h¤[¡H (0) " -#: g10/keygen.c:1168 +#: g10/keygen.c:1176 msgid "invalid value\n" msgstr "µL®Äªº¼Æ­È\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1181 #, c-format msgid "%s does not expire at all\n" msgstr "%s §¹¥þ¤£·|¹L´Á\n" #. print the date when the key expires -#: g10/keygen.c:1180 +#: g10/keygen.c:1188 #, c-format msgid "%s expires at %s\n" msgstr "%s ±N·|¦b %s ¹L´Á\n" -#: g10/keygen.c:1186 +#: g10/keygen.c:1194 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1713,11 +1753,11 @@ msgstr "" "©pªº¨t²ÎµLªkÅã¥Ü 2038 ¦~¥H«áªº¤é´Á¡C\n" "¤£¹L¡A¥¦¥i¥H¥¿½T³B²zª½¨ì 2106 ¦~¤§«eªº¦~¥÷¡C\n" -#: g10/keygen.c:1191 +#: g10/keygen.c:1199 msgid "Is this correct (y/n)? " msgstr "¥H¤W¥¿½T¶Ü¡H (y/n) " -#: g10/keygen.c:1234 +#: g10/keygen.c:1242 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1732,44 +1772,44 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1246 +#: g10/keygen.c:1254 msgid "Real name: " msgstr "¯u¹ê©m¦W¡G " -#: g10/keygen.c:1254 +#: g10/keygen.c:1262 msgid "Invalid character in name\n" msgstr "©m¦W§t¦³µL®Äªº¦r²Å\n" -#: g10/keygen.c:1256 +#: g10/keygen.c:1264 msgid "Name may not start with a digit\n" msgstr "©m¦W¤£¥i¥H¥Î¼Æ¦r¶}ÀY\n" -#: g10/keygen.c:1258 +#: g10/keygen.c:1266 msgid "Name must be at least 5 characters long\n" msgstr "©m¦W¦Ü¤Ö­n¦³¤­­Ó¦r²Åªø\n" -#: g10/keygen.c:1266 +#: g10/keygen.c:1274 msgid "Email address: " msgstr "¹q¤l¶l¥ó¦a§}¡G " -#: g10/keygen.c:1277 +#: g10/keygen.c:1285 msgid "Not a valid email address\n" msgstr "¤£¬O¦³®Äªº¹q¤l¶l¥ó¦a§}\n" -#: g10/keygen.c:1285 +#: g10/keygen.c:1293 msgid "Comment: " msgstr "µùÄÀ¡G " -#: g10/keygen.c:1291 +#: g10/keygen.c:1299 msgid "Invalid character in comment\n" msgstr "µùÄÀ§t¦³µL®Äªº¦r²Å\n" -#: g10/keygen.c:1314 +#: g10/keygen.c:1322 #, c-format msgid "You are using the `%s' character set.\n" msgstr "©p¥¿¦b¨Ï¥Î `%s' ¦r¤¸¶°¡C\n" -#: g10/keygen.c:1320 +#: g10/keygen.c:1328 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1780,27 +1820,27 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:1324 +#: g10/keygen.c:1334 msgid "Please don't put the email address into the real name or the comment\n" msgstr "½Ð¤£­n§â¹q¤l¶l¥ó¦a§}©ñ¶i©pªº¯u¹ê©m¦W©ÎµùÄÀ¸Ì\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1339 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1339 +#: g10/keygen.c:1349 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Åܧó©m¦W(N) ¡BµùÄÀ(C) ¡B¹q¤l¶l¥ó¦a§}(E)©Î°h¥X(Q)¡H " -#: g10/keygen.c:1340 +#: g10/keygen.c:1350 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Åܧó©m¦W(N) ¡BµùÄÀ(C) ¡B¹q¤l¶l¥ó¦a§}(E)©Î½T©w(O)/°h¥X(Q)¡H " -#: g10/keygen.c:1359 +#: g10/keygen.c:1369 msgid "Please correct the error first\n" msgstr "½Ð¥ý­q¥¿¿ù»~\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1408 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1808,16 +1848,16 @@ msgstr "" "©p»Ý­n¤@­Ó±K½X¦ê¨Ó«OÅ@©pªº¨pÆ_¡C\n" "\n" -#: g10/keygen.c:1407 g10/keyedit.c:827 +#: g10/keygen.c:1417 g10/keyedit.c:864 msgid "passphrase not correctly repeated; try again" msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸" -#: g10/keygen.c:1408 +#: g10/keygen.c:1418 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1414 +#: g10/keygen.c:1424 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" @@ -1829,7 +1869,7 @@ msgstr "" "¶È»Ý­n¦A¦¸°õ¦æ³o­Óµ{¦¡¡A¨Ã¥B¨Ï¥Î \"--edit-key\" ¿ï¶µ§Y¥i¡C\n" "\n" -#: g10/keygen.c:1435 +#: g10/keygen.c:1445 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" @@ -1840,53 +1880,53 @@ msgstr "" "¡]¹³¬OºV¥´Áä½L¡B²¾°Ê·Æ¹«¡BŪ¼gµwºÐ¤§Ãþªº¡^\n" "³o·|ÅýÀH¾÷¼Æ¦r²£¥Í¾¹¦³§ó¦hªº¾÷·|Àò±o°÷¦hªº¶Ã¼Æ¡C\n" -#: g10/keygen.c:2000 +#: g10/keygen.c:2010 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA ª÷Æ_¹ï·|¦³ 1024 ¦ì¤¸¡C\n" -#: g10/keygen.c:2054 +#: g10/keygen.c:2074 msgid "Key generation canceled.\n" msgstr "¤w¨ú®øª÷Æ_²£¥Í¡C\n" -#: g10/keygen.c:2161 g10/keygen.c:2249 +#: g10/keygen.c:2181 g10/keygen.c:2269 #, c-format msgid "writing public key to `%s'\n" msgstr "¥¿¦b±N¤½Æ_¼g¦Ü `%s'\n" -#: g10/keygen.c:2162 g10/keygen.c:2251 +#: g10/keygen.c:2182 g10/keygen.c:2271 #, c-format msgid "writing secret key to `%s'\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/keygen.c:2238 +#: g10/keygen.c:2258 #, c-format msgid "no writable public keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªº¤½Æ_Æ_°Í°é¡G %s\n" -#: g10/keygen.c:2244 +#: g10/keygen.c:2264 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªº¨pÆ_Æ_°Í°é¡G %s\n" -#: g10/keygen.c:2258 +#: g10/keygen.c:2278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "¼g¤J¤½Æ_Æ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keygen.c:2265 +#: g10/keygen.c:2285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "¼g¤J¨pÆ_Æ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keygen.c:2285 +#: g10/keygen.c:2305 msgid "public and secret key created and signed.\n" msgstr "¤½Æ_©M¨pÆ_¤w¸g³Q«Ø¥ß¤Îñ¸p¤F¡C\n" -#: g10/keygen.c:2286 +#: g10/keygen.c:2306 msgid "key marked as ultimately trusted.\n" msgstr "ª÷Æ_¤w³Q¼Ð°O¦¨¹ý©³«H¥ô¤F¡C\n" -#: g10/keygen.c:2297 +#: g10/keygen.c:2317 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1894,42 +1934,42 @@ msgstr "" "½Ðª`·N³o§âª÷Æ_¤£¯à¥Î¨Ó¥[±K¤§¥Î¡C©p¥²¶·¥Î \"--edit-key\" «ü¥O\n" "¨Ó²£¥Í¦¸Æ_Åצæ¡C\n" -#: g10/keygen.c:2309 g10/keygen.c:2428 +#: g10/keygen.c:2329 g10/keygen.c:2448 #, c-format msgid "Key generation failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/keygen.c:2355 g10/sign.c:261 +#: g10/keygen.c:2375 g10/sign.c:261 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "ª÷Æ_¤w¸g¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Ó¤F (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/keygen.c:2357 g10/sign.c:263 +#: g10/keygen.c:2377 g10/sign.c:263 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "ª÷Æ_¤w¸g¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Ó¤F (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/keygen.c:2366 +#: g10/keygen.c:2386 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "½Ðª`·N¡G¹ï v3 ª÷Æ_»s³y¤lÆ_·|¥¢¥h OpenPGP ¬Û®e©Ê\n" -#: g10/keygen.c:2395 +#: g10/keygen.c:2415 msgid "Really create? " msgstr "¯uªº­n«Ø¥ß¶Ü¡H " -#: g10/decrypt.c:96 g10/encode.c:780 +#: g10/decrypt.c:96 g10/encode.c:775 msgid "--output doesn't work for this command\n" msgstr "--output ¦b³o­Ó©R¥O¤¤¨S¦³§@¥Î\n" -#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180 +#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: µLªk¶}±Ò¡G %s\n" -#: g10/encode.c:209 g10/sign.c:1056 +#: g10/encode.c:209 g10/sign.c:1055 #, c-format msgid "error creating passphrase: %s\n" msgstr "«Ø¥ß±K½X¦êªº®É­Ôµo¥Í¿ù»~¡G %s\n" @@ -1938,17 +1978,17 @@ msgstr "«Ø¥ß±K½X¦êªº®É­Ôµo¥Í¿ù»~¡G %s\n" msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "¦]¬°³B©ó S2K ¼Ò¦¡¤U¦ÓµLªk¨Ï¥Î¹ïºÙ¦¡ ESK «Ê¥]\n" -#: g10/encode.c:233 g10/encode.c:498 +#: g10/encode.c:233 g10/encode.c:497 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' ¤w¸g³QÀ£ÁY¤F\n" -#: g10/encode.c:301 g10/encode.c:534 +#: g10/encode.c:302 g10/encode.c:534 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: ĵ§i¡G³o¬OªÅÀÉ®×\n" -#: g10/encode.c:416 +#: g10/encode.c:417 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "¦b --pgp2 ¼Ò¦¡¤¤¡A©p¬é¯à¥H 2048 ¦ì¤¸¥H¤Uªº RSA ª÷Æ_¥[±K\n" @@ -1962,7 +2002,7 @@ msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "©p¥¿­n¥Î¨Ó¥[±Kªº©Ò¦³ª÷Æ_³£¤£¯à¨Ï¥Î IDEA ½s±Kªk¡C\n" -#: g10/encode.c:479 g10/encode.c:662 +#: g10/encode.c:478 g10/encode.c:662 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "±j­¢¨Ï¥Î %s (%d) ¹ïºÙ¦¡½s±Kªk·|¹H¤Ï¦¬¥óªÌ°¾¦n³]©w\n" @@ -1977,422 +2017,412 @@ msgstr "±j­¢¨Ï¥Î %s (%d) À£ÁYºtºâªk·|¹H¤ msgid "you may not use %s while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/encode.c:753 +#: g10/encode.c:748 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s ¤w¸g¥[±Kµ¹¡G \"%s\"\n" -#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n" -#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" msgstr "Ū¨úª÷Æ_°Ï¶ô®Éµo¥Í¿ù»~¡G %s\n" -#: g10/export.c:222 +#: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "ª÷Æ_ %08lX: ¤£¬O¤@§â rfc2440 ª÷Æ_ ¢w ¤w¸õ¹L\n" -#: g10/export.c:238 +#: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" msgstr "ª÷Æ_ %08lX: ¥¼³Q«OÅ@ ¢w ¤w¸õ¹L\n" -#: g10/export.c:246 +#: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "ª÷Æ_ %08lX: PGP 2.x ¼Ë¦¡ªºª÷Æ_ ¢w ¤w¸õ¹L\n" #. I hope this warning doesn't confuse people. -#: g10/export.c:321 +#: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" +msgstr "½Ð§i¡G¨pÆ_ %08lX ¨Ã¨S¦³¥ôªº¦ó³æ¤@ SK ¥[Á`Àˬd\n" -#: g10/export.c:347 +#: g10/export.c:310 msgid "WARNING: nothing exported\n" msgstr "ĵ§i¡G¨S¦³¶×¥X¥ô¦óªF¦è\n" -#: g10/getkey.c:150 +#: g10/getkey.c:151 msgid "too many entries in pk cache - disabled\n" msgstr "pk §Ö¨ú¸Ì¦³¤Ó¦h¶µ¥Ø ¢w ¤w¸T¥Î\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2521 +#: g10/getkey.c:187 g10/getkey.c:2584 msgid "[User id not found]" msgstr "[§ä¤£¨ì¨Ï¥ÎªÌ ID]" -#: g10/getkey.c:1557 +#: g10/getkey.c:1578 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid ¯àÅýµL®Äªºª÷Æ_ %08lX ¥Í®Ä\n" -#: g10/getkey.c:2009 -#, fuzzy, c-format +#: g10/getkey.c:2072 +#, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "¤½Æ_ \"%s\" ¦³¬Û¹ïÀ³ªº¨pÆ_¡I\n" +msgstr "¤½Æ_ %08lX ¨S¦³¬Û¹ïÀ³ªº¨pÆ_ ¢w ¥¿¦b©¿²¤\n" -#: g10/getkey.c:2237 +#: g10/getkey.c:2300 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "¥¿¦b¨Ï¥Î¦¸Æ_ %08lX ¨Ó´À´«¥DÆ_ %08lX\n" -#: g10/getkey.c:2284 +#: g10/getkey.c:2347 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "ª÷Æ_ %08lX: ¬é¦³¨pÆ_¦Ó¨S¦³¤½Æ_ ¢w ¤w¸õ¹L\n" -#: g10/import.c:259 +#: g10/import.c:227 #, c-format msgid "skipping block of type %d\n" msgstr "¥¿¦b¸õ¹L %d «¬ºAªº°Ï¶ô\n" -#: g10/import.c:268 +#: g10/import.c:236 #, c-format msgid "%lu keys so far processed\n" msgstr "¤w¦³ %lu §âª÷Æ_³Q³B²z¤F\n" -#: g10/import.c:273 +#: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" msgstr "Ū¨ú `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/import.c:285 +#: g10/import.c:253 #, c-format msgid "Total number processed: %lu\n" msgstr "Á`¦@³Q³B²zªº¼Æ¶q¡G %lu\n" -#: g10/import.c:287 +#: g10/import.c:255 #, c-format msgid " skipped new keys: %lu\n" msgstr " ¤w¸õ¹Lªº·sª÷Æ_¡G %lu\n" -#: g10/import.c:290 +#: g10/import.c:258 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ¨S¦³¨Ï¥ÎªÌªº ID¡G %lu\n" -#: g10/import.c:292 +#: g10/import.c:260 #, c-format msgid " imported: %lu" msgstr " ¤w¶×¤J¡G %lu" -#: g10/import.c:298 +#: g10/import.c:266 #, c-format msgid " unchanged: %lu\n" msgstr " ¥¼§ïÅܪº¡G %lu\n" -#: g10/import.c:300 +#: g10/import.c:268 #, c-format msgid " new user IDs: %lu\n" msgstr " ·sªº¨Ï¥ÎªÌ ID¡G %lu\n" -#: g10/import.c:302 +#: g10/import.c:270 #, c-format msgid " new subkeys: %lu\n" msgstr " ·sªº¤lÆ_¡G %lu\n" -#: g10/import.c:304 +#: g10/import.c:272 #, c-format msgid " new signatures: %lu\n" msgstr " ·sªºÃ±³¹¡G %lu\n" -#: g10/import.c:306 +#: g10/import.c:274 #, c-format msgid " new key revocations: %lu\n" msgstr " ·sªºª÷Æ_ºM¾P¡G %lu\n" -#: g10/import.c:308 +#: g10/import.c:276 #, c-format msgid " secret keys read: %lu\n" msgstr " ³QŪ¨úªº¨pÆ_¡G %lu\n" -#: g10/import.c:310 +#: g10/import.c:278 #, c-format msgid " secret keys imported: %lu\n" msgstr " ¤w¶×¤Jªº¨pÆ_¡G %lu\n" -#: g10/import.c:312 +#: g10/import.c:280 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " ¥¼§ïÅܪº¨pÆ_¡G %lu\n" -#: g10/import.c:314 +#: g10/import.c:282 #, c-format msgid " not imported: %lu\n" msgstr " ¥¼³Q¶×¤J¡G %lu\n" -#: g10/import.c:599 +#: g10/import.c:551 msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "ª`·N¡G°»´ú¨ì Elgamal ¥DÆ_ ¢w ¶×¤J³o§â¥DÆ_¥i¯à·|¯Ó¤W¤@¨Ç®É¶¡\n" -#: g10/import.c:613 g10/import.c:875 +#: g10/import.c:565 g10/import.c:826 #, c-format msgid "key %08lX: no user ID\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/import.c:634 +#: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" msgstr "ª÷Æ_ %08lX: HKP ¤lÆ_ªº³_»~¤w³Q­×´_\n" -#: g10/import.c:649 +#: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" msgstr "ª÷Æ_ %08lX: «D¦Û§Úñ¸pªº¨Ï¥ÎªÌ ID `%s' ¤w³Q±µ¨ü\n" -#: g10/import.c:656 +#: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¦³®Äªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:658 +#: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" msgstr "³o¥i¯à¬O¥Ñ©ó¿ò¥¢¦Û§Úñ³¹©Ò¾É­Pªº«áªG\n" -#: g10/import.c:668 g10/import.c:955 +#: g10/import.c:619 g10/import.c:906 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "ª÷Æ_ %08lX: §ä¤£¨ì¤½Æ_¡G %s\n" -#: g10/import.c:673 +#: g10/import.c:624 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "ª÷Æ_ %08lX: ·sª÷Æ_ ¢w ¤w¸õ¹L\n" -#: g10/import.c:683 +#: g10/import.c:634 #, c-format msgid "no writable keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªºÆ_°Í°é¡G %s\n" -#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "¥¿¦b¼g¨ì `%s'\n" -#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015 +#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "¼g¨ìÆ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/import.c:708 +#: g10/import.c:659 #, c-format msgid "key %08lX: public key \"%s\" imported\n" msgstr "ª÷Æ_ %08lX: ¤½Æ_ \"%s\" ¤w³Q¶×¤J\n" -#: g10/import.c:730 +#: g10/import.c:681 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "ª÷Æ_ %08lX: ¸ò§Ú­Ìªº°Æ¥»¤£§k¦X\n" -#: g10/import.c:747 g10/import.c:972 +#: g10/import.c:698 g10/import.c:923 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "ª÷Æ_ %08lX: µLªk©w¦ì­ì©lªºª÷Æ_°Ï¶ô¡G %s\n" -#: g10/import.c:754 g10/import.c:978 +#: g10/import.c:705 g10/import.c:929 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "ª÷Æ_ %08lX: µLªkŪ¨ú­ì©lªºª÷Æ_°Ï¶ô¡G %s\n" -#: g10/import.c:785 +#: g10/import.c:736 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:788 +#: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:791 +#: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªºÃ±³¹\n" -#: g10/import.c:794 +#: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªºÃ±³¹\n" -#: g10/import.c:797 +#: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªº¤lÆ_\n" -#: g10/import.c:800 +#: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªº¤lÆ_\n" -#: g10/import.c:819 +#: g10/import.c:770 #, c-format msgid "key %08lX: \"%s\" not changed\n" msgstr "ª÷Æ_ %08lX: \"%s\" ¨S¦³³Q§ïÅÜ\n" -#: g10/import.c:881 +#: g10/import.c:832 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" msgstr "ª÷Æ_ %08lX: ¨pÆ_¨Ï¥Î¤FµL®Äªº½s±Kªk %d ¢w ¤w¸õ¹L\n" -#: g10/import.c:896 +#: g10/import.c:847 #, c-format msgid "no default secret keyring: %s\n" msgstr "¨S¦³¹w³]ªº¨pÆ_Æ_°Í°é¡G %s\n" -#: g10/import.c:907 +#: g10/import.c:858 #, c-format msgid "key %08lX: secret key imported\n" msgstr "ª÷Æ_ %08lX: ¨pÆ_³Q¶×¤J¤F\n" #. we can't merge secret keys -#: g10/import.c:913 +#: g10/import.c:864 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "ª÷Æ_ %08lX: ¤w¸g¦b¨pÆ_Æ_°Í°é¤¤¤F\n" -#: g10/import.c:920 +#: g10/import.c:871 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "ª÷Æ_ %08lX: §ä¤£¨ì¨pÆ_¡G %s\n" -#: g10/import.c:949 +#: g10/import.c:900 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤½Æ_ ¢w µLªk®M¥ÎºM¾P¾ÌÃÒ\n" -#: g10/import.c:989 +#: g10/import.c:940 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "ª÷Æ_ %08lX: µL®ÄªººM¾P¾ÌÃÒ¡G %s ¢w ¤w»é¦^\n" -#: g10/import.c:1021 +#: g10/import.c:972 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" msgstr "ª÷Æ_ %08lX: \"%s\" ºM¾P¾ÌÃÒ¤w³Q¶×¤J\n" -#: g10/import.c:1084 +#: g10/import.c:1035 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "ª÷Æ_ %08lX: ñ³¹¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/import.c:1097 +#: g10/import.c:1050 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "ª÷Æ_ %08lX: ¨Ï¥ÎªÌ ID \"%s\" ¨Ï¥Î¤F¥¼³Q¤ä´©ªº¤½¶}ª÷Æ_ºtºâªk\n" -#: g10/import.c:1099 +#: g10/import.c:1052 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" msgstr "ª÷Æ_ %08lX: ¨Ï¥ÎªÌ ID \"%s\" ¦³µL®Äªº¦Û§Úñ³¹\n" -#: g10/import.c:1114 +#: g10/import.c:1069 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_¥i¨Ñªþ±a\n" -#: g10/import.c:1122 g10/import.c:1163 +#: g10/import.c:1078 g10/import.c:1122 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "ª÷Æ_ %08lX: ¥¼³Q¤ä´©ªº¤½¶}ª÷Æ_ºtºâªk\n" -#: g10/import.c:1123 +#: g10/import.c:1079 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "ª÷Æ_ %08lX: µL®Äªºªþ±a¤lÆ_\n" -#. Delete the last binding -#. sig since this one is -#. newer -#: g10/import.c:1135 +#: g10/import.c:1092 #, c-format msgid "key %08lX: removed multiple subkey binding\n" msgstr "ª÷Æ_ %08lX: ¦h­«ªþ±a¤lÆ_¤w³Q²¾°£\n" -#: g10/import.c:1155 +#: g10/import.c:1113 #, c-format msgid "key %08lX: no subkey for key revocation\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_¥i¨Ñª÷Æ_ºM¾P\n" -#: g10/import.c:1164 +#: g10/import.c:1123 #, c-format msgid "key %08lX: invalid subkey revocation\n" msgstr "ª÷Æ_ %08lX: µL®Äªº¤lÆ_ºM¾P\n" -#. Delete the last revocation -#. sig since this one is -#. newer -#: g10/import.c:1175 +#: g10/import.c:1136 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" msgstr "ª÷Æ_ %08lX: ¦h­«¤lÆ_ºM¾P¤w²¾°£\n" -#: g10/import.c:1212 +#: g10/import.c:1173 #, c-format msgid "key %08lX: skipped user ID '" msgstr "ª÷Æ_ %08lX: ¤w¸õ¹L¨Ï¥ÎªÌ ID '" -#: g10/import.c:1235 +#: g10/import.c:1196 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "ª÷Æ_ %08lX: ¤lÆ_¤w¸õ¹L\n" -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:1261 +#: g10/import.c:1223 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "ª÷Æ_ %08lX: ¤£¥i¶×¥XªºÃ±³¹ (µ¥¯Å %02x) ¢w ¤w¸õ¹L\n" -#: g10/import.c:1270 +#: g10/import.c:1232 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "ª÷Æ_ %08lX: ºM¾P¾ÌÃÒ¦b¿ù»~ªº¦a¤è ¢w ¤w¸õ¹L\n" -#: g10/import.c:1287 +#: g10/import.c:1249 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "ª÷Æ_ %08lX: µL®ÄªººM¾P¾ÌÃÒ¡G %s ¢w ¤w¸õ¹L\n" -#: g10/import.c:1299 +#: g10/import.c:1262 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "ª÷Æ_ %08lX: ¤lÆ_ñ³¹¦b¿ù»~ªº¦a¤è ¢w ¤w¸õ¹L\n" -#: g10/import.c:1307 +#: g10/import.c:1270 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" -msgstr "ª÷Æ_ %08lX: «D¹w´ÁªºÃ±³¹µ¥¯Å (%02x) ¢w ¤w¸õ¹L\n" +msgstr "ª÷Æ_ %08lX: «D¹w´ÁªºÃ±³¹µ¥¯Å (0x%02X) ¢w ¤w¸õ¹L\n" -#: g10/import.c:1405 +#: g10/import.c:1369 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "ª÷Æ_ %08lX: °»´ú¨ì­«½Æªº¨Ï¥ÎªÌ ID ¢w ¤w¦X¨Ö\n" -#: g10/import.c:1464 +#: g10/import.c:1428 #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "ĵ§i¡Gª÷Æ_ %08lX ¥i¯à³QºM¾P¤F¡G¥¿¦b¨ú¦^ºM¾Pª÷Æ_ %08lX\n" -#: g10/import.c:1478 +#: g10/import.c:1442 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "ĵ§i¡Gª÷Æ_ %08lX ¥i¯à³QºM¾P¤F¡GºM¾Pª÷Æ_ %08lX ¥¼¥X²{¡C\n" -#: g10/import.c:1535 +#: g10/import.c:1500 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" msgstr "ª÷Æ_ %08lX: ¤w·s¼WºM¾P¾ÌÃÒ \"%s\"\n" -#: g10/import.c:1566 +#: g10/import.c:1533 #, c-format msgid "key %08lX: direct key signature added\n" msgstr "ª÷Æ_ %08lX: ¤w·s¼Wª½±µª÷Æ_ñ³¹\n" @@ -2405,29 +2435,29 @@ msgstr "[ºM¾P]" msgid "[self-signature]" msgstr "[¦Û§Úñ³¹]" -#: g10/keyedit.c:221 g10/keylist.c:148 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 ­Ó·lÃaªºÃ±³¹\n" -#: g10/keyedit.c:223 g10/keylist.c:150 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d ­Ó·lÃaªºÃ±³¹\n" -#: g10/keyedit.c:225 g10/keylist.c:152 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "¦³ 1 ¥÷ñ³¹¦]¬°¿ò¥¢ª÷Æ_¦Ó¥¼³QÀˬd\n" -#: g10/keyedit.c:227 g10/keylist.c:154 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "¦³ %d ¥÷ñ³¹¦]¬°¿ò¥¢ª÷Æ_¦Ó¥¼³QÀˬd\n" -#: g10/keyedit.c:229 g10/keylist.c:156 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "¦³ 1 ¥÷ñ³¹¦]¬°¬Y­Ó¿ù»~¦Ó¥¼³QÀˬd\n" -#: g10/keyedit.c:231 g10/keylist.c:158 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "¦³ %d ¥÷ñ³¹¦]¬°¬Y¨Ç¿ù»~¦Ó¥¼³QÀˬd\n" @@ -2446,20 +2476,27 @@ msgstr "°»´ú¨ì %d ­Ó¨S¦³¦³®Ä¦Û§Úñ³¹ªº¨Ï msgid "User ID \"%s\" is revoked." msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C" -#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182 +#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560 +#: g10/keyedit.c:618 g10/keyedit.c:1219 msgid "Are you sure you still want to sign it? (y/N) " msgstr "©p¤´µM·Q­nñ¸p¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188 +#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566 +#: g10/keyedit.c:1225 msgid " Unable to sign.\n" msgstr " µLªkñ¸p¡C\n" #: g10/keyedit.c:382 -#, c-format -msgid "WARNING: user ID \"%s\" is not self-signed.\n" +#, fuzzy, c-format +msgid "User ID \"%s\" is expired." +msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C" + +#: g10/keyedit.c:402 +#, fuzzy, c-format +msgid "User ID \"%s\" is not self-signed." msgstr "ĵ§i¡G¨Ï¥ÎªÌ ID \"%s\" ¥¼¸g¦Û§Úñ¸p¡C\n" -#: g10/keyedit.c:401 +#: g10/keyedit.c:437 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2468,11 +2505,11 @@ msgstr "" "\"%s\" ¸Ìªº¦Û§Úñ³¹\n" "¬O PGP 2.x «¬ºAªºÃ±³¹¡C\n" -#: g10/keyedit.c:410 +#: g10/keyedit.c:446 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "©p¬O§_·Q­n±N¥¦¤É¯Å¦¨ OpenPGP ¦Û§Úñ³¹¡H (y/N) " -#: g10/keyedit.c:424 +#: g10/keyedit.c:460 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2481,13 +2518,13 @@ msgstr "" "©p¥Ø«e¦b \"%s\" ªºÃ±³¹\n" "¤w¸g¹L´Á¤F¡C\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:464 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "©p·Q­nµo§G¤@¥÷·sªºÃ±³¹¨Ó¨ú¥N¤w¹L´Áªº¨º¤@­Ó¶Ü¡H (y/N) " #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:449 +#: g10/keyedit.c:485 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2496,53 +2533,53 @@ msgstr "" "©p¥Ø«e¦b \"%s\" ªºÃ±³¹\n" "¬O¤@¥÷¥»¦añ³¹¡C\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:489 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "©p¬O§_·Q­n§â¥L¤É¯Å¦¨¥i¥H§¹¥þ¶×¥XªºÃ±³¹¡H (y/N) " -#: g10/keyedit.c:474 +#: g10/keyedit.c:510 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" msgstr "\"%s\" ¤w¸g³Qª÷Æ_ %08lX ¦b¥»¦añ¸p¤F\n" -#: g10/keyedit.c:478 +#: g10/keyedit.c:514 #, c-format msgid "\"%s\" was already signed by key %08lX\n" msgstr "\"%s\" ¤w¸g³Qª÷Æ_ %08lX ñ¸p¤F\n" -#: g10/keyedit.c:483 +#: g10/keyedit.c:519 msgid "Do you want to sign it again anyway? (y/N) " msgstr "©p¤´µM·Q­n¦A¦¸Ã±¸p¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:503 +#: g10/keyedit.c:539 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "¨S¦³ªF¦è¥i¥HÅýª÷Æ_ %08lX ñ¸p\n" -#: g10/keyedit.c:518 +#: g10/keyedit.c:554 msgid "This key has expired!" msgstr "³o§âª÷Æ_¤w¸g¹L´Á¤F¡I" -#: g10/keyedit.c:538 +#: g10/keyedit.c:574 #, c-format msgid "This key is due to expire on %s.\n" msgstr "³o§âª÷Æ_±N¦b %s ¹L´Á¡C\n" -#: g10/keyedit.c:542 +#: g10/keyedit.c:578 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "©p·Q­nÅý©pªºÃ±³¹¤]¦b¦P¤@­Ó®É­Ô¹L´Á¶Ü¡H (Y/n) " -#: g10/keyedit.c:575 +#: g10/keyedit.c:611 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "©p¤£¯à¦b --pgp2 ¼Ò¦¡¤U¡A®³ PGP 2.x ª÷Æ_°µ¥X OpenPGP ñ³¹¡C\n" -#: g10/keyedit.c:577 +#: g10/keyedit.c:613 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "³o·|Åý³o§âª÷Æ_¦b PGP 2.x ¼Ò¦¡¤U¤£¥i¨Ï¥Î¡C\n" -#: g10/keyedit.c:600 +#: g10/keyedit.c:636 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2551,31 +2588,35 @@ msgstr "" "©p¦³¦hÂÔ·VÀˬd¥¿­nñ¸pªºª÷Æ_½T¹êÄÝ©ó¤W­±¨º­Ó¤Hªº¦W¦r©O¡H\n" "¦pªG©p¤£ª¾¹D³o­Ó°ÝÃDªºµª®×¡A½Ð¿é¤J¡u0¡v¡C\n" -#: g10/keyedit.c:604 +#: g10/keyedit.c:640 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) §Ú¤£§@µª¡C %s\n" -#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611 +#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647 msgid " (default)" msgstr " (¹w³])" -#: g10/keyedit.c:606 +#: g10/keyedit.c:642 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) §Ú®Ú¥»¨S¦³Àˬd¹L¡C %s\n" -#: g10/keyedit.c:608 +#: g10/keyedit.c:644 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) §ÚÀH·NÀˬd¹L¤F¡C %s\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:646 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) §Ú«D±`¤p¤ß¦aÀˬd¹L¤F¡C %s\n" -#: g10/keyedit.c:635 +#: g10/keyedit.c:652 +msgid "Your selection? (enter '?' for more information): " +msgstr "" + +#: g10/keyedit.c:672 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2583,7 +2624,7 @@ msgstr "" "©p¯uªº½T©w­nñ¸p³o§âª÷Æ_\n" "¥Î©pªºª÷Æ_¡G \"" -#: g10/keyedit.c:644 +#: g10/keyedit.c:681 msgid "" "\n" "This will be a self-signature.\n" @@ -2591,7 +2632,7 @@ msgstr "" "\n" "³o±N·|¬O¦Û§Úñ³¹¡C\n" -#: g10/keyedit.c:648 +#: g10/keyedit.c:685 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2599,7 +2640,7 @@ msgstr "" "\n" "ĵ§i¡G³o¥÷ñ³¹¤£·|³Q¼Ð°O¬°¤£¥i¶×¥X¡C\n" -#: g10/keyedit.c:653 +#: g10/keyedit.c:690 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2607,7 +2648,7 @@ msgstr "" "\n" "ĵ§i¡G³o¥÷ñ³¹¤£·|³Q¼Ð°O¦¨¤£¥iºM¾P¡C\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:697 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2615,7 +2656,7 @@ msgstr "" "\n" "³o¥÷ñ³¹·|³Q¼Ð°O¦¨¤£¥i¶×¥X¡C\n" -#: g10/keyedit.c:664 +#: g10/keyedit.c:701 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2623,7 +2664,7 @@ msgstr "" "\n" "³o¥÷ñ³¹·|³Q¼Ð°O¦¨¤£¥iºM¾P¡C\n" -#: g10/keyedit.c:669 +#: g10/keyedit.c:706 msgid "" "\n" "I have not checked this key at all.\n" @@ -2631,7 +2672,7 @@ msgstr "" "\n" "§Ú®Ú¥»¨S¦³Àˬd¹L³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:673 +#: g10/keyedit.c:710 msgid "" "\n" "I have checked this key casually.\n" @@ -2639,7 +2680,7 @@ msgstr "" "\n" "§ÚÀH·NÀˬd¹L³o§âª÷Æ_¤F¡C\n" -#: g10/keyedit.c:677 +#: g10/keyedit.c:714 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2647,34 +2688,34 @@ msgstr "" "\n" "§Ú«D±`¤p¤ß¦aÀˬd¹L³o§âª÷Æ_¤F¡C\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:723 msgid "Really sign? " msgstr "¯uªº­nñ¸p¶Ü¡H " -#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349 +#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425 #: g10/sign.c:312 #, c-format msgid "signing failed: %s\n" msgstr "ñ¸p®É¥¢±Ñ¤F¡G %s\n" -#: g10/keyedit.c:784 +#: g10/keyedit.c:821 msgid "This key is not protected.\n" msgstr "³o§âª÷Æ_¨S¦³³Q«OÅ@¡C\n" -#: g10/keyedit.c:788 +#: g10/keyedit.c:825 msgid "Secret parts of primary key are not available.\n" msgstr "¥DÆ_ªº¨pÆ_³¡¤À¨S¿ìªk¨ú¥Î¡C\n" -#: g10/keyedit.c:792 +#: g10/keyedit.c:829 msgid "Key is protected.\n" msgstr "ª÷Æ_³Q«OÅ@¤F¡C\n" -#: g10/keyedit.c:812 +#: g10/keyedit.c:849 #, c-format msgid "Can't edit this key: %s\n" msgstr "µLªk½s¿è³o§âª÷Æ_¡G %s\n" -#: g10/keyedit.c:818 +#: g10/keyedit.c:855 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2682,7 +2723,7 @@ msgstr "" "¿é¤J­nµ¹³o§â¨pÆ_¥Îªº·s±K½X¦ê¡C\n" "\n" -#: g10/keyedit.c:832 +#: g10/keyedit.c:869 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2690,493 +2731,491 @@ msgstr "" "©p¤£·Q­n¥Î±K½X¦ê ¢w ³o¤j·§¬O­Ó *ÁV* ÂI¤l¡I\n" "\n" -#: g10/keyedit.c:835 +#: g10/keyedit.c:872 msgid "Do you really want to do this? " msgstr "©p¯uªº·Q­n³o»ò°µ¶Ü¡H " -#: g10/keyedit.c:899 +#: g10/keyedit.c:936 msgid "moving a key signature to the correct place\n" msgstr "¥¿¦b§âª÷Æ_ªºÃ±³¹·h²¾¨ì¥¿½Tªº¦ì¸m¥h\n" -#: g10/keyedit.c:941 +#: g10/keyedit.c:978 msgid "quit this menu" msgstr "Â÷¶}³o­Ó¿ï³æ" -#: g10/keyedit.c:942 +#: g10/keyedit.c:979 msgid "q" msgstr "q" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save" msgstr "save" -#: g10/keyedit.c:943 +#: g10/keyedit.c:980 msgid "save and quit" msgstr "Àx¦s¨ÃÂ÷¶}" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "help" msgstr "help" -#: g10/keyedit.c:944 +#: g10/keyedit.c:981 msgid "show this help" msgstr "Åã¥Ü³o¥÷½u¤W»¡©ú" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:946 +#: g10/keyedit.c:983 msgid "show fingerprint" msgstr "Åã¥Ü«ü¯¾" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list" msgstr "list" -#: g10/keyedit.c:947 +#: g10/keyedit.c:984 msgid "list key and user IDs" msgstr "¦C¥Xª÷Æ_©M¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:948 +#: g10/keyedit.c:985 msgid "l" msgstr "l" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "uid" msgstr "uid" -#: g10/keyedit.c:949 +#: g10/keyedit.c:986 msgid "select user ID N" msgstr "¨Ï¥ÎªÌ ID ¿ï¤F N" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "key" msgstr "key" -#: g10/keyedit.c:950 +#: g10/keyedit.c:987 msgid "select secondary key N" msgstr "¿ï¾Ü¦¸Æ_ N" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "check" msgstr "check" -#: g10/keyedit.c:951 +#: g10/keyedit.c:988 msgid "list signatures" msgstr "¦C¥Xñ³¹" -#: g10/keyedit.c:952 +#: g10/keyedit.c:989 msgid "c" msgstr "c" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign" msgstr "sign" -#: g10/keyedit.c:953 +#: g10/keyedit.c:990 msgid "sign the key" msgstr "ñ¸pª÷Æ_" -#: g10/keyedit.c:954 +#: g10/keyedit.c:991 msgid "s" msgstr "s" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:955 +#: g10/keyedit.c:992 msgid "sign the key locally" msgstr "¶È¦b¥»¦añ¸pª÷Æ_" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:956 +#: g10/keyedit.c:993 msgid "sign the key non-revocably" msgstr "¥H¤£¥iºM¾P¼Ò¦¡Ã±¸pª÷Æ_" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:957 +#: g10/keyedit.c:994 msgid "sign the key locally and non-revocably" msgstr "¥H¤£¥iºM¾P¼Ò¦¡¦b¥»¦añ¸pª÷Æ_" -#: g10/keyedit.c:958 +#: g10/keyedit.c:995 msgid "debug" msgstr "debug" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:959 +#: g10/keyedit.c:996 msgid "add a user ID" msgstr "¼W¥[¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:960 +#: g10/keyedit.c:997 msgid "add a photo ID" msgstr "¼W¥[¤@­Ó·Ó¤ù ID" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:961 +#: g10/keyedit.c:998 msgid "delete user ID" msgstr "§R°£¤@­Ó¨Ï¥ÎªÌ ID" #. delphoto is really deluid in disguise -#: g10/keyedit.c:963 +#: g10/keyedit.c:1000 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:964 +#: g10/keyedit.c:1001 msgid "add a secondary key" msgstr "¼W¥[¤@§â¦¸Æ_" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:965 +#: g10/keyedit.c:1002 msgid "delete a secondary key" msgstr "§R°£¤@§â¦¸Æ_" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:966 +#: g10/keyedit.c:1003 msgid "add a revocation key" msgstr "¼W¥[¤@§âºM¾Pª÷Æ_" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:967 +#: g10/keyedit.c:1004 msgid "delete signatures" msgstr "§R°£Ã±³¹" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "expire" msgstr "expire" -#: g10/keyedit.c:968 +#: g10/keyedit.c:1005 msgid "change the expire date" msgstr "§ó§ï¨Ï¥Î´Á­­" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "primary" msgstr "primary" -#: g10/keyedit.c:969 +#: g10/keyedit.c:1006 msgid "flag user ID as primary" msgstr "§â¨Ï¥ÎªÌ ID ¼Ð°O¬°¥D­n" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:970 +#: g10/keyedit.c:1007 msgid "toggle between secret and public key listing" msgstr "§â¨pÆ_©M¤½Æ_²M³æô¦b¤@°_" -#: g10/keyedit.c:972 +#: g10/keyedit.c:1009 msgid "t" msgstr "t" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "pref" msgstr "pref" -#: g10/keyedit.c:973 +#: g10/keyedit.c:1010 msgid "list preferences (expert)" msgstr "¦C¥X°¾¦n (±M®a¼Ò¦¡)" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:974 +#: g10/keyedit.c:1011 msgid "list preferences (verbose)" msgstr "¦C¥X°¾¦n (Åo­ö¼Ò¦¡)" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:975 +#: g10/keyedit.c:1012 msgid "set preference list" msgstr "³]©w°¾¦n²M³æ" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:976 +#: g10/keyedit.c:1013 msgid "updated preferences" msgstr "§ó·s¹Lªº°¾¦n" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:977 +#: g10/keyedit.c:1014 msgid "change the passphrase" msgstr "§ó§ï±K½X¦ê" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "trust" msgstr "trust" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1015 msgid "change the ownertrust" msgstr "§ó§ï¥DÆ[«H¥ô" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:979 +#: g10/keyedit.c:1016 msgid "revoke signatures" msgstr "ºM¾Pñ³¹" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:980 +#: g10/keyedit.c:1017 msgid "revoke a user ID" msgstr "ºM¾P¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:981 +#: g10/keyedit.c:1018 msgid "revoke a secondary key" msgstr "ºM¾P¤@§â¦¸Æ_" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable" msgstr "disable" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1019 msgid "disable a key" msgstr "¸T¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable" msgstr "enable" -#: g10/keyedit.c:983 +#: g10/keyedit.c:1020 msgid "enable a key" msgstr "±Ò¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:984 +#: g10/keyedit.c:1021 msgid "show photo ID" msgstr "Åã¥Ü·Ó¤ù ID" -#: g10/keyedit.c:1004 g10/delkey.c:119 +#: g10/keyedit.c:1041 g10/delkey.c:119 msgid "can't do that in batchmode\n" msgstr "µLªk¦b§å¦¸¼Ò¦¡¤¤¨º¼Ë°µ\n" -#: g10/keyedit.c:1042 +#: g10/keyedit.c:1079 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "Ū¨úª÷Æ_°Ï¶ô `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keyedit.c:1060 +#: g10/keyedit.c:1097 msgid "Secret key is available.\n" msgstr "¨pÆ_¥i¥Î¡C\n" -#: g10/keyedit.c:1091 +#: g10/keyedit.c:1128 msgid "Command> " msgstr "«ü¥O> " -#: g10/keyedit.c:1123 +#: g10/keyedit.c:1160 msgid "Need the secret key to do this.\n" msgstr "­n¦³¨pÆ_Åׯà³o»ò°µ¡C\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1164 msgid "Please use the command \"toggle\" first.\n" msgstr "½Ð¥ý¨Ï¥Î \"toggle\" «ü¥O¡C\n" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1213 msgid "Key is revoked." msgstr "ª÷Æ_¤w¸g³QºM¾P¤F¡C" -#: g10/keyedit.c:1195 +#: g10/keyedit.c:1232 msgid "Really sign all user IDs? " msgstr "¯uªº­nñ¸p©Ò¦³ªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1196 +#: g10/keyedit.c:1233 msgid "Hint: Select the user IDs to sign\n" msgstr "´£¥Ü¡G¿ï¾Ü­nñ¸pªº¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:1221 +#: g10/keyedit.c:1258 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "¦b %s ¼Ò¦¡¤¤¤£¤¹³\¨Ï¥Î³o­Ó«ü¥O¡C\n" -#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322 +#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359 msgid "You must select at least one user ID.\n" msgstr "©p¦Ü¤Ö±o¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:1243 +#: g10/keyedit.c:1280 msgid "You can't delete the last user ID!\n" msgstr "©p¤£¯à§R°£³Ì«á¤@­Ó¨Ï¥ÎªÌ ID ¡I\n" -#: g10/keyedit.c:1246 +#: g10/keyedit.c:1283 msgid "Really remove all selected user IDs? " msgstr "¯uªº­n²¾°£©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1284 msgid "Really remove this user ID? " msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1285 g10/keyedit.c:1341 +#: g10/keyedit.c:1322 g10/keyedit.c:1378 msgid "You must select at least one key.\n" msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "Do you really want to delete the selected keys? " msgstr "©p¯uªº·Q­n§R°£³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "Do you really want to delete this key? " msgstr "©p¯uªº­n§R°£³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1362 msgid "Really revoke all selected user IDs? " msgstr "¯uªº­nºM¾P©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1363 msgid "Really revoke this user ID? " msgstr "¯uªº­nºM¾P³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1345 +#: g10/keyedit.c:1382 msgid "Do you really want to revoke the selected keys? " msgstr "©p¯uªº·Q­nºM¾P³o¨Ç³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1346 +#: g10/keyedit.c:1383 msgid "Do you really want to revoke this key? " msgstr "©p¯uªº·Q­nºM¾P³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1452 msgid "Really update the preferences for the selected user IDs? " msgstr "¯uªº­n§ó·s³Q¿ï¾Ü¨Ï¥ÎªÌ ID ªº°¾¦n¶Ü¡H " -#: g10/keyedit.c:1417 +#: g10/keyedit.c:1454 msgid "Really update the preferences? " msgstr "¯uªº­n§ó·s°¾¦n¶Ü¡H " -#: g10/keyedit.c:1455 +#: g10/keyedit.c:1492 msgid "Save changes? " msgstr "­nÀx¦sÅܧó¶Ü¡H " -#: g10/keyedit.c:1458 +#: g10/keyedit.c:1495 msgid "Quit without saving? " msgstr "­n¤£Àx¦s¦ÓÂ÷¶}¶Ü¡H " -#: g10/keyedit.c:1469 +#: g10/keyedit.c:1506 #, c-format msgid "update failed: %s\n" msgstr "§ó·s¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1476 +#: g10/keyedit.c:1513 #, c-format msgid "update secret failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1483 +#: g10/keyedit.c:1520 msgid "Key not changed so no update needed.\n" msgstr "ª÷Æ_¨S¦³Åܧó©Ò¥H¤£»Ý­n§ó·s¡C\n" -#: g10/keyedit.c:1495 +#: g10/keyedit.c:1532 msgid "Invalid command (try \"help\")\n" msgstr "µL®Äªº«ü¥O (¸Õ¸Õ¬Ý \"help\")\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1591 msgid "Digest: " msgstr "ºK­n¡G " -#: g10/keyedit.c:1606 +#: g10/keyedit.c:1643 msgid "Features: " msgstr "¯SÂI¡G " -#: g10/keyedit.c:1843 +#: g10/keyedit.c:1880 #, c-format msgid "This key may be revoked by %s key " msgstr "³o§âª÷Æ_¥i¯à³Q %s ª÷Æ_ºM¾P¤F " -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1884 msgid " (sensitive)" msgstr " ¡]¾÷±Kªº¡^" #. Note, we use the same format string as in other show #. functions to make the translation job easier. -#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979 +#: g10/keyedit.c:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX »s³y©ó¡G %s ¨Ï¥Î´Á­­¡G %s" -#: g10/keyedit.c:1862 +#: g10/keyedit.c:1899 #, c-format msgid " trust: %c/%c" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1903 msgid "This key has been disabled" msgstr "³o§âª÷Æ_¤w¸g³Q¸T¥Î¤F" -#: g10/keyedit.c:1895 +#: g10/keyedit.c:1932 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! ¤lÆ_¤w¸g³QºM¾P¤F¡G %s\n" -#: g10/keyedit.c:1898 +#: g10/keyedit.c:1935 msgid "rev- faked revocation found\n" msgstr "rev- µo²{³Q°°³yªººM¾P\n" -#: g10/keyedit.c:1900 +#: g10/keyedit.c:1937 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? ÀˬdºM¾P®Éµo¥Í°ÝÃD¡G %s\n" -#: g10/keyedit.c:1920 -#, fuzzy +#: g10/keyedit.c:1957 msgid "[revoked] " -msgstr "revkey" +msgstr "[¤wºM¾P]" -#: g10/keyedit.c:1922 -#, fuzzy +#: g10/keyedit.c:1959 msgid "[expired] " -msgstr "expire" +msgstr "[¤w¹L´Á]" -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1967 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x «¬ºAªº¨Ï¥ÎªÌ ID ¨S¦³°¾¦n¡C\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1975 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3184,7 +3223,13 @@ msgstr "" "½Ðª`·NÅã¥Ü¥X¨Óªºª÷Æ_¦³®Ä©Ê¤£»Ý­n§ó¥¿¡A\n" "°£«D©p­«·s°õ¦æµ{¦¡¡C\n" -#: g10/keyedit.c:2095 +#: g10/keyedit.c:2107 +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:2166 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3193,45 +3238,45 @@ msgstr "" "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[·Ó¤ù ID ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2100 g10/keyedit.c:2373 +#: g10/keyedit.c:2171 g10/keyedit.c:2444 msgid "Are you sure you still want to add it? (y/N) " msgstr "©p½T©w¤´µM·Q­n¼W¥[¶Ü¡H (y/N) " -#: g10/keyedit.c:2106 +#: g10/keyedit.c:2177 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "©p¤£¥i¥H§â·Ó¤ù ID ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2241 +#: g10/keyedit.c:2312 msgid "Delete this good signature? (y/N/q)" msgstr "§R°£³o­Ó§¹¦nªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2322 msgid "Delete this invalid signature? (y/N/q)" msgstr "§R°£³o­ÓµL®ÄªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2255 +#: g10/keyedit.c:2326 msgid "Delete this unknown signature? (y/N/q)" msgstr "§R°£³o­Ó¥¼ª¾ªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2261 +#: g10/keyedit.c:2332 msgid "Really delete this self-signature? (y/N)" msgstr "¯uªº­n§R°£³o­Ó¦Û§Úñ³¹¶Ü¡H (y/N)" -#: g10/keyedit.c:2275 +#: g10/keyedit.c:2346 #, c-format msgid "Deleted %d signature.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2347 #, c-format msgid "Deleted %d signatures.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2279 +#: g10/keyedit.c:2350 msgid "Nothing deleted.\n" msgstr "¨S¦³ªF¦è³Q§R°£¡C\n" -#: g10/keyedit.c:2368 +#: g10/keyedit.c:2439 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3240,84 +3285,82 @@ msgstr "" "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[«ü©wºM¾PªÌ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2379 +#: g10/keyedit.c:2450 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "©p¤£¥i¥H§â«ü©wºM¾PªÌ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2402 +#: g10/keyedit.c:2473 msgid "Enter the user ID of the designated revoker: " msgstr "¿é¤J«ü©wºM¾PªÌªº¨Ï¥ÎªÌ ID ¡G " -#: g10/keyedit.c:2417 +#: g10/keyedit.c:2488 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" #. 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:2427 +#: g10/keyedit.c:2498 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2446 -#, fuzzy +#: g10/keyedit.c:2517 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" +msgstr "ĵ§i¡G¤@¥¹§â¬Y§âª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ«á¡A´NµLªk¤Ï®¬¤F¡I\n" -#: g10/keyedit.c:2452 -#, fuzzy +#: g10/keyedit.c:2523 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" +msgstr "©p½T©w­n«ü¬£³o§âª÷Æ_¬°«ü©wºM¾PªÌ¶Ü¡H (y/N): " -#: g10/keyedit.c:2517 +#: g10/keyedit.c:2588 msgid "Please remove selections from the secret keys.\n" msgstr "½Ð±q¨pÆ_¤¤²¾°£¿ï¾Ü¡C\n" -#: g10/keyedit.c:2523 +#: g10/keyedit.c:2594 msgid "Please select at most one secondary key.\n" msgstr "½Ð¦Ü¦h¿ï¾Ü¤@§â¦¸Æ_¡C\n" -#: g10/keyedit.c:2527 +#: g10/keyedit.c:2598 msgid "Changing expiration time for a secondary key.\n" msgstr "¥¿¦bÅܧó¬Y§â¦¸Æ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:2529 +#: g10/keyedit.c:2600 msgid "Changing expiration time for the primary key.\n" msgstr "¥¿¦bÅܧó¥DÆ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:2571 +#: g10/keyedit.c:2645 msgid "You can't change the expiration date of a v3 key\n" msgstr "©p¤£¯àÅܧó v3 ª÷Æ_ªº¨Ï¥Î´Á­­\n" -#: g10/keyedit.c:2587 +#: g10/keyedit.c:2661 msgid "No corresponding signature in secret ring\n" msgstr "¦b¨pÆ_°é¸Ì¨S¦³¤@­PªºÃ±³¹\n" -#: g10/keyedit.c:2667 +#: g10/keyedit.c:2741 msgid "Please select exactly one user ID.\n" msgstr "½Ðºë½T¦a¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:2704 g10/keyedit.c:2811 +#: g10/keyedit.c:2778 g10/keyedit.c:2887 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "¥¿¦b¨Ï¥ÎªÌ ID \"%s\" ¸õ¹L v3 ¦Û§Úñ³¹\n" -#: g10/keyedit.c:2871 +#: g10/keyedit.c:2947 #, c-format msgid "No user ID with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:2917 +#: g10/keyedit.c:2993 #, c-format msgid "No secondary key with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¦¸Æ_\n" -#: g10/keyedit.c:3031 +#: g10/keyedit.c:3107 msgid "user ID: \"" msgstr "¨Ï¥ÎªÌ ID¡G \"" -#: g10/keyedit.c:3036 +#: g10/keyedit.c:3112 #, c-format msgid "" "\"\n" @@ -3326,7 +3369,7 @@ msgstr "" "\"\n" "¤w¸g³Q©pªºª÷Æ_ %08lX ñ¸p©ó %s\n" -#: g10/keyedit.c:3039 +#: g10/keyedit.c:3115 #, c-format msgid "" "\"\n" @@ -3335,56 +3378,56 @@ msgstr "" "\"\n" "¤w¸g³Q©pªºª÷Æ_ %08lX ¦b¥»¦añ¸p©ó %s\n" -#: g10/keyedit.c:3044 +#: g10/keyedit.c:3120 #, c-format msgid "This signature expired on %s.\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3124 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "©p½T©w©p¤´µM·Q­nºM¾P¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3128 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "­n¬°³o¥÷ñ³¹«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH (y/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:3077 +#: g10/keyedit.c:3153 msgid "You have signed these user IDs:\n" msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n" -#: g10/keyedit.c:3096 +#: g10/keyedit.c:3172 #, c-format msgid " signed by %08lX at %s%s%s\n" msgstr " ¥Ñ %08lX ñ¸p©ó %s%s%s\n" -#: g10/keyedit.c:3104 +#: g10/keyedit.c:3180 #, c-format msgid " revoked by %08lX at %s\n" msgstr " ¥Ñ %08lX ºM¾P©ó %s\n" -#: g10/keyedit.c:3124 +#: g10/keyedit.c:3200 msgid "You are about to revoke these signatures:\n" msgstr "©p¥¿¦bºM¾P³o¨Çñ³¹¡G\n" -#: g10/keyedit.c:3134 +#: g10/keyedit.c:3210 #, c-format msgid " signed by %08lX at %s%s\n" msgstr " ¥Ñ %08lX ñ¸p©ó %s%s\n" -#: g10/keyedit.c:3136 +#: g10/keyedit.c:3212 msgid " (non-exportable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3219 msgid "Really create the revocation certificates? (y/N) " msgstr "¯uªº­n«Ø¥ßºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3249 msgid "no secret key\n" msgstr "¨S¦³¨pÆ_\n" -#: g10/keyedit.c:3243 +#: g10/keyedit.c:3319 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\n" @@ -3393,68 +3436,68 @@ msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\ #. created in the future, so we need to warn the user and #. set our revocation timestamp one second after that so #. everything comes out clean. -#: g10/keyedit.c:3260 +#: g10/keyedit.c:3336 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ĵ§i¡G¦³¤@¥÷¨Ï¥ÎªÌ ID ñ³¹ªº¤é´Á¼Ð°O¬° %d ¬í«áªº¥¼¨Ó\n" -#: g10/keyedit.c:3433 +#: g10/keyedit.c:3509 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "¥¿¦bÅã¥Ü %s ¤Ø¤o¬° %ld ªºª÷Æ_ 0x%08lX (uid %d) ªº·Ó¤ù ID\n" -#: g10/keylist.c:91 +#: g10/keylist.c:112 msgid "Critical signature policy: " msgstr "ÃöÁäñ³¹­ì«h¡G " -#: g10/keylist.c:93 +#: g10/keylist.c:114 msgid "Signature policy: " msgstr "ñ³¹­ì«h¡G " -#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775 msgid "WARNING: invalid notation data found\n" msgstr "ĵ§i¡G§ä¨ìµL®Äªº¼Ð°O¸ê®Æ\n" -#: g10/keylist.c:127 +#: g10/keylist.c:148 msgid "Critical signature notation: " msgstr "ÃöÁäñ³¹¼Ð°O¡G " -#: g10/keylist.c:129 +#: g10/keylist.c:150 msgid "Signature notation: " msgstr "ñ³¹¼Ð°O¡G " -#: g10/keylist.c:136 +#: g10/keylist.c:157 msgid "not human readable" msgstr "¤£¬O¤HÃþ¯àŪ±oÀ´ªº" -#: g10/keylist.c:225 +#: g10/keylist.c:250 msgid "Keyring" msgstr "Æ_°Í°é" #. of subkey -#: g10/keylist.c:507 g10/mainproc.c:905 +#: g10/keylist.c:527 g10/mainproc.c:902 #, c-format msgid " [expires: %s]" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keylist.c:1025 +#: g10/keylist.c:1049 msgid "Primary key fingerprint:" msgstr "¥DÆ_«ü¯¾¡G" -#: g10/keylist.c:1027 +#: g10/keylist.c:1051 msgid " Subkey fingerprint:" msgstr " ¤lÆ_«ü¯¾¡G" -#: g10/keylist.c:1034 +#: g10/keylist.c:1058 msgid " Primary key fingerprint:" msgstr " ¥DÆ_«ü¯¾¡G" -#: g10/keylist.c:1036 +#: g10/keylist.c:1060 msgid " Subkey fingerprint:" msgstr " ¤lÆ_«ü¯¾¡G" #. use tty -#: g10/keylist.c:1040 g10/keylist.c:1044 +#: g10/keylist.c:1064 g10/keylist.c:1068 msgid " Key fingerprint =" msgstr " ª÷Æ_«ü¯¾ =" @@ -3538,101 +3581,108 @@ msgstr "½Ðª`·N¡G±H¥óªÌ­n¨D¤F¡u©pÀ³¸Ó¬é¥Î msgid "original file name='%.*s'\n" msgstr "­ì©lªºÀɦW ='%.*s'\n" -#: g10/mainproc.c:713 +#: g10/mainproc.c:710 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "¿W¥ßºM¾P ¢w ½Ð¥Î \"gpg --import\" ¨Ó®M¥Î\n" -#: g10/mainproc.c:781 +#: g10/mainproc.c:778 msgid "Notation: " msgstr "¼Ð°O¡G " -#: g10/mainproc.c:793 +#: g10/mainproc.c:790 msgid "Policy: " msgstr "­ì«h¡G " -#: g10/mainproc.c:1248 +#: g10/mainproc.c:1245 msgid "signature verification suppressed\n" msgstr "ñ³¹ÅçÃÒ¤w³Q§í¨î\n" #. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1290 g10/mainproc.c:1300 +#: g10/mainproc.c:1287 g10/mainproc.c:1297 msgid "can't handle these multiple signatures\n" msgstr "µLªk³B²z³o¨Ç¦h­«Ã±³¹\n" -#: g10/mainproc.c:1311 +#: g10/mainproc.c:1306 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "¥Ñ %.*s «Ø¥ßªºÃ±³¹¡A¨Ï¥Î %s ª÷Æ_ ID %08lX\n" -#: g10/mainproc.c:1360 g10/mainproc.c:1393 +#. According to my favorite copy editor, in English +#. grammar, you say "at" if the key is located on a web +#. page, but "from" if it is located on a keyserver. I'm +#. not going to even try to make two strings here :) +#: g10/mainproc.c:1329 +#, fuzzy +msgid "Key available at: " +msgstr "¨S¦³¥i¥Îªº»¡©ú" + +#: g10/mainproc.c:1378 g10/mainproc.c:1411 msgid "BAD signature from \"" msgstr "*·lÃa* ªºÃ±³¹¨Ó¦Û©ó \"" -#: g10/mainproc.c:1361 g10/mainproc.c:1394 +#: g10/mainproc.c:1379 g10/mainproc.c:1412 msgid "Expired signature from \"" msgstr "¹L´ÁªºÃ±³¹¨Ó¦Û©ó \"" -#: g10/mainproc.c:1362 g10/mainproc.c:1395 +#: g10/mainproc.c:1380 g10/mainproc.c:1413 msgid "Good signature from \"" msgstr "§¹¦nªºÃ±³¹¨Ó¦Û©ó \"" -#: g10/mainproc.c:1397 +#: g10/mainproc.c:1415 msgid "[uncertain]" msgstr "[¤£½T©w]" -#: g10/mainproc.c:1491 -#, fuzzy, c-format +#: g10/mainproc.c:1514 +#, c-format msgid "Signature expired %s\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/mainproc.c:1496 -#, fuzzy, c-format +#: g10/mainproc.c:1519 +#, c-format msgid "Signature expires %s\n" -msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" +msgstr "³o¥÷ñ¸p¦b %s ¹L´Á¡C\n" -#: g10/mainproc.c:1499 -#, fuzzy, c-format +#: g10/mainproc.c:1522 +#, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%s ñ³¹¨Ó¦Û¡G \"%s\"\n" +msgstr "%s ñ³¹¡AºK­nºtºâªk %s\n" -#: g10/mainproc.c:1500 -#, fuzzy +#: g10/mainproc.c:1523 msgid "binary" -msgstr "primary" +msgstr "¤G¶i¨î" -#: g10/mainproc.c:1501 +#: g10/mainproc.c:1524 msgid "textmode" -msgstr "" +msgstr "¤å¦r¼Ò¦¡" -#: g10/mainproc.c:1501 -#, fuzzy +#: g10/mainproc.c:1524 msgid "unknown" -msgstr "¥¼ª¾ªºª©¥»" +msgstr "¥¼ª¾" -#: g10/mainproc.c:1521 +#: g10/mainproc.c:1544 #, c-format msgid "Can't check signature: %s\n" msgstr "µLªkÀˬdñ³¹¡G %s\n" -#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672 +#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715 msgid "not a detached signature\n" msgstr "¤£¬O¤@¥÷¤ÀÂ÷ªºÃ±³¹\n" -#: g10/mainproc.c:1617 +#: g10/mainproc.c:1656 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "ĵ§i¡G°»´ú¨ì¦h­«Ã±³¹¡C¬é¦³²Ä¤@­Óñ³¹Å×·|³Q®Ö¿ï¡C\n" -#: g10/mainproc.c:1621 +#: g10/mainproc.c:1664 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "µ¥¯Å 0x%02x ªº¿W¥ßñ³¹\n" -#: g10/mainproc.c:1678 +#: g10/mainproc.c:1721 msgid "old style (PGP 2.x) signature\n" msgstr "«¬ (PGP 2.x) ñ³¹\n" -#: g10/mainproc.c:1684 +#: g10/mainproc.c:1731 msgid "invalid root packet detected in proc_tree()\n" msgstr "¦b proc_tree() ¤¤°»´ú¨ìµL®Äªº root «Ê¥]\n" @@ -3651,82 +3701,87 @@ msgstr "¤£«Øij¨Ï¥Î³o­Ó½s±Kºtºâªk¡F½Ð´«¥Î #: g10/misc.c:300 msgid "the IDEA cipher plugin is not present\n" -msgstr "IDEA ±K½Xªk¥~±¾¼Ò²Õ¤£¦s¦b\n" +msgstr "IDEA ½s±Kªk¥~±¾¼Ò²Õ¤£¦s¦b\n" #: g10/misc.c:301 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "½Ð°Ñ¦Ò http://www.gnupg.org/why-not-idea.html ¨ú±o§ó¦h¸ê°T\n" -#: g10/misc.c:509 +#: g10/misc.c:533 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: ¤£«Øij¨Ï¥Îªº¿ï¶µ \"%s\"\n" -#: g10/misc.c:513 +#: g10/misc.c:537 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "ĵ§i¡G \"%s\" ¿ï¶µ¤w¤£«Øij¨Ï¥Î\n" -#: g10/misc.c:515 +#: g10/misc.c:539 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "½Ð§ï¥H \"%s%s\" ¥N´À\n" -#: g10/parse-packet.c:120 +#: g10/misc.c:617 +#, c-format +msgid "this message may not be usable by %s\n" +msgstr "³o­Ó°T®§¤]³\¤£¬O %s ©Ò¯à¥Îªº\n" + +#: g10/parse-packet.c:121 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "µLªk¾Þ§@¤½¶}ª÷Æ_ºtºâªk %d\n" -#: g10/parse-packet.c:1069 +#: g10/parse-packet.c:1083 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d Ãþ§Oªº¤l«Ê¥]³]©w¤FÃöÁä¦ì¤¸\n" -#: g10/passphrase.c:455 g10/passphrase.c:502 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ¦b¦¹¶¥¬qµLªk¨Ï¥Î\n" -#: g10/passphrase.c:463 +#: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" msgstr "µLªk³]©w¥N²zµ{¦¡¤¤ªº¨Ï¥ÎªÌºÝ pid\n" -#: g10/passphrase.c:471 +#: g10/passphrase.c:475 msgid "can't get server read FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹Åª¨úÀÉ®×´y­z\n" -#: g10/passphrase.c:478 +#: g10/passphrase.c:482 msgid "can't get server write FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹¼g¤JÀÉ®×´y­z\n" -#: g10/passphrase.c:511 +#: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "³QÅܳyªº GPG_AGENT_INFO Àô¹ÒÅܼÆ\n" -#: g10/passphrase.c:524 +#: g10/passphrase.c:528 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent ¨ó©wª©¥» %d ¥¼³Q¤ä´©\n" -#: g10/passphrase.c:545 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:155 #, c-format msgid "can't connect to `%s': %s\n" msgstr "µLªk³s±µ¦Ü `%s' ¡G %s\n" -#: g10/passphrase.c:567 +#: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ªº³q°T°ÝÃD\n" -#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988 +#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n" -#: g10/passphrase.c:676 g10/passphrase.c:1094 +#: g10/passphrase.c:680 g10/passphrase.c:1098 #, c-format msgid " (main key ID %08lX)" msgstr " (¥D­nª÷Æ_ ID %08lX)" -#: g10/passphrase.c:686 +#: g10/passphrase.c:690 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3737,32 +3792,32 @@ msgstr "" "\"%.*s\"\n" "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s%s\n" -#: g10/passphrase.c:708 +#: g10/passphrase.c:712 msgid "Repeat passphrase\n" msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê\n" -#: g10/passphrase.c:710 +#: g10/passphrase.c:714 msgid "Enter passphrase\n" msgstr "½Ð¿é¤J±K½X¦ê\n" -#: g10/passphrase.c:748 +#: g10/passphrase.c:752 msgid "passphrase too long\n" msgstr "±K½X¦ê¤Óªø\n" -#: g10/passphrase.c:761 +#: g10/passphrase.c:765 msgid "invalid response from agent\n" msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n" -#: g10/passphrase.c:776 g10/passphrase.c:869 +#: g10/passphrase.c:780 g10/passphrase.c:873 msgid "cancelled by user\n" msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n" -#: g10/passphrase.c:781 g10/passphrase.c:959 +#: g10/passphrase.c:785 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n" -#: g10/passphrase.c:1080 +#: g10/passphrase.c:1084 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3772,20 +3827,20 @@ msgstr "" "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n" "\"" -#: g10/passphrase.c:1089 +#: g10/passphrase.c:1093 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s" -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1145 msgid "can't query password in batchmode\n" msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1149 msgid "Enter passphrase: " msgstr "½Ð¿é¤J±K½X¦ê¡G " -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1153 msgid "Repeat passphrase: " msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " @@ -3877,8 +3932,8 @@ msgid "failed sending to `%s': status=%u msgstr "¶Ç°e¨ì `%s' ªº®É­Ô¥¢±Ñ¤F¡Gª¬ºA=%u\n" #: g10/hkp.c:369 -msgid "this keyserver is not fully HKP compatible\n" -msgstr "³o­Óª÷Æ_¦øªA¾¹¨Ã«D§¹¥þ»P HKP ¬Û®e\n" +msgid "this keyserver does not support --search-keys\n" +msgstr "" #: g10/hkp.c:519 #, c-format @@ -3916,28 +3971,28 @@ msgstr "ĵ§i¡G°»´ú¨ìª÷Æ_Á¡®z ¢w ½Ð¦A§ó´« msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "¥¿¦b²£¥Í¨pÆ_«OÅ@·|¥Î¨ìªºÂ¦¡ 16 ¦ì¤¸¥[Á`Àˬd\n" -#: g10/sig-check.c:73 +#: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" msgstr "ĵ§i¡Gñ³¹ºK­n»P°T®§¤£¤@­P\n" -#: g10/sig-check.c:213 +#: g10/sig-check.c:215 #, c-format msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " "signatures!\n" msgstr "ª÷Æ_ %08lX: ³o¬O¥Ñ PGP ²£¥Íªº ElGamal ª÷Æ_¡A¥Î©óñ³¹¨Ã *¤£* ¦w¥þ¡I\n" -#: g10/sig-check.c:222 +#: g10/sig-check.c:224 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" msgstr "¤½Æ_ %08lX ¤ññ³¹ÁÙ­n·s¤F %lu ¬í\n" -#: g10/sig-check.c:223 +#: g10/sig-check.c:225 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" msgstr "¤½Æ_ %08lX ¤ññ³¹ÁÙ­n·s¤F %lu ¬í\n" -#: g10/sig-check.c:232 +#: g10/sig-check.c:234 #, c-format msgid "" "key %08lX has been created %lu second in future (time warp or clock " @@ -3945,7 +4000,7 @@ msgid "" msgstr "" "ª÷Æ_ %08lX ¬O¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Óªº (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/sig-check.c:234 +#: g10/sig-check.c:236 #, c-format msgid "" "key %08lX has been created %lu seconds in future (time warp or clock " @@ -3953,50 +4008,52 @@ msgid "" msgstr "" "ª÷Æ_ %08lX ¤w¸g¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Ó¤F (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/sig-check.c:247 +#: g10/sig-check.c:249 #, c-format msgid "NOTE: signature key %08lX expired %s\n" msgstr "½Ðª`·N¡Gñ³¹ª÷Æ_ %08lX ¤w©ó %s ¹L´Á\n" -#: g10/sig-check.c:346 +#: g10/sig-check.c:352 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "°²³]ª÷Æ_ %08lX ªº·lÃañ³¹¾É¦]©ó¬Y­Ó¥¼ª¾ªºÃöÁä¦ì¤¸\n" -#: g10/sig-check.c:552 +#: g10/sig-check.c:562 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_ºM¾P«Ê¥]©Ò»Ýªº¤lÆ_\n" -#: g10/sign.c:78 -#, fuzzy +#: g10/sig-check.c:588 +#, fuzzy, c-format +msgid "key %08lX: no subkey for subkey binding signature\n" +msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_¥i¨Ñªþ±a\n" + +#: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" +msgstr "µLªk¦b v3 ¡] PGP 2.x «¬ºA¡^ªºÃ±³¹¤º©ñ¤J¼Ð°O¸ê®Æ\n" -#: g10/sign.c:86 -#, fuzzy +#: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" +msgstr "µLªk¦b v3 ¡] PGP 2.x «¬ºA¡^ªºª÷Æ_ñ³¹¤º©ñ¤J¼Ð°O¸ê®Æ\n" -#: g10/sign.c:105 +#: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "ĵ§i¡G¼Ð°O %% µLªkÂX±i (¤Ó¤j¤F)¡C ²{¦b¨Ï¥Î¥¼ÂX±iªº¡C\n" -#: g10/sign.c:134 -#, fuzzy +#: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" +msgstr "µLªk¦b v3 ¡] PGP 2.x «¬ºA¡^ªºÃ±³¹¤º©ñ¤J­ì«h URL\n" -#: g10/sign.c:142 +#: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "" +msgstr "µLªk¦b v3 ¡] PGP 2.x «¬ºA¡^ªºª÷Æ_ñ³¹¤º©ñ¤J­ì«h URL\n" -#: g10/sign.c:155 +#: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" -msgstr "ĵ§i¡G­ì«h url ªº %% µLªkÂX±i (¤Ó¤j¤F)¡C ²{¦b¨Ï¥Î¥¼ÂX±iªº¡C\n" +msgstr "ĵ§i¡G­ì«h URL ªº %% µLªkÂX±i (¤Ó¤j¤F)¡C ²{¦b¨Ï¥Î¥¼ÂX±iªº¡C\n" #: g10/sign.c:307 #, c-format @@ -4017,12 +4074,12 @@ msgstr "ĵ§i¡G `%s' ¬O¤@­ÓªÅÀÉ®×\n" msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U¬é¯à°÷¨Ï¥Î PGP 2.x «¬ºAªºª÷Æ_¨Ó°µ¤ÀÂ÷ñ¸p\n" -#: g10/sign.c:673 g10/sign.c:912 +#: g10/sign.c:672 g10/sign.c:911 #, c-format msgid "can't create %s: %s\n" msgstr "µLªk«Ø¥ß %s: %s\n" -#: g10/sign.c:702 +#: g10/sign.c:701 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "±j­¢¨Ï¥Î %s (%d) ºK­nºtºâªk·|¹H¤Ï¦¬¥óªÌ°¾¦n³]©w\n" @@ -4035,7 +4092,7 @@ msgstr "ñ¸p¡G" msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U¬é¯à°÷¨Ï¥Î PGP 2.x «¬ºAªºª÷Æ_¨Ó°µ©ú¤åñ¸p\n" -#: g10/sign.c:1050 +#: g10/sign.c:1049 #, c-format msgid "%s encryption will be used\n" msgstr "%s ¥[±K±N³Q±Ä¥Î\n" @@ -4050,12 +4107,12 @@ msgstr "µLªk³B²zªø©ó %d ¦r²Åªº¤å¦r¦C\n" msgid "input line longer than %d characters\n" msgstr "¿é¤J¦C¤ñ %d ¦r²ÅÁÙªø\n" -#: g10/tdbio.c:128 g10/tdbio.c:1406 +#: g10/tdbio.c:128 g10/tdbio.c:1411 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "«H¥ô¸ê®Æ®w°O¿ý %lu: ¥»¦a·j´M¥¢±Ñ¡G %s\n" -#: g10/tdbio.c:134 g10/tdbio.c:1413 +#: g10/tdbio.c:134 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "«H¥ô¸ê®Æ®w°O¿ý %lu: ¼g¤J¥¢±Ñ (n=%d): %s\n" @@ -4064,122 +4121,122 @@ msgstr "«H¥ô¸ê®Æ®w°O¿ý %lu: ¼g¤J¥¢±Ñ (n= msgid "trustdb transaction too large\n" msgstr "«H¥ô¸ê®Æ®w§ó°Ê¶q¹L¤j\n" -#: g10/tdbio.c:468 +#: g10/tdbio.c:471 #, c-format msgid "%s: can't access: %s\n" msgstr "%s: µLªk¦s¨ú¡G %s\n" -#: g10/tdbio.c:483 +#: g10/tdbio.c:486 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s: ¥Ø¿ý¤£¦s¦b¡I\n" -#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: µLªk«Ø¥ßÂê©w\n" -#: g10/tdbio.c:495 g10/tdbio.c:557 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" msgstr "%s: µLªkÂê©w\n" -#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: µLªk«Ø¥ß¡G %s\n" -#: g10/tdbio.c:516 +#: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s: «Ø¥ßª©¥»°O¿ý¥¢±Ñ¡G %s" -#: g10/tdbio.c:520 +#: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s: «Ø¥ß¤FµL®Äªº«H¥ô¸ê®Æ®w\n" -#: g10/tdbio.c:523 +#: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" msgstr "%s: «Ø¥ß¤F«H¥ô¸ê®Æ®w\n" -#: g10/tdbio.c:563 +#: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" msgstr "½Ðª`·N¡G«H¥ô¸ê®Æ®w¤£¥i¼g¤J\n" -#: g10/tdbio.c:579 -#, fuzzy, c-format +#: g10/tdbio.c:582 +#, c-format msgid "%s: invalid trustdb\n" -msgstr "%S: µL®Äªº«H¥ô¸ê®Æ®w\n" +msgstr "%s: µL®Äªº«H¥ô¸ê®Æ®w\n" -#: g10/tdbio.c:611 +#: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s: «Ø¥ßÂø´êªí¥¢±Ñ¡G %s\n" -#: g10/tdbio.c:619 +#: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s: §ó·sª©¥»°O¿ý®É¿ù»~¡G %s\n" -#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715 -#: g10/tdbio.c:1339 g10/tdbio.c:1366 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1344 g10/tdbio.c:1371 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: Ū¨úª©¥»°O¿ý®É¿ù»~¡G %s\n" -#: g10/tdbio.c:648 g10/tdbio.c:694 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: ¼g¤Jª©¥»°O¿ý®É¿ù»~¡G %s\n" -#: g10/tdbio.c:1133 +#: g10/tdbio.c:1142 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "«H¥ô¸ê®Æ®w¡G¥»¦a·j´M¥¢±Ñ¡G %s\n" -#: g10/tdbio.c:1141 +#: g10/tdbio.c:1150 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "«H¥ô¸ê®Æ®w¡GŪ¨ú¥¢±Ñ (n=%d): %s\n" -#: g10/tdbio.c:1162 +#: g10/tdbio.c:1171 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s: ¤£¬O¤@­Ó«H¥ô¸ê®Æ®wÀÉ®×\n" -#: g10/tdbio.c:1182 +#: g10/tdbio.c:1189 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s: °O¿ý½s¸¹¬° %lu ªºª©¥»°O¿ý\n" -#: g10/tdbio.c:1187 +#: g10/tdbio.c:1194 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s: µL®ÄªºÀɮת©¥» %d\n" -#: g10/tdbio.c:1372 +#: g10/tdbio.c:1377 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s: Ū¨ú¦Û¥Ñ°O¿ý®É¿ù»~¡G %s\n" -#: g10/tdbio.c:1380 +#: g10/tdbio.c:1385 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s: ¼g¤J¥Ø¿ý°O¿ý®É¿ù»~¡G %s\n" -#: g10/tdbio.c:1390 +#: g10/tdbio.c:1395 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s: °O¿ýÂk¹s®É¥¢±Ñ¡G %s\n" -#: g10/tdbio.c:1420 +#: g10/tdbio.c:1425 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s: ªþ¥[¬Yµ§°O¿ý®É¥¢±Ñ¡G %s\n" -#: g10/tdbio.c:1465 +#: g10/tdbio.c:1470 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "«H¥ô¸ê®Æ®w·l·´¤F¡F½Ð°õ¦æ \"gpg --fix-trustdb\" ¡C\n" @@ -4228,39 +4285,38 @@ msgstr "«H¥ô°O¿ý %lu ¡AÃþ§O %d: ¼g¤J¥¢±Ñ msgid "trustdb: sync failed: %s\n" msgstr "«H¥ô¸ê®Æ®w¡G¦P¨B¤Æ¥¢±Ñ¡G %s\n" -#: g10/trustdb.c:460 +#: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "«H¥ô¸ê®Æ®wÀˬd¤£»Ý­n\n" -#: g10/trustdb.c:466 g10/trustdb.c:1771 +#: g10/trustdb.c:465 g10/trustdb.c:1795 #, c-format msgid "next trustdb check due at %s\n" msgstr "¦]¬° %s ¶i¦æ¤U¤@­Ó¸ê®Æ®wÀˬd\n" -#: g10/trustdb.c:819 +#: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" -msgstr "" +msgstr "½Ð°µ¤@¦¸ --check-trustdb\n" -#: g10/trustdb.c:823 +#: g10/trustdb.c:839 msgid "checking the trustdb\n" msgstr "¥¿¦bÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:1024 +#: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" msgstr "¤½Æ_ %08lX ¨S¦³³Q§ä¨ì¡G %s\n" -#: g10/trustdb.c:1565 +#: g10/trustdb.c:1589 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "" +msgstr "¤w¸g³B²z¤F %d §âª÷Æ_¡]¦@­p¤w¸Ñ¨M¤F %d ¥÷¦³®Ä©Ê¡^\n" -#: g10/trustdb.c:1619 -#, fuzzy +#: g10/trustdb.c:1643 msgid "no ultimately trusted keys found\n" -msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n" +msgstr "¨S¦³§ä¨ì¥ô¦ó¹ý©³«H¥ôªºª÷Æ_\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1661 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n" @@ -4268,7 +4324,7 @@ msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ #. This should be valid=%d now, but I'm not changing it so I #. don't break the translated strings in the stable branch. #. Change it in devel. -dms -#: g10/trustdb.c:1712 +#: g10/trustdb.c:1736 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "¥¿¦bÀˬd²`«× %d ñ¸p=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4798,17 +4854,17 @@ msgstr "½Ð­×¸É³o­Ó¥i¯àªº¦w¥þ©ÊµõÁ_\n" msgid "checking keyring `%s'\n" msgstr "¥¿¦bÀˬdÆ_°Í°é `%s'\n" -#: g10/keyring.c:1381 +#: g10/keyring.c:1388 #, c-format msgid "%lu keys so far checked (%lu signatures)\n" msgstr "¥Ø«eÀˬd¤F %lu §âª÷Æ_ (¦³ %lu ¥÷ñ³¹)\n" -#: g10/keyring.c:1392 +#: g10/keyring.c:1399 #, c-format msgid "%lu keys checked (%lu signatures)\n" msgstr "¥Ø«eÀˬd¤F %lu §âª÷Æ_ (¦³ %lu ¥÷ñ³¹)\n" -#: g10/keyring.c:1458 +#: g10/keyring.c:1465 #, c-format msgid "%s: keyring created\n" msgstr "%s: Æ_°Í°é¤w«Ø¥ß\n" @@ -4832,9 +4888,9 @@ msgid "Enter JPEG filename for photo ID: msgstr "¿é¤J­n·í§@¬Û¤ù ID ªº JPEG ÀɦW¡G " #: g10/photoid.c:87 -#, fuzzy, c-format +#, c-format msgid "Unable to open photo \"%s\": %s\n" -msgstr "µLªk§â°õ¦æÀɸô®|³]¨ì %s\n" +msgstr "µLªk¶}±Ò·Ó¤ù \"%s\": %s\n" #: g10/photoid.c:97 msgid "Are you sure you want to use it (y/N)? " @@ -4850,9 +4906,8 @@ msgid "Is this photo correct (y/N/q)? " msgstr "³o±i·Ó¤ù¥¿½T¶Ü¡H (y/N/q) " #: g10/photoid.c:331 -#, fuzzy msgid "unable to display photo ID!\n" -msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n" +msgstr "µLªkÅã¥Ü·Ó¤ù ID ¡I\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" @@ -4906,7 +4961,7 @@ msgstr "ĵ§i¡GµLªk²¾°£¼È¦sÀÉ (%s) `%s': msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ĵ§i¡GµLªk²¾°£¼È¦s¥Ø¿ý `%s': %s\n" -#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "¥Ã»·¤£¹L´Á" @@ -4943,7 +4998,7 @@ msgstr "­n¬°³o§âª÷Æ_«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH #: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "¤w±j­¢¨Ï¥Î ASCII «Ê¸Ë¹Lªº¿é¥X\n" +msgstr "¤w±j­¢¨Ï¥Î ASCII «Ê¸Ë¹Lªº¿é¥X¡C\n" #: g10/revoke.c:324 g10/revoke.c:548 #, c-format @@ -5002,34 +5057,33 @@ msgstr "" "¦ý¬O¤d¸U¤p¤ß¡G©pªº¾÷¾¹¤Wªº¦C¦L¨t²Î¥i¯à·|¦b¦C¦L¹L\n" "µ{¤¤§â³o¨Ç¸ê®Æ¼È¦s¦b¬Y­Ó¨ä¥L¤H¤]¯à°÷¬Ý±o¨ìªº¦a¤è¡I\n" -#: g10/revoke.c:614 -#, fuzzy +#: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" msgstr "½Ð¿ï¾ÜºM¾Pªº­ì¦]¡G\n" -#: g10/revoke.c:624 +#: g10/revoke.c:625 msgid "Cancel" msgstr "¨ú®ø" -#: g10/revoke.c:626 +#: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "¡]¤]³\©p·|·Q­n¦b³o¸Ì¿ï¾Ü %d ¡^\n" -#: g10/revoke.c:667 +#: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "½Ð¿é¤J¿ï¥Îªº´y­z¡F¥HªÅ¥Õ¦Cµ²§ô¡G\n" -#: g10/revoke.c:695 +#: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" msgstr "ºM¾P­ì¦]¡G %s\n" -#: g10/revoke.c:697 +#: g10/revoke.c:698 msgid "(No description given)\n" -msgstr "¡]¨S¦³µ¹­q´y­z¡^\n" +msgstr "¡]¨S¦³µ¹©w´y­z¡^\n" -#: g10/revoke.c:702 +#: g10/revoke.c:703 msgid "Is this okay? " msgstr "³o¼Ë¥i¥H¶Ü¡H " @@ -5039,7 +5093,7 @@ msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# ¬Û¹ïÀ³ªº«H¥ô­È²M³æ¡A«Ø¥ß©ó %s\n" +"# ¬Û¹ïÀ³ªº«H¥ô­È²M³æ³Q«Ø¥ß©ó %s\n" "# ¡]½Ð¥Î \"gpg --import-ownertrust\" ¨Ó¨ú¦^¥¦­Ì¡^\n" #: g10/tdbdump.c:140 @@ -5074,5 +5128,8 @@ msgstr "´M§ä«H¥ô°O¿ý®É¿ù»~¡G %s\n" msgid "read error: %s\n" msgstr "Ū¨ú¿ù»~¡G %s\n" +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "³o­Óª÷Æ_¦øªA¾¹¨Ã«D§¹¥þ»P HKP ¬Û®e\n" + #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "³o­Óºtºâªk¨Ã¤£³Q«Øij¨Ï¥Î ¢w µL½×¦p¦óÁÙ¬OÄ~Äò¶Ü¡H " diff -urpP gnupg-1.2.2/scripts/ChangeLog gnupg-1.2.3/scripts/ChangeLog --- gnupg-1.2.2/scripts/ChangeLog 2003-05-01 14:19:28.000000000 +0000 +++ gnupg-1.2.3/scripts/ChangeLog 2003-08-21 16:06:47.000000000 +0000 @@ -1,3 +1,17 @@ +2003-08-01 David Shaw + + * gnupg.spec.in: Make sure that install-info is called in such a + way that doesn't bork the RPM install if it cannot complete + (necessary for some upgrade scenarios). + +2003-07-31 David Shaw + + * gnupg.spec.in: Rework much of the spec to use %-macros + throughout. Fix to work properly with RPM 4.1 (all files in + buildroot must be packaged). Package and install info files. + Tweak the English description. Do not install gpgv and gpgsplit + setuid root. + 2003-05-01 Werner Koch * mk-w32-dist: Don't iconv {hu,sk,zh_TW}.po. diff -urpP gnupg-1.2.2/scripts/config.rpath gnupg-1.2.3/scripts/config.rpath --- gnupg-1.2.2/scripts/config.rpath 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.3/scripts/config.rpath 2003-06-19 10:18:05.000000000 +0000 @@ -0,0 +1,513 @@ +#! /bin/sh +# Output a system dependent set of variables, describing how to set the +# run time search path of shared libraries in an executable. +# +# Copyright 1996-2002 Free Software Foundation, Inc. +# Taken from GNU libtool, 2001 +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld +# should be set by the caller. +# +# The set of defined variables is at the end of this script. + +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). +libext=a +shlibext= + +host="$1" +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +wl= +if test "$GCC" = yes; then + wl='-Wl,' +else + case "$host_os" in + aix3* | aix4* | aix5*) + wl='-Wl,' + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' + ;; + irix5* | irix6*) + wl='-Wl,' + ;; + linux*) + echo '__INTEL_COMPILER' > conftest.$ac_ext + if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null + then + : + else + # Intel icc + wl='-Qoption,ld,' + fi + ;; + osf3* | osf4* | osf5*) + wl='-Wl,' + ;; + solaris*) + wl='-Wl,' + ;; + sunos4*) + wl='-Qoption ld ' + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + if test "x$host_vendor" = xsni; then + wl='-LD' + else + wl='-Wl,' + fi + ;; + esac +fi + +hardcode_libdir_flag_spec= +hardcode_libdir_separator= +hardcode_direct=no +hardcode_minus_L=no + +case "$host_os" in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes; then + case "$host_os" in + aix3* | aix4* | aix5*) + # On AIX, the GNU linker is very broken + ld_shlibs=no + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can use + # them. + ld_shlibs=no + ;; + beos*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + ;; + solaris* | sysv5*) + if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + sunos4*) + hardcode_direct=yes + ;; + *) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = yes; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + fi +else + case "$host_os" in + aix3*) + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + else + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + fi + hardcode_direct=yes + hardcode_libdir_separator=':' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + fi + if test "$aix_use_runtimelinking" = yes; then + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + else + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + fi + fi + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + libext=lib + ;; + darwin* | rhapsody*) + hardcode_direct=yes + ;; + freebsd1*) + ld_shlibs=no + ;; + freebsd2.2*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + freebsd2*) + hardcode_direct=yes + hardcode_minus_L=yes + ;; + freebsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + hpux9* | hpux10* | hpux11*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_minus_L=yes # Not in the search PATH, but as the default + # location of the library. + ;; + irix5* | irix6*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + netbsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + newsos6) + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + openbsd*) + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + osf3*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + osf4* | osf5*) + if test "$GCC" = yes; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + # Both cc and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + sco3.2v5*) + ;; + solaris*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + sunos4*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + ;; + sysv4) + if test "x$host_vendor" = xsno; then + hardcode_direct=yes # is this really true??? + else + hardcode_direct=no # Motorola manual says yes, but my tests say they lie + fi + ;; + sysv4.3*) + ;; + sysv5*) + hardcode_libdir_flag_spec= + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + sysv4*MP*) + if test -d /usr/nec; then + ld_shlibs=yes + fi + ;; + sysv4.2uw2*) + hardcode_direct=yes + hardcode_minus_L=no + ;; + sysv5uw7* | unixware7*) + ;; + *) + ld_shlibs=no + ;; + esac +fi + +# Check dynamic linker characteristics +libname_spec='lib$name' +sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +case "$host_os" in + aix3*) + shlibext=so + ;; + aix4* | aix5*) + shlibext=so + ;; + amigaos*) + shlibext=ixlibrary + ;; + beos*) + shlibext=so + ;; + bsdi4*) + shlibext=so + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + ;; + cygwin* | mingw* | pw32*) + case $GCC,$host_os in + yes,cygwin*) + shlibext=dll.a + ;; + yes,mingw*) + shlibext=dll + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + ;; + yes,pw32*) + shlibext=dll + ;; + *) + shlibext=dll + ;; + esac + ;; + darwin* | rhapsody*) + shlibext=dylib + ;; + freebsd1*) + ;; + freebsd*) + shlibext=so + ;; + gnu*) + shlibext=so + ;; + hpux9* | hpux10* | hpux11*) + shlibext=sl + ;; + irix5* | irix6*) + shlibext=so + case "$host_os" in + irix5*) + libsuff= shlibsuff= + ;; + *) + case $LD in + *-32|*"-32 ") libsuff= shlibsuff= ;; + *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 ") libsuff=64 shlibsuff=64 ;; + *) libsuff= shlibsuff= ;; + esac + ;; + esac + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + ;; + linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) + ;; + linux-gnu*) + shlibext=so + ;; + netbsd*) + shlibext=so + ;; + newsos6) + shlibext=so + ;; + openbsd*) + shlibext=so + ;; + os2*) + libname_spec='$name' + shlibext=dll + ;; + osf3* | osf4* | osf5*) + shlibext=so + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + sco3.2v5*) + shlibext=so + ;; + solaris*) + shlibext=so + ;; + sunos4*) + shlibext=so + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + shlibext=so + case "$host_vendor" in + motorola) + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + uts4*) + shlibext=so + ;; + dgux*) + shlibext=so + ;; + sysv4*MP*) + if test -d /usr/nec; then + shlibext=so + fi + ;; +esac + +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` + +sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' < +- Rework much of the spec to use %-macros throughout. +- Fix to work properly with RPM 4.1 (all files in buildroot must be packaged) +- Package and install info files. +- Tweak the English description. +- There is no need to install gpgv and gpgsplit setuid root. + * Sat Nov 30 2002 David Shaw - Add convert-from-106 script @@ -90,13 +98,16 @@ BuildRoot: /tmp/rpmbuild_%{name} - Updates for version 0.4.5 of GnuPG (.mo files) %description + GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and creating digital signatures. GnuPG has advanced key management capabilities and is compliant with the proposed OpenPGP Internet -standard described in RFC2440. Since GnuPG doesn't use any patented -algorithm, it is not compatible with any version of PGP2 (PGP2.x uses -only IDEA, patented worldwide, and RSA, which is patented in the US -until 9/20/00). +standard described in RFC-2440. Since GnuPG doesn't use any patented +algorithms, it is not compatible with some versions of PGP 2 which use +only the patented IDEA algorithm. See +http://www.gnupg.org/why-not-idea.html for information on using IDEA +if the patent does not apply to you and you need to be compatible with +these versions of PGP 2. %description -l it GnuPG (GNU Privacy Guard) è una utility GNU per la cifratura di dati e @@ -139,7 +150,6 @@ patent na terenie Stanów Zjednoczonych w %prep rm -rf $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup @@ -147,39 +157,43 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} if test -n "$LINGUAS"; then unset LINGUAS fi -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --enable-shared +%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} make %install -make install-strip prefix=$RPM_BUILD_ROOT/usr +%makeinstall +%find_lang %{name} +rm %{buildroot}%{_datadir}/%{name}/FAQ +rm %{buildroot}%{_datadir}/%{name}/faq.html +rm %{buildroot}%{_infodir}/dir -%files +%files -f %{name}.lang +%defattr (-,root,root) -%doc %attr (-,root,root) INSTALL -%doc %attr (-,root,root) AUTHORS -%doc %attr (-,root,root) COPYING -%doc %attr (-,root,root) ChangeLog -%doc %attr (-,root,root) NEWS -%doc %attr (-,root,root) README -%doc %attr (-,root,root) THANKS -%doc %attr (-,root,root) TODO -%doc %attr (-,root,root) PROJECTS -%doc %attr (-,root,root) doc/DETAILS -%doc %attr (-,root,root) doc/FAQ -%doc %attr (-,root,root) doc/faq.html -%doc %attr (-,root,root) doc/HACKING -%doc %attr (-,root,root) doc/OpenPGP -%doc %attr (-,root,root) doc/samplekeys.asc +%doc INSTALL AUTHORS COPYING NEWS README THANKS TODO PROJECTS doc/DETAILS +%doc doc/FAQ doc/faq.html doc/HACKING doc/OpenPGP doc/samplekeys.asc %doc %attr (0755,root,root) tools/convert-from-106 - -%attr (-,root,root) /usr/man/man1/gpg*.1* -%attr (-,root,root) /usr/man/man7/gnupg.7* -%attr (4755,root,root) /usr/bin/gpg -%attr (4755,root,root) /usr/bin/gpgv -%attr (4755,root,root) /usr/bin/gpgsplit -%attr (-,root,root) /usr/libexec/%{name} -%attr (-,root,root) /usr/share/locale/*/*/%{name}.mo -%config %attr (-,root,root) /usr/share/%{name}/options.skel +%config %{_datadir}/%{name}/options.skel +%{_mandir}/man1/* +%{_mandir}/man7/* +%{_infodir}/gpg.info* +%{_infodir}/gpgv.info* +%attr (4755,root,root) %{_bindir}/gpg +%attr (0755,root,root) %{_bindir}/gpgv +%attr (0755,root,root) %{_bindir}/gpgsplit +%attr (0755,root,root) %{_libexecdir}/* + +%post +/sbin/install-info %{_infodir}/gpg.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/gpgv.info %{_infodir}/dir 2>/dev/null || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/gpg.info \ + %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/gpgv.info \ + %{_infodir}/dir 2>/dev/null || : +fi %clean rm -rf $RPM_BUILD_ROOT diff -urpP gnupg-1.2.2/tools/ChangeLog gnupg-1.2.3/tools/ChangeLog --- gnupg-1.2.2/tools/ChangeLog 2003-03-06 09:43:55.000000000 +0000 +++ gnupg-1.2.3/tools/ChangeLog 2003-07-30 07:44:44.000000000 +0000 @@ -1,3 +1,18 @@ +2003-06-19 David Shaw + + * Makefile.am: Use W32LIBS where appropriate. + +2003-05-28 David Shaw + + * Makefile.am: Some cleanup, and use DLLIBS for -ldl. + +2003-05-21 David Shaw + + * bftest.c, crlf.c, mk-tdata.c, mpicalc.c, shmtest.c: Edit all + preprocessor instructions to remove whitespace before the '#'. + This is not required by C89, but there are some compilers out + there that don't like it. + 2003-02-23 David Shaw * Makefile.am: Distribute convert-from-106. diff -urpP gnupg-1.2.2/tools/Makefile.am gnupg-1.2.3/tools/Makefile.am --- gnupg-1.2.2/tools/Makefile.am 2003-03-06 09:43:55.000000000 +0000 +++ gnupg-1.2.3/tools/Makefile.am 2003-07-30 07:44:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -19,27 +19,15 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106 -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl -needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@ +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest -mpicalc_SOURCES = mpicalc.c +gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ +mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ +bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ +shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ -bftest_SOURCES = bftest.c - -clean_sat_SOURCES = clean-sat.c -mk_tdata_SOURCES = mk-tdata.c -shmtest_SOURCES = shmtest.c - -gpgsplit_SOURCES = gpgsplit.c - - -mpicalc_LDADD = $(needed_libs) @INTLLIBS@ -bftest_LDADD = $(needed_libs) @EGDLIBS@ @INTLLIBS@ - -shmtest_LDADD = $(needed_libs) @INTLLIBS@ -gpgsplit_LDADD = @ZLIBS@ $(needed_libs) @INTLLIBS@ - -mpicalc bftest shmtest gpgsplit: $(needed_libs) +gpgsplit mpicalc bftest shmtest: $(needed_libs) diff -urpP gnupg-1.2.2/tools/Makefile.in gnupg-1.2.3/tools/Makefile.in --- gnupg-1.2.2/tools/Makefile.in 2003-05-01 14:37:25.000000000 +0000 +++ gnupg-1.2.3/tools/Makefile.in 2003-08-21 19:55:15.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -198,28 +201,18 @@ target_os = @target_os@ target_vendor = @target_vendor@ EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106 -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl -needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@ +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest -mpicalc_SOURCES = mpicalc.c - -bftest_SOURCES = bftest.c - -clean_sat_SOURCES = clean-sat.c -mk_tdata_SOURCES = mk-tdata.c -shmtest_SOURCES = shmtest.c - -gpgsplit_SOURCES = gpgsplit.c - -mpicalc_LDADD = $(needed_libs) @INTLLIBS@ -bftest_LDADD = $(needed_libs) @EGDLIBS@ @INTLLIBS@ - -shmtest_LDADD = $(needed_libs) @INTLLIBS@ -gpgsplit_LDADD = @ZLIBS@ $(needed_libs) @INTLLIBS@ +gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ +mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ +bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ +shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ subdir = tools +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -228,33 +221,33 @@ noinst_PROGRAMS = mpicalc$(EXEEXT) bftes mk-tdata$(EXEEXT) shmtest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am_bftest_OBJECTS = bftest.$(OBJEXT) -bftest_OBJECTS = $(am_bftest_OBJECTS) +bftest_SOURCES = bftest.c +bftest_OBJECTS = bftest.$(OBJEXT) bftest_DEPENDENCIES = ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a bftest_LDFLAGS = -am_clean_sat_OBJECTS = clean-sat.$(OBJEXT) -clean_sat_OBJECTS = $(am_clean_sat_OBJECTS) +clean_sat_SOURCES = clean-sat.c +clean_sat_OBJECTS = clean-sat.$(OBJEXT) clean_sat_LDADD = $(LDADD) clean_sat_DEPENDENCIES = clean_sat_LDFLAGS = -am_gpgsplit_OBJECTS = gpgsplit.$(OBJEXT) -gpgsplit_OBJECTS = $(am_gpgsplit_OBJECTS) +gpgsplit_SOURCES = gpgsplit.c +gpgsplit_OBJECTS = gpgsplit.$(OBJEXT) gpgsplit_DEPENDENCIES = ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a gpgsplit_LDFLAGS = -am_mk_tdata_OBJECTS = mk-tdata.$(OBJEXT) -mk_tdata_OBJECTS = $(am_mk_tdata_OBJECTS) +mk_tdata_SOURCES = mk-tdata.c +mk_tdata_OBJECTS = mk-tdata.$(OBJEXT) mk_tdata_LDADD = $(LDADD) mk_tdata_DEPENDENCIES = mk_tdata_LDFLAGS = -am_mpicalc_OBJECTS = mpicalc.$(OBJEXT) -mpicalc_OBJECTS = $(am_mpicalc_OBJECTS) +mpicalc_SOURCES = mpicalc.c +mpicalc_OBJECTS = mpicalc.$(OBJEXT) mpicalc_DEPENDENCIES = ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a mpicalc_LDFLAGS = -am_shmtest_OBJECTS = shmtest.$(OBJEXT) -shmtest_OBJECTS = $(am_shmtest_OBJECTS) +shmtest_SOURCES = shmtest.c +shmtest_OBJECTS = shmtest.$(OBJEXT) shmtest_DEPENDENCIES = ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a shmtest_LDFLAGS = @@ -269,11 +262,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(bftest_SOURCES) $(clean_sat_SOURCES) \ - $(gpgsplit_SOURCES) $(mk_tdata_SOURCES) $(mpicalc_SOURCES) \ - $(shmtest_SOURCES) +DIST_SOURCES = bftest.c clean-sat.c gpgsplit.c mk-tdata.c mpicalc.c \ + shmtest.c DIST_COMMON = ChangeLog Makefile.am Makefile.in -SOURCES = $(bftest_SOURCES) $(clean_sat_SOURCES) $(gpgsplit_SOURCES) $(mk_tdata_SOURCES) $(mpicalc_SOURCES) $(shmtest_SOURCES) +SOURCES = bftest.c clean-sat.c gpgsplit.c mk-tdata.c mpicalc.c shmtest.c all: all-am @@ -349,7 +341,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -360,7 +352,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -544,7 +536,7 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am -mpicalc bftest shmtest gpgsplit: $(needed_libs) +gpgsplit mpicalc bftest shmtest: $(needed_libs) # 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 -urpP gnupg-1.2.2/tools/bftest.c gnupg-1.2.3/tools/bftest.c --- gnupg-1.2.2/tools/bftest.c 2002-06-29 13:41:09.000000000 +0000 +++ gnupg-1.2.3/tools/bftest.c 2003-06-07 18:55:23.000000000 +0000 @@ -23,8 +23,8 @@ #include #include #ifdef HAVE_DOSISH_SYSTEM - #include - #include +#include +#include #endif #include "util.h" @@ -47,15 +47,15 @@ strusage( int level ) static void i18n_init(void) { - #ifdef ENABLE_NLS - #ifdef HAVE_LC_MESSAGES - setlocale( LC_MESSAGES, "" ); - #else - setlocale( LC_ALL, "" ); - #endif - bindtextdomain( PACKAGE, G10_LOCALEDIR ); - textdomain( PACKAGE ); - #endif +#ifdef ENABLE_NLS +#ifdef HAVE_LC_MESSAGES + setlocale( LC_MESSAGES, "" ); +#else + setlocale( LC_ALL, "" ); +#endif + bindtextdomain( PACKAGE, G10_LOCALEDIR ); + textdomain( PACKAGE ); +#endif } int @@ -67,10 +67,10 @@ main(int argc, char **argv) int n, size=4096; int algo; - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM setmode( fileno(stdin), O_BINARY ); setmode( fileno(stdout), O_BINARY ); - #endif +#endif i18n_init(); if( argc > 1 && !strcmp(argv[1], "-e") ) { @@ -109,4 +109,3 @@ main(int argc, char **argv) cipher_close(hd); return 0; } - diff -urpP gnupg-1.2.2/tools/mk-tdata.c gnupg-1.2.3/tools/mk-tdata.c --- gnupg-1.2.2/tools/mk-tdata.c 2002-06-29 13:41:09.000000000 +0000 +++ gnupg-1.2.3/tools/mk-tdata.c 2003-06-07 18:55:23.000000000 +0000 @@ -17,7 +17,7 @@ #ifndef RAND_MAX /* for SunOS */ - #define RAND_MAX 32767 +#define RAND_MAX 32767 #endif int @@ -31,13 +31,12 @@ main(int argc, char **argv) srand(getpid()); for(i=0; !limit || i < limit; i++ ) { - #ifdef HAVE_RAND +#ifdef HAVE_RAND c = ((unsigned)(1 + (int) (256.0*rand()/(RAND_MAX+1.0)))-1); - #else +#else c = ((unsigned)(1 + (int) (256.0*random()/(RAND_MAX+1.0)))-1); - #endif +#endif putchar(c); } return 0; } - diff -urpP gnupg-1.2.2/tools/mpicalc.c gnupg-1.2.3/tools/mpicalc.c --- gnupg-1.2.2/tools/mpicalc.c 2002-06-29 13:41:09.000000000 +0000 +++ gnupg-1.2.3/tools/mpicalc.c 2003-06-07 18:55:23.000000000 +0000 @@ -65,15 +65,15 @@ strusage( int level ) static void i18n_init(void) { - #ifdef ENABLE_NLS - #ifdef HAVE_LC_MESSAGES - setlocale( LC_MESSAGES, "" ); - #else - setlocale( LC_ALL, "" ); - #endif - bindtextdomain( PACKAGE, G10_LOCALEDIR ); - textdomain( PACKAGE ); - #endif +#ifdef ENABLE_NLS +#ifdef HAVE_LC_MESSAGES + setlocale( LC_MESSAGES, "" ); +#else + setlocale( LC_ALL, "" ); +#endif + bindtextdomain( PACKAGE, G10_LOCALEDIR ); + textdomain( PACKAGE ); +#endif } @@ -386,5 +386,3 @@ main(int argc, char **argv) mpi_free(stack[i]); return 0; } - - diff -urpP gnupg-1.2.2/tools/shmtest.c gnupg-1.2.3/tools/shmtest.c --- gnupg-1.2.2/tools/shmtest.c 2002-06-29 13:41:09.000000000 +0000 +++ gnupg-1.2.3/tools/shmtest.c 2003-06-07 18:55:23.000000000 +0000 @@ -19,11 +19,11 @@ #include #include #ifdef HAVE_SYS_IPC_H - #include - #include +#include +#include #endif #ifdef HAVE_SYS_SHM_H - #include +#include #endif #include "util.h" #include "ttyio.h" @@ -55,15 +55,15 @@ strusage( int level ) static void i18n_init(void) { - #ifdef ENABLE_NLS - #ifdef HAVE_LC_MESSAGES +#ifdef ENABLE_NLS +#ifdef HAVE_LC_MESSAGES setlocale( LC_MESSAGES, "" ); - #else +#else setlocale( LC_ALL, "" ); - #endif +#endif bindtextdomain( PACKAGE, G10_LOCALEDIR ); textdomain( PACKAGE ); - #endif +#endif } @@ -114,9 +114,9 @@ main(int argc, char **argv) log_set_name("shmtest"); i18n_init(); - #ifndef USE_SHM_COPROCESSING +#ifndef USE_SHM_COPROCESSING log_info("SHM_COPRPOCESSING is not available\n"); - #else +#else if( argc < 1 ) my_usage(); @@ -199,8 +199,7 @@ main(int argc, char **argv) log_error("pclose failed\n"); return 0; - #endif +#endif } - #endif diff -urpP gnupg-1.2.2/util/ChangeLog gnupg-1.2.3/util/ChangeLog --- gnupg-1.2.2/util/ChangeLog 2003-04-08 08:38:04.000000000 +0000 +++ gnupg-1.2.3/util/ChangeLog 2003-07-30 16:19:44.000000000 +0000 @@ -1,3 +1,33 @@ +2003-07-30 Werner Koch + + * ttyio.c: Typo fixes. + + * dotlock.c [_WIN32]: Don't include sys/time.h + * http.c, iobuf.c, simple-gettext.c: s/__MINGW32__/_WIN32/. + * strgutil.c, ttyio.c, w32reg.c: Ditto. + +2003-06-07 Werner Koch + + * iobuf.c (check_special_filename): Replaced is isdigit by digitp + to avoid passing negative values and potential locale problems. + Problem noted by Christian Biere. + * strgutil.c (strlwr,strcasecmp,strncasecmp): Make sure we don't + pass a negative value. + * miscutil.c (scan_isodatestr): Ditto. + +2003-05-21 David Shaw + + * argparse.c, dotlock.c, fileutil.c, iobuf.c, miscutil.c, + simple-gettext.c, errors.c, http.c, memory.c, secmem.c, ttyio.c: + Edit all preprocessor instructions to remove whitespace before the + '#'. This is not required by C89, but there are some compilers + out there that don't like it. + +2003-05-21 Werner Koch + + * fileutil.c (is_file_compressed): Fix the check for the "-" file + name. + 2003-03-23 David Shaw * argparse.c (default_strusage): Change copyright date. @@ -1021,7 +1051,7 @@ Fri Feb 13 15:14:13 1998 Werner Koch ( - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1998,1999,2000,2001,2002,2003 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 @@ -1030,5 +1060,3 @@ Fri Feb 13 15:14:13 1998 Werner Koch ( 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. - - diff -urpP gnupg-1.2.2/util/Makefile.in gnupg-1.2.3/util/Makefile.in --- gnupg-1.2.2/util/Makefile.in 2003-05-01 14:36:55.000000000 +0000 +++ gnupg-1.2.3/util/Makefile.in 2003-08-21 19:50:54.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -78,6 +78,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -90,6 +91,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -152,6 +154,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -207,6 +210,7 @@ libutil_a_SOURCES = g10u.c logger.c file dotlock.c http.c simple-gettext.c w32reg.c subdir = util +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -286,7 +290,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -297,7 +301,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ diff -urpP gnupg-1.2.2/util/argparse.c gnupg-1.2.3/util/argparse.c --- gnupg-1.2.2/util/argparse.c 2003-04-08 08:38:04.000000000 +0000 +++ gnupg-1.2.3/util/argparse.c 2003-06-07 18:55:24.000000000 +0000 @@ -441,7 +441,7 @@ find_long_option( ARGPARSE_ARGS *arg, for(i=0; opts[i].short_opt; i++ ) if( opts[i].long_opt && !strcmp( opts[i].long_opt, keyword) ) return i; - #if 0 +#if 0 { ALIAS_DEF a; /* see whether it is an alias */ @@ -453,7 +453,7 @@ find_long_option( ARGPARSE_ARGS *arg, } } } - #endif +#endif /* not found, see whether it is an abbreviation */ /* aliases may not be abbreviated */ n = strlen( keyword ); diff -urpP gnupg-1.2.2/util/dotlock.c gnupg-1.2.3/util/dotlock.c --- gnupg-1.2.2/util/dotlock.c 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.3/util/dotlock.c 2003-07-30 15:36:00.000000000 +0000 @@ -29,7 +29,9 @@ #include #endif #include +#ifndef _WIN32 #include +#endif #include #include #include @@ -80,9 +82,9 @@ create_dotlock( const char *file_to_lock DOTLOCK h; int fd = -1; char pidstr[16]; - #if !defined (HAVE_DOSISH_SYSTEM) +#if !defined (HAVE_DOSISH_SYSTEM) struct utsname utsbuf; - #endif +#endif const char *nodename; const char *dirpart; int dirpartlen; @@ -97,9 +99,9 @@ create_dotlock( const char *file_to_lock h = m_alloc_clear( sizeof *h ); if( never_lock ) { h->disable = 1; - #ifdef _REENTRANT +#ifdef _REENTRANT /* fixme: aquire mutex on all_lockfiles */ - #endif +#endif h->next = all_lockfiles; all_lockfiles = h; return h; @@ -134,9 +136,9 @@ create_dotlock( const char *file_to_lock dirpart = file_to_lock; } - #ifdef _REENTRANT +#ifdef _REENTRANT /* fixme: aquire mutex on all_lockfiles */ - #endif +#endif h->next = all_lockfiles; all_lockfiles = h; @@ -164,9 +166,9 @@ create_dotlock( const char *file_to_lock } if( write(fd, pidstr, 11 ) != 11 ) { all_lockfiles = h->next; - #ifdef _REENTRANT +#ifdef _REENTRANT /* release mutex */ - #endif +#endif log_fatal( "error writing to `%s': %s\n", h->tname, strerror(errno) ); close(fd); unlink(h->tname); @@ -176,9 +178,9 @@ create_dotlock( const char *file_to_lock } if( close(fd) ) { all_lockfiles = h->next; - #ifdef _REENTRANT +#ifdef _REENTRANT /* release mutex */ - #endif +#endif log_error( "error closing `%s': %s\n", h->tname, strerror(errno)); unlink(h->tname); m_free(h->tname); @@ -186,9 +188,9 @@ create_dotlock( const char *file_to_lock return NULL; } - #ifdef _REENTRANT +#ifdef _REENTRANT /* release mutex */ - #endif +#endif #endif h->lockname = m_alloc( strlen(file_to_lock) + 6 ); strcpy(stpcpy(h->lockname, file_to_lock), EXTSEP_S "lock"); @@ -271,10 +273,10 @@ make_dotlock( DOTLOCK h, long timeout ) else if( kill(pid, 0) && errno == ESRCH ) { #ifndef __riscos__ maybe_dead = " - probably dead"; - #if 0 /* we should not do this without checking the permissions */ +#if 0 /* we should not do this without checking the permissions */ /* and the hostname */ log_info( "removing stale lockfile (created by %d)", pid ); - #endif +#endif #else /* __riscos__ */ /* we are *pretty* sure that the other task is dead and therefore we remove the other lock file */ @@ -359,9 +361,9 @@ release_dotlock( DOTLOCK h ) static int read_lockfile( const char *name ) { - #if defined (HAVE_DOSISH_SYSTEM) +#if defined (HAVE_DOSISH_SYSTEM) return 0; - #else +#else int fd, pid; char pidstr[16]; @@ -390,14 +392,14 @@ read_lockfile( const char *name ) return -1; } return pid; - #endif +#endif } void remove_lockfiles() { - #if !defined (HAVE_DOSISH_SYSTEM) +#if !defined (HAVE_DOSISH_SYSTEM) DOTLOCK h, h2; h = all_lockfiles; @@ -415,6 +417,5 @@ remove_lockfiles() m_free(h); h = h2; } - #endif +#endif } - diff -urpP gnupg-1.2.2/util/errors.c gnupg-1.2.3/util/errors.c --- gnupg-1.2.2/util/errors.c 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.3/util/errors.c 2003-06-07 18:55:24.000000000 +0000 @@ -47,7 +47,7 @@ g10_errstr( int err ) static char buf[50]; const char *p; - #define X(n,s) case G10ERR_##n : p = s; break; +#define X(n,s) case G10ERR_##n : p = s; break; switch( err ) { case -1: p = "eof"; break; case 0: p = "okay"; break; @@ -107,7 +107,6 @@ g10_errstr( int err ) X(KEYSERVER ,N_("keyserver error")) default: p = buf; sprintf(buf, "g10err=%d", err); break; } - #undef X +#undef X return _(p); } - diff -urpP gnupg-1.2.2/util/fileutil.c gnupg-1.2.3/util/fileutil.c --- gnupg-1.2.2/util/fileutil.c 2002-10-28 17:30:53.000000000 +0000 +++ gnupg-1.2.3/util/fileutil.c 2003-06-07 18:55:24.000000000 +0000 @@ -1,5 +1,5 @@ /* fileutil.c - file utilities - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -73,10 +73,10 @@ make_dirname(const char *filepath) char *p; if ( !(p=strrchr(filepath, DIRSEP_C)) ) - #ifdef HAVE_DRIVE_LETTERS +#ifdef HAVE_DRIVE_LETTERS if ( !(p=strrchr(filepath, '\\')) ) if ( !(p=strrchr(filepath, ':')) ) - #endif +#endif { return m_strdup(EXTSEP_S); } @@ -143,11 +143,11 @@ compare_filenames( const char *a, const * resolve symlinks? */ #ifndef __riscos__ - #ifdef HAVE_DRIVE_LETTERS +#ifdef HAVE_DRIVE_LETTERS return ascii_strcasecmp(a,b); - #else +#else return strcmp(a,b); - #endif +#endif #else /* __riscos__ */ int c = 0; char *abuf, *bbuf; @@ -205,7 +205,7 @@ is_file_compressed( const char *s, int * { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */ }; - if ( !s || *s == '-' || !ret_rc ) + if ( !s || (*s == '-' && !s[1]) || !ret_rc ) return 0; /* We can't check stdin or no file was given */ a = iobuf_open( s ); @@ -236,5 +236,3 @@ leave: iobuf_close( a ); return rc; } - - diff -urpP gnupg-1.2.2/util/http.c gnupg-1.2.3/util/http.c --- gnupg-1.2.2/util/http.c 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.3/util/http.c 2003-07-30 15:38:40.000000000 +0000 @@ -1,5 +1,5 @@ /* http.c - HTTP protocol handler - * Copyright (C) 1999, 2001 Free Software Foundation, Inc. + * Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -26,17 +26,17 @@ #include #include -#ifdef __MINGW32__ - #include +#ifdef _WIN32 +#include #else - #include - #include - #include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include +#include +#include +#include #endif #include "util.h" @@ -46,14 +46,14 @@ #include "http.h" #ifdef __riscos__ - #define HTTP_PROXY_ENV "GnuPG$HttpProxy" - #define HTTP_PROXY_ENV_PRINTABLE "" +#define HTTP_PROXY_ENV "GnuPG$HttpProxy" +#define HTTP_PROXY_ENV_PRINTABLE "" #else - #define HTTP_PROXY_ENV "http_proxy" - #define HTTP_PROXY_ENV_PRINTABLE "$http_proxy" +#define HTTP_PROXY_ENV "http_proxy" +#define HTTP_PROXY_ENV_PRINTABLE "$http_proxy" #endif -#ifdef __MINGW32__ +#ifdef _WIN32 #define sock_close(a) closesocket(a) #else #define sock_close(a) close(a) @@ -66,7 +66,7 @@ "!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~" #ifndef EAGAIN - #define EAGAIN EWOULDBLOCK +#define EAGAIN EWOULDBLOCK #endif static int parse_uri( PARSED_URI *ret_uri, const char *uri ); @@ -83,7 +83,7 @@ static int parse_response( HTTP_HD hd ); static int connect_server( const char *server, ushort port ); static int write_server( int sock, const char *data, size_t length ); -#ifdef __MINGW32__ +#ifdef _WIN32 static void deinit_sockets (void) { @@ -113,7 +113,7 @@ init_sockets (void) atexit ( deinit_sockets ); initialized = 1; } -#endif /*__MINGW32__*/ +#endif /*_WIN32*/ int @@ -172,11 +172,11 @@ http_wait_response( HTTP_HD hd, unsigned http_start_data( hd ); /* make sure that we are in the data */ - #if 0 +#if 0 hd->sock = dup( hd->sock ); if( hd->sock == -1 ) return G10ERR_GENERAL; - #endif +#endif iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */ iobuf_close (hd->fp_write); hd->fp_write = NULL; @@ -712,7 +712,7 @@ static int connect_server( const char *server, ushort port ) { int sd; -#ifdef __MINGW32__ +#ifdef _WIN32 struct hostent *hp; struct sockaddr_in ad; unsigned long l; @@ -785,7 +785,7 @@ write_server( int sock, const char *data nleft = length; while( nleft > 0 ) { - #ifdef __MINGW32__ +#ifdef _WIN32 int nwritten; nwritten = send (sock, data, nleft, 0); @@ -793,7 +793,7 @@ write_server( int sock, const char *data log_info ("write failed: ec=%d\n", (int)WSAGetLastError ()); return G10ERR_NETWORK; } - #else +#else int nwritten = write( sock, data, nleft ); if( nwritten == -1 ) { if( errno == EINTR ) @@ -809,7 +809,7 @@ write_server( int sock, const char *data log_info("write failed: %s\n", strerror(errno)); return G10ERR_NETWORK; } - #endif +#endif nleft -=nwritten; data += nwritten; } diff -urpP gnupg-1.2.2/util/iobuf.c gnupg-1.2.3/util/iobuf.c --- gnupg-1.2.2/util/iobuf.c 2003-04-15 09:32:35.000000000 +0000 +++ gnupg-1.2.3/util/iobuf.c 2003-07-30 15:40:59.000000000 +0000 @@ -1,5 +1,5 @@ /* iobuf.c - file handling - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -30,7 +30,7 @@ #include #include #ifdef HAVE_DOSISH_SYSTEM - #include +#include #endif #ifdef __riscos__ #include @@ -44,18 +44,18 @@ #undef FILE_FILTER_USES_STDIO #ifdef HAVE_DOSISH_SYSTEM - #define USE_SETMODE 1 +#define USE_SETMODE 1 #endif #ifdef FILE_FILTER_USES_STDIO - #define my_fileno(a) fileno ((a)) - #define my_fopen_ro(a,b) fopen ((a),(b)) - #define my_fopen(a,b) fopen ((a),(b)) - typedef FILE *FILEP_OR_FD; - #define INVALID_FP NULL - #define FILEP_OR_FD_FOR_STDIN (stdin) - #define FILEP_OR_FD_FOR_STDOUT (stdout) - typedef struct { +#define my_fileno(a) fileno ((a)) +#define my_fopen_ro(a,b) fopen ((a),(b)) +#define my_fopen(a,b) fopen ((a),(b)) +typedef FILE *FILEP_OR_FD; +#define INVALID_FP NULL +#define FILEP_OR_FD_FOR_STDIN (stdin) +#define FILEP_OR_FD_FOR_STDOUT (stdout) +typedef struct { FILE *fp; /* open file handle */ int keep_open; int no_cache; @@ -63,22 +63,22 @@ char fname[1]; /* name of the file */ } file_filter_ctx_t ; #else - #define my_fileno(a) (a) - #define my_fopen_ro(a,b) fd_cache_open ((a),(b)) - #define my_fopen(a,b) direct_open ((a),(b)) - #ifdef HAVE_DOSISH_SYSTEM - typedef HANDLE FILEP_OR_FD; - #define INVALID_FP ((HANDLE)-1) - #define FILEP_OR_FD_FOR_STDIN (GetStdHandle (STD_INPUT_HANDLE)) - #define FILEP_OR_FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE)) - #undef USE_SETMODE - #else - typedef int FILEP_OR_FD; - #define INVALID_FP (-1) - #define FILEP_OR_FD_FOR_STDIN (0) - #define FILEP_OR_FD_FOR_STDOUT (1) - #endif - typedef struct { +#define my_fileno(a) (a) +#define my_fopen_ro(a,b) fd_cache_open ((a),(b)) +#define my_fopen(a,b) direct_open ((a),(b)) +#ifdef HAVE_DOSISH_SYSTEM +typedef HANDLE FILEP_OR_FD; +#define INVALID_FP ((HANDLE)-1) +#define FILEP_OR_FD_FOR_STDIN (GetStdHandle (STD_INPUT_HANDLE)) +#define FILEP_OR_FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE)) +#undef USE_SETMODE +#else +typedef int FILEP_OR_FD; +#define INVALID_FP (-1) +#define FILEP_OR_FD_FOR_STDIN (0) +#define FILEP_OR_FD_FOR_STDOUT (1) +#endif +typedef struct { FILEP_OR_FD fp; /* open file handle */ int keep_open; int no_cache; @@ -96,7 +96,7 @@ static CLOSE_CACHE close_cache; #endif -#ifdef __MINGW32__ +#ifdef _WIN32 typedef struct { int sock; int keep_open; @@ -105,7 +105,7 @@ typedef struct { int print_only_name; /* flags indicating that fname is not a real file*/ char fname[1]; /* name of the file */ } sock_filter_ctx_t ; -#endif /*__MINGW32__*/ +#endif /*_WIN32*/ /* The first partial length header block must be of size 512 * to make it easier (and efficienter) we use a min. block size of 512 @@ -147,11 +147,11 @@ fd_cache_invalidate (const char *fname) if ( cc->fp != INVALID_FP && !strcmp (cc->fname, fname) ) { if( DBG_IOBUF ) log_debug (" did (%s)\n", cc->fname); - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM CloseHandle (cc->fp); - #else +#else close(cc->fp); - #endif +#endif cc->fp = INVALID_FP; } } @@ -284,18 +284,18 @@ fd_cache_open (const char *fname, const cc->fp = INVALID_FP; if( DBG_IOBUF ) log_debug ("fd_cache_open (%s) using cached fp\n", fname); - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM if (SetFilePointer (fp, 0, NULL, FILE_BEGIN) == 0xffffffff ) { log_error ("rewind file failed on handle %p: ec=%d\n", fp, (int)GetLastError () ); fp = INVALID_FP; } - #else +#else if ( lseek (fp, 0, SEEK_SET) == (off_t)-1 ) { log_error("can't rewind fd %d: %s\n", fp, strerror(errno) ); fp = INVALID_FP; } - #endif +#endif return fp; } } @@ -398,7 +398,7 @@ file_filter(void *opaque, int control, I *ret_len = 0; } else { - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM unsigned long nread; nbytes = 0; @@ -417,7 +417,7 @@ file_filter(void *opaque, int control, I nbytes = nread; } - #else +#else int n; @@ -439,13 +439,13 @@ file_filter(void *opaque, int control, I else { nbytes = n; } - #endif +#endif *ret_len = nbytes; } } else if( control == IOBUFCTRL_FLUSH ) { if( size ) { - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM byte *p = buf; unsigned long n; @@ -461,7 +461,7 @@ file_filter(void *opaque, int control, I nbytes -= n; } while ( nbytes ); nbytes = p - buf; - #else +#else byte *p = buf; int n; @@ -480,7 +480,7 @@ file_filter(void *opaque, int control, I rc = G10ERR_WRITE_FILE; } nbytes = p - buf; - #endif +#endif } *ret_len = nbytes; } @@ -493,14 +493,14 @@ file_filter(void *opaque, int control, I *(char**)buf = "file_filter(fd)"; } else if ( control == IOBUFCTRL_FREE ) { - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM if ( f != FILEP_OR_FD_FOR_STDIN && f != FILEP_OR_FD_FOR_STDOUT ) { if( DBG_IOBUF ) log_debug("%s: close handle %p\n", a->fname, f ); if (!a->keep_open) fd_cache_close (a->no_cache?NULL:a->fname, f); } - #else +#else if ( (int)f != 0 && (int)f != 1 ) { if( DBG_IOBUF ) log_debug("%s: close fd %d\n", a->fname, f ); @@ -508,14 +508,14 @@ file_filter(void *opaque, int control, I fd_cache_close (a->no_cache?NULL:a->fname, f); } f = INVALID_FP; - #endif +#endif m_free (a); /* we can free our context now */ } #endif /* !stdio implementation */ return rc; } -#ifdef __MINGW32__ +#ifdef _WIN32 /* Becuase sockets are an special object under Lose32 we have to * use a special filter */ static int @@ -587,7 +587,7 @@ sock_filter (void *opaque, int control, } return rc; } -#endif /*__MINGW32__*/ +#endif /*_WIN32*/ /**************** * This is used to implement the block write mode. @@ -950,18 +950,18 @@ iobuf_cancel( IOBUF a ) const char *s; IOBUF a2; int rc; - #if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) +#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) char *remove_name = NULL; - #endif +#endif if( a && a->use == 2 ) { s = iobuf_get_real_fname(a); if( s && *s ) { - #if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) +#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) remove_name = m_strdup ( s ); - #else +#else remove(s); - #endif +#endif } } @@ -974,14 +974,14 @@ iobuf_cancel( IOBUF a ) } rc = iobuf_close(a); - #if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) +#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) if ( remove_name ) { /* Argg, MSDOS does not allow to remove open files. So * we have to do it here */ remove ( remove_name ); m_free ( remove_name ); } - #endif +#endif return rc; } @@ -1032,7 +1032,7 @@ check_special_filename ( const char *fna int i; fname += 2; - for (i=0; isdigit (fname[i]); i++ ) + for (i=0; digitp (fname+i); i++ ) ; if ( !fname[i] ) return atoi (fname); @@ -1056,9 +1056,9 @@ iobuf_open( const char *fname ) if( !fname || (*fname=='-' && !fname[1]) ) { fp = FILEP_OR_FD_FOR_STDIN; - #ifdef USE_SETMODE +#ifdef USE_SETMODE setmode ( my_fileno(fp) , O_BINARY ); - #endif +#endif fname = "[stdin]"; print_only = 1; } @@ -1122,7 +1122,7 @@ IOBUF iobuf_sockopen ( int fd, const char *mode ) { IOBUF a; -#ifdef __MINGW32__ +#ifdef _WIN32 sock_filter_ctx_t *scx; size_t len; @@ -1159,9 +1159,9 @@ iobuf_create( const char *fname ) if( !fname || (*fname=='-' && !fname[1]) ) { fp = FILEP_OR_FD_FOR_STDOUT; - #ifdef USE_SETMODE +#ifdef USE_SETMODE setmode ( my_fileno(fp) , O_BINARY ); - #endif +#endif fname = "[stdout]"; print_only = 1; } @@ -1261,22 +1261,22 @@ iobuf_ioctl ( IOBUF a, int cmd, int intv b->keep_open = intval; return 0; } - #ifdef __MINGW32__ +#ifdef _WIN32 else if( !a->chain && a->filter == sock_filter ) { sock_filter_ctx_t *b = a->filter_ov; b->keep_open = intval; return 0; } - #endif +#endif } else if ( cmd == 2 ) { /* invalidate cache */ if( DBG_IOBUF ) log_debug("iobuf-*.*: ioctl `%s' invalidate\n", ptrval? (char*)ptrval:"?"); if ( !a && !intval && ptrval ) { - #ifndef FILE_FILTER_USES_STDIO +#ifndef FILE_FILTER_USES_STDIO fd_cache_invalidate (ptrval); - #endif +#endif return 0; } } @@ -1290,13 +1290,13 @@ iobuf_ioctl ( IOBUF a, int cmd, int intv b->no_cache = intval; return 0; } - #ifdef __MINGW32__ +#ifdef _WIN32 else if( !a->chain && a->filter == sock_filter ) { sock_filter_ctx_t *b = a->filter_ov; b->no_cache = intval; return 0; } - #endif +#endif } return -1; @@ -1834,8 +1834,8 @@ iobuf_set_limit( IOBUF a, off_t nlimit ) -/**************** - * Return the length of an open file +/* + * Return the length of an open file. */ off_t iobuf_get_filelength( IOBUF a ) @@ -1857,18 +1857,18 @@ iobuf_get_filelength( IOBUF a ) file_filter_ctx_t *b = a->filter_ov; FILEP_OR_FD fp = b->fp; - #if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO) +#if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO) ulong size; if ( (size=GetFileSize (fp, NULL)) != 0xffffffff ) return size; log_error ("GetFileSize for handle %p failed: ec=%d\n", fp, (int)GetLastError () ); - #else +#else if( !fstat(my_fileno(fp), &st) ) return st.st_size; log_error("fstat() failed: %s\n", strerror(errno) ); - #endif +#endif break; } @@ -1946,18 +1946,18 @@ iobuf_seek( IOBUF a, off_t newpos ) return -1; } #else - #ifdef HAVE_DOSISH_SYSTEM +#ifdef HAVE_DOSISH_SYSTEM if (SetFilePointer (b->fp, newpos, NULL, FILE_BEGIN) == 0xffffffff ) { log_error ("SetFilePointer failed on handle %p: ec=%d\n", b->fp, (int)GetLastError () ); return -1; } - #else +#else if ( lseek (b->fp, newpos, SEEK_SET) == (off_t)-1 ) { log_error("can't lseek: %s\n", strerror(errno) ); return -1; } - #endif +#endif #endif } a->d.len = 0; /* discard buffer */ @@ -2141,7 +2141,7 @@ iobuf_read_line( IOBUF a, byte **addr_of int iobuf_translate_file_handle ( int fd, int for_write ) { - #ifdef __MINGW32__ +#ifdef _WIN32 { int x; @@ -2157,17 +2157,17 @@ iobuf_translate_file_handle ( int fd, in fd = x; } } - #endif +#endif return fd; } static int translate_file_handle ( int fd, int for_write ) { - #ifdef __MINGW32__ - #ifdef FILE_FILTER_USES_STDIO +#ifdef _WIN32 +#ifdef FILE_FILTER_USES_STDIO fd = iobuf_translate_file_handle (fd, for_write); - #else +#else { int x; @@ -2186,9 +2186,7 @@ translate_file_handle ( int fd, int for_ fd = x; } - #endif - #endif +#endif +#endif return fd; } - - diff -urpP gnupg-1.2.2/util/memory.c gnupg-1.2.3/util/memory.c --- gnupg-1.2.2/util/memory.c 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.3/util/memory.c 2003-06-07 18:55:24.000000000 +0000 @@ -48,9 +48,9 @@ * replace this guard stuff with one provided by a modern malloc library */ #if SIZEOF_UNSIGNED_LONG == 8 - #define EXTRA_ALIGN 4 +#define EXTRA_ALIGN 4 #else - #define EXTRA_ALIGN 0 +#define EXTRA_ALIGN 0 #endif #if defined(M_DEBUG) || defined(M_GUARD) @@ -59,32 +59,32 @@ #ifdef M_DEBUG - #ifndef M_GUARD - #define M_GUARD 1 - #endif - #undef m_alloc - #undef m_alloc_clear - #undef m_alloc_secure - #undef m_alloc_secure_clear - #undef m_realloc - #undef m_free - #undef m_check - #undef m_strdup - #define FNAME(a) m_debug_ ##a - #define FNAMEPRT , const char *info - #define FNAMEARG , info - #ifndef __riscos__ - #define store_len(p,n,m) do { add_entry(p,n,m, \ +#ifndef M_GUARD +#define M_GUARD 1 +#endif +#undef m_alloc +#undef m_alloc_clear +#undef m_alloc_secure +#undef m_alloc_secure_clear +#undef m_realloc +#undef m_free +#undef m_check +#undef m_strdup +#define FNAME(a) m_debug_ ##a +#define FNAMEPRT , const char *info +#define FNAMEARG , info +#ifndef __riscos__ +#define store_len(p,n,m) do { add_entry(p,n,m, \ info, __FUNCTION__); } while(0) - #else - #define store_len(p,n,m) do { add_entry(p,n,m, \ +#else +#define store_len(p,n,m) do { add_entry(p,n,m, \ info, __func__ ); } while(0) - #endif +#endif #else - #define FNAME(a) m_ ##a - #define FNAMEPRT - #define FNAMEARG - #define store_len(p,n,m) do { ((byte*)p)[EXTRA_ALIGN+0] = n; \ +#define FNAME(a) m_ ##a +#define FNAMEPRT +#define FNAMEARG +#define store_len(p,n,m) do { ((byte*)p)[EXTRA_ALIGN+0] = n; \ ((byte*)p)[EXTRA_ALIGN+1] = n >> 8 ; \ ((byte*)p)[EXTRA_ALIGN+2] = n >> 16 ; \ ((byte*)p)[EXTRA_ALIGN+3] = m? MAGIC_SEC_BYTE \ @@ -332,11 +332,11 @@ check_allmem( const char *info ) for( e = memtbl, n = 0; n < memtbl_len; n++, e++ ) { if( e->inuse ) { - #ifndef __riscos__ +#ifndef __riscos__ check_mem(e->user_p-4-EXTRA_ALIGN, info); - #else +#else check_mem((const byte *) e->user_p-4-EXTRA_ALIGN, info); - #endif +#endif } } } @@ -354,10 +354,10 @@ membug( const char *fmt, ... ) vfprintf(stderr,fmt,arg_ptr) ; va_end(arg_ptr); fflush(stderr); - #ifdef M_DEBUG +#ifdef M_DEBUG if( DBG_MEMSTAT ) dump_table(); - #endif +#endif abort(); } #endif @@ -365,7 +365,7 @@ membug( const char *fmt, ... ) void m_print_stats( const char *prefix ) { - #ifdef M_DEBUG +#ifdef M_DEBUG unsigned n; struct memtbl_entry *e; ulong sum = 0, chunks =0; @@ -379,19 +379,19 @@ m_print_stats( const char *prefix ) log_debug( "%s%smemstat: %8lu bytes in %ld chunks used\n", prefix? prefix:"", prefix? ": ":"", sum, chunks ); - #elif defined(M_GUARD) +#elif defined(M_GUARD) log_debug( "%s%smemstat: %8ld bytes\n", prefix? prefix:"", prefix? ": ":"", used_memory ); - #endif +#endif } void m_dump_table( const char *prefix ) { - #ifdef M_DEBUG +#ifdef M_DEBUG fprintf(stderr,"Memory-Table-Dump: %s\n", prefix); dump_table(); - #endif +#endif m_print_stats( prefix ); } @@ -418,7 +418,7 @@ FNAME(alloc)( size_t n FNAMEPRT ) { char *p; - #ifdef M_GUARD +#ifdef M_GUARD if(!n) out_of_core(n,0); /* should never happen */ if( !(p = malloc( n + EXTRA_ALIGN+5 )) ) @@ -427,7 +427,7 @@ FNAME(alloc)( size_t n FNAMEPRT ) used_memory += n; p[4+EXTRA_ALIGN+n] = MAGIC_END_BYTE; return p+EXTRA_ALIGN+4; - #else +#else /* mallocing zero bytes is undefined by ISO-C, so we better make sure that it won't happen */ if (!n) @@ -435,7 +435,7 @@ FNAME(alloc)( size_t n FNAMEPRT ) if( !(p = malloc( n )) ) out_of_core(n,0); return p; - #endif +#endif } /**************** @@ -447,7 +447,7 @@ FNAME(alloc_secure)( size_t n FNAMEPRT ) { char *p; - #ifdef M_GUARD +#ifdef M_GUARD if(!n) out_of_core(n,1); /* should never happen */ if( !(p = secmem_malloc( n +EXTRA_ALIGN+ 5 )) ) @@ -455,7 +455,7 @@ FNAME(alloc_secure)( size_t n FNAMEPRT ) store_len(p,n,1); p[4+EXTRA_ALIGN+n] = MAGIC_END_BYTE; return p+EXTRA_ALIGN+4; - #else +#else /* mallocing zero bytes is undefined by ISO-C, so we better make sure that it won't happen */ if (!n) @@ -463,7 +463,7 @@ FNAME(alloc_secure)( size_t n FNAMEPRT ) if( !(p = secmem_malloc( n )) ) out_of_core(n,1); return p; - #endif +#endif } void * @@ -493,7 +493,7 @@ FNAME(realloc)( void *a, size_t n FNAMEP { void *b; - #ifdef M_GUARD +#ifdef M_GUARD if( a ) { unsigned char *p = a; size_t len = m_size(a); @@ -510,7 +510,7 @@ FNAME(realloc)( void *a, size_t n FNAMEP } else b = FNAME(alloc)(n FNAMEARG); - #else +#else if( m_is_secure(a) ) { if( !(b = secmem_realloc( a, n )) ) out_of_core(n,1); @@ -519,7 +519,7 @@ FNAME(realloc)( void *a, size_t n FNAMEP if( !(b = realloc( a, n )) ) out_of_core(n,0); } - #endif +#endif return b; } @@ -536,9 +536,9 @@ FNAME(free)( void *a FNAMEPRT ) if( !p ) return; - #ifdef M_DEBUG +#ifdef M_DEBUG free_entry(p-EXTRA_ALIGN-4, info); - #elif defined M_GUARD +#elif defined M_GUARD m_check(p); if( m_is_secure(a) ) secmem_free(p-EXTRA_ALIGN-4); @@ -546,57 +546,57 @@ FNAME(free)( void *a FNAMEPRT ) used_memory -= m_size(a); free(p-EXTRA_ALIGN-4); } - #else +#else if( m_is_secure(a) ) secmem_free(p); else free(p); - #endif +#endif } void FNAME(check)( const void *a FNAMEPRT ) { - #ifdef M_GUARD +#ifdef M_GUARD const byte *p = a; - #ifdef M_DEBUG +#ifdef M_DEBUG if( p ) check_mem(p-EXTRA_ALIGN-4, info); else check_allmem(info); - #else +#else if( !p ) return; if( !(p[-1] == MAGIC_NOR_BYTE || p[-1] == MAGIC_SEC_BYTE) ) membug("memory at %p corrupted (underflow=%02x)\n", p, p[-1] ); else if( p[m_size(p)] != MAGIC_END_BYTE ) membug("memory at %p corrupted (overflow=%02x)\n", p, p[-1] ); - #endif - #endif +#endif +#endif } size_t m_size( const void *a ) { - #ifndef M_GUARD +#ifndef M_GUARD log_debug("dummy m_size called\n"); return 0; - #else +#else const byte *p = a; size_t n; - #ifdef M_DEBUG +#ifdef M_DEBUG n = check_mem(p-EXTRA_ALIGN-4, "m_size")->user_n; - #else +#else n = ((byte*)p)[-4]; n |= ((byte*)p)[-3] << 8; n |= ((byte*)p)[-2] << 16; - #endif +#endif return n; - #endif +#endif } @@ -631,4 +631,3 @@ FNAME(strdup)( const char *a FNAMEPRT ) strcpy(p, a); return p; } - diff -urpP gnupg-1.2.2/util/miscutil.c gnupg-1.2.3/util/miscutil.c --- gnupg-1.2.2/util/miscutil.c 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.3/util/miscutil.c 2003-06-07 18:55:24.000000000 +0000 @@ -1,5 +1,5 @@ /* miscutil.c - miscellaneous utilities - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -25,7 +25,7 @@ #include #include #ifdef HAVE_LANGINFO_H - #include +#include #endif #include "types.h" #include "util.h" @@ -56,11 +56,11 @@ scan_isodatestr( const char *string ) if( strlen(string) != 10 || string[4] != '-' || string[7] != '-' ) return 0; for( i=0; i < 4; i++ ) - if( !isdigit(string[i]) ) + if( !digitp(string+i) ) return 0; - if( !isdigit(string[5]) || !isdigit(string[6]) ) + if( !digitp(string+5) || !digitp(string+6) ) return 0; - if( !isdigit(string[8]) || !isdigit(string[9]) ) + if( !digitp(string+8) || !digitp(string+9) ) return 0; year = atoi(string); month = atoi(string+5); @@ -143,9 +143,9 @@ const char * asctimestamp( u32 stamp ) { static char buffer[50]; - #if defined (HAVE_STRFTIME) && defined (HAVE_NL_LANGINFO) +#if defined (HAVE_STRFTIME) && defined (HAVE_NL_LANGINFO) static char fmt[50]; - #endif +#endif struct tm *tp; time_t atime = stamp; @@ -155,23 +155,23 @@ asctimestamp( u32 stamp ) } tp = localtime( &atime ); - #ifdef HAVE_STRFTIME - #if defined(HAVE_NL_LANGINFO) +#ifdef HAVE_STRFTIME +#if defined(HAVE_NL_LANGINFO) mem2str( fmt, nl_langinfo(D_T_FMT), DIM(fmt)-3 ); if( strstr( fmt, "%Z" ) == NULL ) strcat( fmt, " %Z"); strftime( buffer, DIM(buffer)-1, fmt, tp ); - #else +#else /* fixme: we should check whether the locale appends a " %Z" * These locales from glibc don't put the " %Z": * fi_FI hr_HR ja_JP lt_LT lv_LV POSIX ru_RU ru_SU sv_FI sv_SE zh_CN */ strftime( buffer, DIM(buffer)-1, "%c %Z", tp ); - #endif +#endif buffer[DIM(buffer)-1] = 0; - #else +#else mem2str( buffer, asctime(tp), DIM(buffer) ); - #endif +#endif return buffer; } diff -urpP gnupg-1.2.2/util/secmem.c gnupg-1.2.3/util/secmem.c --- gnupg-1.2.2/util/secmem.c 2002-11-09 17:33:57.000000000 +0000 +++ gnupg-1.2.3/util/secmem.c 2003-06-07 18:55:24.000000000 +0000 @@ -26,15 +26,15 @@ #include #include #if defined(HAVE_MLOCK) || defined(HAVE_MMAP) - #include - #include - #include - #ifdef USE_CAPABILITIES - #include - #endif - #ifdef HAVE_PLOCK - #include - #endif +#include +#include +#include +#ifdef USE_CAPABILITIES +#include +#endif +#ifdef HAVE_PLOCK +#include +#endif #endif #include "types.h" @@ -43,11 +43,11 @@ #include "i18n.h" #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) - #define MAP_ANONYMOUS MAP_ANON +#define MAP_ANONYMOUS MAP_ANON #endif /* It seems that Slackware 7.1 does not know about EPERM */ #if !defined(EPERM) && defined(ENOMEM) - #define EPERM ENOMEM +#define EPERM ENOMEM #endif @@ -95,7 +95,7 @@ print_warn(void) static void lock_pool( void *p, size_t n ) { - #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK) +#if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK) int err; cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); @@ -106,30 +106,30 @@ lock_pool( void *p, size_t n ) if( err ) { if( errno != EPERM - #ifdef EAGAIN /* OpenBSD returns this */ +#ifdef EAGAIN /* OpenBSD returns this */ && errno != EAGAIN - #endif - #ifdef ENOSYS /* Some SCOs return this (function not implemented) */ +#endif +#ifdef ENOSYS /* Some SCOs return this (function not implemented) */ && errno != ENOSYS - #endif - #ifdef ENOMEM /* Linux can return this */ +#endif +#ifdef ENOMEM /* Linux can return this */ && errno != ENOMEM - #endif +#endif ) log_error("can't lock memory: %s\n", strerror(err)); show_warning = 1; } - #elif defined(HAVE_MLOCK) +#elif defined(HAVE_MLOCK) uid_t uid; int err; uid = getuid(); - #ifdef HAVE_BROKEN_MLOCK +#ifdef HAVE_BROKEN_MLOCK /* ick. but at least we get secured memory. about to lock entire data segment. */ - #ifdef HAVE_PLOCK +#ifdef HAVE_PLOCK err = plock( DATLOCK ); if( err && errno ) err = errno; @@ -143,12 +143,12 @@ lock_pool( void *p, size_t n ) if( err && errno ) err = errno; } - #endif /*!HAVE_PLOCK*/ - #else +#endif /*!HAVE_PLOCK*/ +#else err = mlock( p, n ); if( err && errno ) err = errno; - #endif +#endif if( uid && !geteuid() ) { /* check that we really dropped the privs. @@ -159,38 +159,38 @@ lock_pool( void *p, size_t n ) if( err ) { if( errno != EPERM - #ifdef EAGAIN /* OpenBSD returns this */ +#ifdef EAGAIN /* OpenBSD returns this */ && errno != EAGAIN - #endif - #ifdef ENOSYS /* Some SCOs return this (function not implemented) */ +#endif +#ifdef ENOSYS /* Some SCOs return this (function not implemented) */ && errno != ENOSYS - #endif - #ifdef ENOMEM /* Linux can return this */ +#endif +#ifdef ENOMEM /* Linux can return this */ && errno != ENOMEM - #endif +#endif ) log_error("can't lock memory: %s\n", strerror(err)); show_warning = 1; } - #elif defined ( __QNX__ ) +#elif defined ( __QNX__ ) /* QNX does not page at all, so the whole secure memory stuff does * not make much sense. However it is still of use because it * wipes out the memory on a free(). * Therefore it is sufficient to suppress the warning */ - #elif defined (HAVE_DOSISH_SYSTEM) || defined (__CYGWIN__) +#elif defined (HAVE_DOSISH_SYSTEM) || defined (__CYGWIN__) /* It does not make sense to print such a warning, given the fact that * this whole Windows !@#$% and their user base are inherently insecure */ - #elif defined (__riscos__) +#elif defined (__riscos__) /* no virtual memory on RISC OS, so no pages are swapped to disc, * besides we don't have mmap, so we don't use it! ;-) * But don't complain, as explained above. */ - #else +#else log_info("Please note that you don't have secure memory on this system\n"); - #endif +#endif } @@ -204,18 +204,18 @@ init_pool( size_t n) if( disable_secmem ) log_bug("secure memory is disabled"); - #ifdef HAVE_GETPAGESIZE +#ifdef HAVE_GETPAGESIZE pgsize = getpagesize(); - #else +#else pgsize = 4096; - #endif +#endif - #ifdef HAVE_MMAP +#ifdef HAVE_MMAP poolsize = (poolsize + pgsize -1 ) & ~(pgsize-1); - #ifdef MAP_ANONYMOUS +#ifdef MAP_ANONYMOUS pool = mmap( 0, poolsize, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); - #else /* map /dev/zero instead */ +#else /* map /dev/zero instead */ { int fd; fd = open("/dev/zero", O_RDWR); @@ -228,7 +228,7 @@ init_pool( size_t n) MAP_PRIVATE, fd, 0); } } - #endif +#endif if( pool == (void*)-1 ) log_info("can't mmap pool of %u bytes: %s - using malloc\n", (unsigned)poolsize, strerror(errno)); @@ -237,7 +237,7 @@ init_pool( size_t n) pool_okay = 1; } - #endif +#endif if( !pool_okay ) { pool = malloc( poolsize ); if( !pool ) @@ -288,11 +288,11 @@ secmem_init( size_t n ) { if( !n ) { #ifndef __riscos__ - #ifdef USE_CAPABILITIES +#ifdef USE_CAPABILITIES /* drop all capabilities */ cap_set_proc( cap_from_text("all-eip") ); - #elif !defined(HAVE_DOSISH_SYSTEM) +#elif !defined(HAVE_DOSISH_SYSTEM) uid_t uid; disable_secmem=1; @@ -301,7 +301,7 @@ secmem_init( size_t n ) if( setuid( uid ) || getuid() != geteuid() || !setuid(0) ) log_fatal("failed to drop setuid\n" ); } - #endif +#endif #endif /* !__riscos__ */ } else { @@ -443,10 +443,10 @@ secmem_term() wipememory2( pool, 0xaa, poolsize); wipememory2( pool, 0x55, poolsize); wipememory2( pool, 0x00, poolsize); - #ifdef HAVE_MMAP +#ifdef HAVE_MMAP if( pool_is_mmapped ) munmap( pool, poolsize ); - #endif +#endif pool = NULL; pool_okay = 0; poolsize=0; @@ -465,4 +465,3 @@ secmem_dump_stats() cur_alloced, max_alloced, cur_blocks, max_blocks, (ulong)poollen, (ulong)poolsize ); } - diff -urpP gnupg-1.2.2/util/simple-gettext.c gnupg-1.2.3/util/simple-gettext.c --- gnupg-1.2.2/util/simple-gettext.c 2002-09-11 12:57:57.000000000 +0000 +++ gnupg-1.2.3/util/simple-gettext.c 2003-07-30 15:42:36.000000000 +0000 @@ -27,8 +27,8 @@ #include #ifdef USE_SIMPLE_GETTEXT -#if !defined (__MINGW32__) && !defined (__CYGWIN32__) -#error This file can only be used with MingW32 or Cygwin32 +#if !defined (_WIN32) && !defined (__CYGWIN32__) +#error This file can only be used udner Windows or Cygwin32 #endif #include @@ -235,11 +235,11 @@ set_gettext_file( const char *filename ) if( filename && *filename ) { if( filename[0] == '/' - #ifdef HAVE_DRIVE_LETTERS +#ifdef HAVE_DRIVE_LETTERS || ( isalpha(filename[0]) && filename[1] == ':' && (filename[2] == '/' || filename[2] == '\\') ) - #endif +#endif ) { /* absolute path - use it as is */ domain = load_domain( filename ); diff -urpP gnupg-1.2.2/util/strgutil.c gnupg-1.2.3/util/strgutil.c --- gnupg-1.2.2/util/strgutil.c 2002-09-10 08:27:38.000000000 +0000 +++ gnupg-1.2.3/util/strgutil.c 2003-07-30 15:44:44.000000000 +0000 @@ -1,5 +1,6 @@ /* strgutil.c - string utilities - * Copyright (C) 1994, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1994, 1998, 1999, 2000, 2001, + * 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -825,7 +826,7 @@ strlwr(char *s) { char *p; for(p=s; *p; p++ ) - *p = tolower(*p); + *p = tolower(*(unsigned char *)p); return s; } #endif @@ -835,7 +836,8 @@ int strcasecmp( const char *a, const char *b ) { for( ; *a && *b; a++, b++ ) { - if( *a != *b && toupper(*a) != toupper(*b) ) + if( *a != *b + && toupper(*(const byte *)a) != toupper(*(const byte *)b) ) break; } return *(const byte*)a - *(const byte*)b; @@ -847,7 +849,8 @@ int strncasecmp( const char *a, const char *b, size_t n ) { for( ; n && *a && *b; a++, b++, n--) { - if( *a != *b && toupper(*a) != toupper(*b) ) + if( *a != *b + && toupper(*(const byte *)a) != toupper(*(const byte *)b) ) break; } if (!n) @@ -857,7 +860,7 @@ strncasecmp( const char *a, const char * #endif -#ifdef __MINGW32__ +#ifdef _WIN32 /* * Like vsprintf but provides a pointer to malloc'd storage, which * must be freed by the caller (m_free). Taken from libiberty as @@ -951,5 +954,4 @@ vasprintf ( char **result, const char *f return 0; } -#endif /*__MINGW32__*/ - +#endif /*_WIN32*/ diff -urpP gnupg-1.2.2/util/ttyio.c gnupg-1.2.3/util/ttyio.c --- gnupg-1.2.2/util/ttyio.c 2003-03-06 09:43:55.000000000 +0000 +++ gnupg-1.2.3/util/ttyio.c 2003-07-30 16:19:36.000000000 +0000 @@ -25,23 +25,23 @@ #include #include #ifdef HAVE_TCGETATTR - #include +#include #else - #ifdef HAVE_TERMIO_H - /* simulate termios with termio */ - #include - #define termios termio - #define tcsetattr ioctl - #define TCSAFLUSH TCSETAF - #define tcgetattr(A,B) ioctl(A,TCGETA,B) - #define HAVE_TCGETATTR - #endif -#endif -#ifdef __MINGW32__ /* use the odd Win32 functions */ - #include - #ifdef HAVE_TCGETATTR - #error mingw32 and termios - #endif +#ifdef HAVE_TERMIO_H +/* simulate termios with termio */ +#include +#define termios termio +#define tcsetattr ioctl +#define TCSAFLUSH TCSETAF +#define tcgetattr(A,B) ioctl(A,TCGETA,B) +#define HAVE_TCGETATTR +#endif +#endif +#ifdef _WIN32 /* use the odd Win32 functions */ +#include +#ifdef HAVE_TCGETATTR +#error windows and termios +#endif #endif #include #include @@ -51,7 +51,7 @@ #define CONTROL_D ('D' - 'A' + 1) -#ifdef __MINGW32__ /* use the odd Win32 functions */ +#ifdef _WIN32 /* use the odd Win32 functions */ static struct { HANDLE in, out; } con; @@ -99,8 +99,8 @@ tty_get_ttyname (void) got_name = 1; } #endif - /* Assume the staandrd tty on memory error or when tehre is no - certmid. */ + /* Assume the standard tty on memory error or when there is no + ctermid. */ return name? name : "/dev/tty"; } @@ -124,7 +124,7 @@ init_ttyfp(void) if( initialized ) return; -#if defined(__MINGW32__) +#if defined(_WIN32) { SECURITY_ATTRIBUTES sa; @@ -194,7 +194,7 @@ tty_printf( const char *fmt, ... ) init_ttyfp(); va_start( arg_ptr, fmt ) ; - #ifdef __MINGW32__ +#ifdef _WIN32 { char *buf = NULL; int n; @@ -211,10 +211,10 @@ tty_printf( const char *fmt, ... ) last_prompt_len += n; m_free (buf); } - #else +#else last_prompt_len += vfprintf(ttyfp,fmt,arg_ptr) ; fflush(ttyfp); - #endif +#endif va_end(arg_ptr); } @@ -231,7 +231,7 @@ tty_print_string( byte *p, size_t n ) if( !initialized ) init_ttyfp(); - #ifdef __MINGW32__ +#ifdef _WIN32 /* not so effective, change it if you want */ for( ; n; n--, p++ ) if( iscntrl( *p ) ) { @@ -244,7 +244,7 @@ tty_print_string( byte *p, size_t n ) } else tty_printf("%c", *p); - #else +#else for( ; n; n--, p++ ) if( iscntrl( *p ) ) { putc('\\', ttyfp); @@ -257,7 +257,7 @@ tty_print_string( byte *p, size_t n ) } else putc(*p, ttyfp); - #endif +#endif } void @@ -302,9 +302,9 @@ static char * do_get( const char *prompt, int hidden ) { char *buf; - #ifndef __riscos__ +#ifndef __riscos__ byte cbuf[1]; - #endif +#endif int c, n, i; if( batchmode ) { @@ -325,7 +325,7 @@ do_get( const char *prompt, int hidden ) buf = m_alloc(n=50); i = 0; - #ifdef __MINGW32__ /* windoze version */ +#ifdef _WIN32 /* windoze version */ if( hidden ) SetConsoleMode(con.in, HID_INPMODE ); @@ -359,7 +359,7 @@ do_get( const char *prompt, int hidden ) if( hidden ) SetConsoleMode(con.in, DEF_INPMODE ); - #elif defined(__riscos__) +#elif defined(__riscos__) do { c = riscos_getchar(); if (c == 0xa || c == 0xd) { /* Return || Enter */ @@ -399,9 +399,9 @@ do_get( const char *prompt, int hidden ) } } while (c != '\n'); i = (i>0) ? i-1 : 0; - #else /* unix version */ +#else /* unix version */ if( hidden ) { - #ifdef HAVE_TCGETATTR +#ifdef HAVE_TCGETATTR struct termios term; if( tcgetattr(fileno(ttyfp), &termsave) ) @@ -411,7 +411,7 @@ do_get( const char *prompt, int hidden ) term.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); if( tcsetattr( fileno(ttyfp), TCSAFLUSH, &term ) ) log_fatal("tcsetattr() failed: %s\n", strerror(errno) ); - #endif +#endif } /* fixme: How can we avoid that the \n is echoed w/o disabling @@ -442,13 +442,13 @@ do_get( const char *prompt, int hidden ) if( hidden ) { - #ifdef HAVE_TCGETATTR +#ifdef HAVE_TCGETATTR if( tcsetattr(fileno(ttyfp), TCSAFLUSH, &termsave) ) log_error("tcsetattr() failed: %s\n", strerror(errno) ); restore_termios = 0; - #endif +#endif } - #endif /* end unix version */ +#endif /* end unix version */ buf[i] = 0; return buf; } @@ -480,9 +480,9 @@ tty_kill_prompt() last_prompt_len = 0; if( !last_prompt_len ) return; - #ifdef __MINGW32__ +#ifdef _WIN32 tty_printf("\r%*s\r", last_prompt_len, ""); - #else +#else { int i; putc('\r', ttyfp); @@ -491,7 +491,7 @@ tty_kill_prompt() putc('\r', ttyfp); fflush(ttyfp); } - #endif +#endif last_prompt_len = 0; } @@ -506,4 +506,3 @@ tty_get_answer_is_yes( const char *promp m_free(p); return yes; } - diff -urpP gnupg-1.2.2/util/w32reg.c gnupg-1.2.3/util/w32reg.c --- gnupg-1.2.2/util/w32reg.c 2002-10-28 17:30:49.000000000 +0000 +++ gnupg-1.2.3/util/w32reg.c 2003-07-30 15:50:11.000000000 +0000 @@ -19,7 +19,7 @@ */ #include -#if defined (__MINGW32__) || defined (__CYGWIN32__) +#if defined (_WIN32) || defined (__CYGWIN32__) /* This module is only used in this environment */ #include diff -urpP gnupg-1.2.2/zlib/Makefile.in gnupg-1.2.3/zlib/Makefile.in --- gnupg-1.2.2/zlib/Makefile.in 2003-05-01 14:36:46.000000000 +0000 +++ gnupg-1.2.3/zlib/Makefile.in 2003-08-21 19:50:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.3 from Makefile.am. +# Makefile.in generated by automake 1.7.4 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -65,6 +65,7 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ ECHO_C = @ECHO_C@ @@ -77,6 +78,7 @@ ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_Z EXEEXT = @EXEEXT@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GETOPT = @GETOPT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GPGKEYS_HKP = @GPGKEYS_HKP@ @@ -139,6 +141,7 @@ TIGER_O = @TIGER_O@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +W32LIBS = @W32LIBS@ WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ XGETTEXT = @XGETTEXT@ @@ -202,6 +205,7 @@ libzlib_a_SOURCES = adler32.c compress.c CLEANFILES = foo.gz subdir = zlib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -277,7 +281,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -288,7 +292,7 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) iD8DBQE/RSqpaLeriVdUjc0RAu4FAJ97Vt0hiHX90w4Ho0lXB2mFdY88/QCbBUNy 5rT9zzc3QO9g4oRd2u5F+wI= =QGCs -----END PGP SIGNATURE-----