From f3b2ef0b93668177d8241b18c39b64a55a5135b7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 22 Mar 2001 18:04:47 +0000 Subject: [PATCH] The "Samba" bug fixes :-) --- ChangeLog | 5 + NOTES | 4 + THANKS | 4 + checks/ChangeLog | 11 + checks/Makefile.am | 4 +- checks/mkdemodirs | 6 +- checks/sigs.test | 4 +- cipher/ChangeLog | 7 + cipher/blowfish.c | 14 +- cipher/elgamal.c | 8 +- configure.in | 33 +- g10/ChangeLog | 19 ++ g10/build-packet.c | 2 +- g10/g10.c | 6 +- g10/keygen.c | 8 +- g10/ringedit.c | 6 +- g10/status.c | 1 + mpi/ChangeLog | 6 + mpi/config.links | 36 +- po/ChangeLog | 4 + po/de.glo | 2 +- po/de.po | 835 ++++++++++++++++++++++----------------------- tools/ChangeLog | 4 + tools/shmtest.c | 1 + util/iobuf.c | 2 +- 25 files changed, 545 insertions(+), 487 deletions(-) diff --git a/ChangeLog b/ChangeLog index d61c5bdbb..232a275b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-18 Werner Koch + + * configure.in: Hardwire the use of -lsocket for some + systems. Thanks to Reinhard Wobst. + 2001-03-13 Werner Koch * configure.in: Add copyright notice and -lwsock32. diff --git a/NOTES b/NOTES index 97996597e..73e400dea 100644 --- a/NOTES +++ b/NOTES @@ -1,3 +1,7 @@ +Checking ElGamal signatures is really slow and the reason for the long +running time on parts o my keyring. Because somekeys are also checked at startup, this is even worser. I should invalidate my self signature with algo 16 or 20. + +Further problem: It seems that the caching does only work in part. SCO UnixWare/7.1.0 reported by Allan Clark for 0.9.8 diff --git a/THANKS b/THANKS index d64cb90b9..d136d3fde 100644 --- a/THANKS +++ b/THANKS @@ -50,6 +50,8 @@ Frank Stajano frank.stajano@cl.cam.ac.uk Frank Tobin ftobin@uiuc.edu Gabriel Rosenkoetter gr@eclipsed.net Gaël Quéri gqueri@mail.dotcom.fr +Gene Carter gcarter@lanier.com +Georg Schwarz georg.schwarz@iname.com Giampaolo Tomassoni g.tomassoni@libero.it Gilbert Fernandes gilbert_fernandes@hotmail.com Greg Louis glouis@dynamicro.on.ca @@ -87,6 +89,7 @@ Karl Fogel kfogel@guanabana.onshore.com Karsten Thygesen karthy@kom.auc.dk Katsuhiro Kondou kondou@nec.co.jp Kazu Yamamoto kazu@iijlab.net +Kevin Ryde user42@zip.com.au Klaus Singvogel ks@caldera.de Lars Kellogg-Stedman lars@bu.edu L. Sassaman rabbi@quickie.net @@ -119,6 +122,7 @@ Philippe Laliberte arsphl@oeil.qc.ca Peter Fales psfales@lucent.com Peter Gutmann pgut001@cs.auckland.ac.nz Peter Marschall Peter.Marschall@gedos.de +Piotr Krukowiecki piotr@pingu.ii.uj.edu.pl QingLong qinglong@bolizm.ihep.su Ralph Gillen gillen@theochem.uni-duesseldorf.de Rat ratinox@peorth.gweep.net diff --git a/checks/ChangeLog b/checks/ChangeLog index 85e3ca067..1d07f7209 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,14 @@ +2001-03-20 Werner Koch + + * Makefile.am: Import the pubdemo.asc file + + * sigs.test (hash_algo_list): s/tiger/tiger192/ + +2001-03-19 Werner Koch + + * mkdemodirs (GPGDEMO): Add --allow-secret-key-import to all gpg + invocations. Use echon -n instead of an argument with \c. + 2001-02-12 Werner Koch * multisig.test: new diff --git a/checks/Makefile.am b/checks/Makefile.am index 27ca45360..9c8c43d63 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -19,6 +19,7 @@ ## Process this file with automake to create Makefile.in GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor +GPG_IMPORT = ../g10/gpg --homedir . --no-options --quiet --yes --import TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ @@ -57,8 +58,9 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ echo timestamp >./prepared.stamp -./pubring.gpg: $(srcdir)/pubring.asc +./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc + $(GPG_IMPORT) $(srcdir)/pubdemo.asc ./secring.gpg: $(srcdir)/secring.asc $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc diff --git a/checks/mkdemodirs b/checks/mkdemodirs index f0c7e02ba..d6b7d7c4c 100755 --- a/checks/mkdemodirs +++ b/checks/mkdemodirs @@ -2,7 +2,7 @@ set -e -GPG="../g10/gpg --batch --quiet --no-secmem-warning" +GPG="../g10/gpg --batch --quiet --no-secmem-warning --allow-secret-key-import" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' @@ -19,9 +19,9 @@ $GPG --dearmor -o pubdemo.gpg --yes ../checks/pubdemo.asc [ -f ./tdb.tmp ] && rm ./tdb.tmp GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring --keyring pubdemo.gpg --secret-keyring secdemo.gpg" -/bin/echo "Creating:\c" +echo -n "Creating:" for name in $NAMES; do - /bin/echo " $name\c" + echo -n " $name" [ -d $name ] && rm -r $name mkdir $name $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg diff --git a/checks/sigs.test b/checks/sigs.test index a32388948..702a55476 100755 --- a/checks/sigs.test +++ b/checks/sigs.test @@ -10,8 +10,8 @@ for i in $plain_files $data_files; do done hash_algo_list="ripemd160 sha1 md5" -if have_hash_algo "TIGER"; then - hash_algo_list="$hash_algo_list tiger" +if have_hash_algo "TIGER192"; then + hash_algo_list="$hash_algo_list tiger192" fi for da in $hash_algo_list ; do diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 6b2134da2..74bafed4b 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,10 @@ +2001-03-19 Werner Koch + + * blowfish.c (encrypt,do_encrypt): Changed name to do_encrypt to + avoid name clahses with an encrypt function in stdlib.h of + Dynix/PIX. Thanks to Gene Carter. + * elgamal.c (encrypt,do_encrypt): Ditto. + 2001-03-12 Werner Koch * twofish.c (gnupgext_enum_func): Add some static when comnpiled diff --git a/cipher/blowfish.c b/cipher/blowfish.c index 0cb5a861f..f58c70f44 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -280,7 +280,7 @@ function_F( BLOWFISH_context *bc, u32 x ) static void -encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) +do_encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) { #if BLOWFISH_ROUNDS == 16 u32 xl, xr, *s0, *s1, *s2, *s3, *p; @@ -419,7 +419,7 @@ encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf ) d1 = inbuf[0] << 24 | inbuf[1] << 16 | inbuf[2] << 8 | inbuf[3]; d2 = inbuf[4] << 24 | inbuf[5] << 16 | inbuf[6] << 8 | inbuf[7]; - encrypt( bc, &d1, &d2 ); + do_encrypt( bc, &d1, &d2 ); outbuf[0] = (d1 >> 24) & 0xff; outbuf[1] = (d1 >> 16) & 0xff; outbuf[2] = (d1 >> 8) & 0xff; @@ -524,27 +524,27 @@ bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen ) datal = datar = 0; for(i=0; i < BLOWFISH_ROUNDS+2; i += 2 ) { - encrypt( c, &datal, &datar ); + do_encrypt( c, &datal, &datar ); c->p[i] = datal; c->p[i+1] = datar; } for(i=0; i < 256; i += 2 ) { - encrypt( c, &datal, &datar ); + do_encrypt( c, &datal, &datar ); c->s0[i] = datal; c->s0[i+1] = datar; } for(i=0; i < 256; i += 2 ) { - encrypt( c, &datal, &datar ); + do_encrypt( c, &datal, &datar ); c->s1[i] = datal; c->s1[i+1] = datar; } for(i=0; i < 256; i += 2 ) { - encrypt( c, &datal, &datar ); + do_encrypt( c, &datal, &datar ); c->s2[i] = datal; c->s2[i+1] = datar; } for(i=0; i < 256; i += 2 ) { - encrypt( c, &datal, &datar ); + do_encrypt( c, &datal, &datar ); c->s3[i] = datal; c->s3[i+1] = datar; } diff --git a/cipher/elgamal.c b/cipher/elgamal.c index 02469d6ce..9276631df 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -50,7 +50,7 @@ static void test_keys( ELG_secret_key *sk, unsigned nbits ); static MPI gen_k( MPI p ); static void generate( ELG_secret_key *sk, unsigned nbits, MPI **factors ); static int check_secret_key( ELG_secret_key *sk ); -static void encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ); +static void do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ); static void decrypt(MPI output, MPI a, MPI b, ELG_secret_key *skey ); static void sign(MPI a, MPI b, MPI input, ELG_secret_key *skey); static int verify(MPI a, MPI b, MPI input, ELG_public_key *pkey); @@ -136,7 +136,7 @@ test_keys( ELG_secret_key *sk, unsigned nbits ) m_free(p); } - encrypt( out1_a, out1_b, test, &pk ); + do_encrypt( out1_a, out1_b, test, &pk ); decrypt( out2, out1_a, out1_b, sk ); if( mpi_cmp( test, out2 ) ) log_fatal("ElGamal operation: encrypt, decrypt failed\n"); @@ -338,7 +338,7 @@ check_secret_key( ELG_secret_key *sk ) static void -encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ) +do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ) { MPI k; @@ -557,7 +557,7 @@ elg_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey ) pk.y = pkey[2]; resarr[0] = mpi_alloc( mpi_get_nlimbs( pk.p ) ); resarr[1] = mpi_alloc( mpi_get_nlimbs( pk.p ) ); - encrypt( resarr[0], resarr[1], data, &pk ); + do_encrypt( resarr[0], resarr[1], data, &pk ); return 0; } diff --git a/configure.in b/configure.in index 0d05528bf..1f03bbb32 100644 --- a/configure.in +++ b/configure.in @@ -327,21 +327,28 @@ if test "$ac_cv_header_gdbm_h" = yes ; then fi fi - dnl Solaris needs -lsocket and -lnsl. Unisys system includes dnl gethostbyname in libsocket but needs libnsl for socket. -AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1) -if test x$ac_need_libsocket = x1; then - LIBS="$LIBS -lsocket" -fi -if test x$ac_try_nsl = x1; then - AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1) - if test x$ac_need_libnsl = x1 - then - LIBS="$LIBS -lnsl" - fi -fi +dnl The test does not workfor all system, so some are hardcoded here. +case "${target}" in + i386-univel-sysv4*) + LIBS="$LIBS -lsocket -lnsl" + ;; + *) + AC_CHECK_LIB(nsl, gethostbyname) + AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1) + if test x$ac_need_libsocket = x1; then + LIBS="$LIBS -lsocket" + fi + if test x$ac_try_nsl = x1; then + AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1) + if test x$ac_need_libnsl = x1 + then + LIBS="$LIBS -lnsl" + fi + fi + ;; +esac if test "$try_dynload" = yes ; then diff --git a/g10/ChangeLog b/g10/ChangeLog index 79cdc09cc..dd94799ce 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,24 @@ +2001-03-21 Werner Koch + + * status.c: Add sys/types.h so that it runs on Ultrix. Reported + by Georg Schwarz.x + + * build-packet.c (build_sig_subpkt): Fixed generaton of packet + length header in case where 2 bytes headers are needed. Thanks to + Piotr Krukowiecki. + +2001-03-19 Werner Koch + + * g10.c (main): the default keyring is no always used unless + --no-default-keyring is given. + + * ringedit.c (add_keyblock_resource): invalidate cache after file + creation. + 2001-03-15 Werner Koch + * keygen.c (ask_algo): Changed the warning of the ElGamal S+E Algo. + * keylist.c (print_capabilities): New. (list_keyblock_colon): and use it here. diff --git a/g10/build-packet.c b/g10/build-packet.c index 79af6401a..e48770e83 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -818,7 +818,7 @@ build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type, } else if( nlen == 2 ) { data[n0+2] = (buflen+1-192) / 256 + 192; - data[n0+3] = (buflen+1-192) & 256; + data[n0+3] = (buflen+1-192) % 256; data[n0+4] = type; memcpy(data+n0+5, buffer, buflen ); } diff --git a/g10/g10.c b/g10/g10.c index e960384ff..af3e7f5c6 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -605,7 +605,7 @@ main( int argc, char **argv ) char *configname = NULL; unsigned configlineno; int parse_debug = 0; - int default_config =1; + int default_config = 1; int default_keyring = 1; int greeting = 0; int nogreeting = 0; @@ -1128,11 +1128,11 @@ main( int argc, char **argv ) if( cmd != aDeArmor && cmd != aEnArmor && !(cmd == aKMode && argc == 2 ) ) { - if( !sec_nrings && default_keyring ) /* add default secret rings */ + if( !sec_nrings || default_keyring ) /* add default secret rings */ add_keyblock_resource("secring.gpg", 0, 1); for(sl = sec_nrings; sl; sl = sl->next ) add_keyblock_resource( sl->d, 0, 1 ); - if( !nrings && default_keyring ) /* add default ring */ + if( !nrings || default_keyring ) /* add default ring */ add_keyblock_resource("pubring.gpg", 0, 0); for(sl = nrings; sl; sl = sl->next ) add_keyblock_resource( sl->d, 0, 0 ); diff --git a/g10/keygen.c b/g10/keygen.c index 4afd06a56..727bca385 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -416,8 +416,10 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek, } #if 0 -/* we can't enable generation right now, becuase we first need to implement - * the keyflags */ +/* we can't enable generation right now, becuase we first need to + * implement the keyflags - the problem is that we need to change all + * signature editing function to keep the ketflags associated with an + * RSA key. */ static int gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek, STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval ) @@ -568,7 +570,7 @@ ask_algo( int addmode ) #endif else if( algo == 4 ) { if( cpr_get_answer_is_yes("keygen.algo.elg_se",_( - "Do you really want to create a sign and encrypt key? "))) { + "The use of this algorithm is deprecated - create anyway? "))){ algo = PUBKEY_ALGO_ELGAMAL; break; } diff --git a/g10/ringedit.c b/g10/ringedit.c index a4cf263de..5e9102477 100644 --- a/g10/ringedit.c +++ b/g10/ringedit.c @@ -198,7 +198,7 @@ add_keyblock_resource( const char *url, int force, int secret ) char *filename = NULL; int rc = 0; enum resource_type rt = rt_UNKNOWN; - + const char *created_fname = NULL; /* Do we have an URL? * gnupg-gdbm:filename := this is a GDBM resource @@ -317,12 +317,14 @@ add_keyblock_resource( const char *url, int force, int secret ) #endif if( !opt.quiet ) log_info(_("%s: keyring created\n"), filename ); + created_fname = filename; } } #if HAVE_DOSISH_SYSTEM || 1 iobuf_close( iobuf ); iobuf = NULL; - /* must close it again */ + if (created_fname) /* must invalidate that ugly cache */ + iobuf_ioctl (NULL, 2, 0, (char*)created_fname); #endif break; diff --git a/g10/status.c b/g10/status.c index f6c1d1a02..44b858761 100644 --- a/g10/status.c +++ b/g10/status.c @@ -30,6 +30,7 @@ #include #endif #ifdef HAVE_SYS_IPC_H + #include #include #endif #ifdef HAVE_SYS_SHM_H diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 70f50ae25..b867f0252 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,9 @@ +2001-03-18 Werner Koch + + * config.links (mpi_sflags): Use i386 code for i386. According to + tests by Kevin Ryde the i586 code runs slow on i386 CPUs. Ditto + for i786. + 2000-10-24 Werner Koch * mips3/: Changed a few comments to C-style. By Jeff Long. diff --git a/mpi/config.links b/mpi/config.links index 18cf9040a..48c7977c9 100644 --- a/mpi/config.links +++ b/mpi/config.links @@ -12,18 +12,18 @@ echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h if test "$try_asm_modules" = "yes" ; then case "${target}" in - i[34]86*-*-freebsd*-elf | \ - i[34]86*-*-freebsd[3-9]* | \ - i[34]86*-*-freebsdelf* | \ - i[34]86*-*-netbsd* ) + i[3467]86*-*-freebsd*-elf | \ + i[3467]86*-*-freebsd[3-9]* | \ + i[3467]86*-*-freebsdelf* | \ + i[3467]86*-*-netbsd* ) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-freebsd*-elf | \ - i[56]86*-*-freebsd[3-9]* | \ - i[56]86*-*-freebsdelf* | \ - i[56]86*-*-netbsd* | \ + i586*-*-freebsd*-elf | \ + i586*-*-freebsd[3-9]* | \ + i586*-*-freebsdelf* | \ + i586*-*-netbsd* | \ pentium-*-netbsd* | \ pentiumpro-*-netbsd*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h @@ -35,38 +35,38 @@ case "${target}" in cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[34]86*-*-linuxaout* | \ - i[34]86*-*-linuxoldld* | \ - i[34]86*-*-*bsd*) + i[3467]86*-*-linuxaout* | \ + i[3467]86*-*-linuxoldld* | \ + i[3467]86*-*-*bsd*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-linuxaout* | \ - i[56]86*-*-linuxoldld* | \ - i[56]86*-*-*bsd*) + i586*-*-linuxaout* | \ + i586*-*-linuxoldld* | \ + i586*-*-*bsd*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i586 i386" ;; - i[34]86*-msdosdjgpp*) + i[3467]86*-msdosdjgpp*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-msdosdjgpp*) + i586*-msdosdjgpp*) echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i586 i386" ;; - i[34]86*-*-*) + i[3467]86*-*-*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h path="i386" ;; - i[56]86*-*-* | \ + i586*-*-* | \ pentium-*-* | \ pentiumpro-*-*) echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h diff --git a/po/ChangeLog b/po/ChangeLog index ab815cd52..852ca209d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2001-03-18 Werner Koch + + * de.po, de.glo: Updated. + 2001-02-22 Werner Koch * de.po, de.glo: Updated. diff --git a/po/de.glo b/po/de.glo index 3f2d3426a..b2745f246 100644 --- a/po/de.glo +++ b/po/de.glo @@ -1,6 +1,6 @@ # Glossary for GnuPG german translation # Zusammenstellung der Liste: -# Copyright (C) 1998 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 20001 Free Software Foundation, Inc. # Walter Koch , 1998. # # This is just a textfile for your information. diff --git a/po/de.po b/po/de.po index 182ae4308..d2d17f01a 100644 --- a/po/de.po +++ b/po/de.po @@ -1,10 +1,10 @@ # GnuPG german translation -# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. # Walter Koch , 1998, 1999, 2000, 2001 msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.4\n" -"POT-Creation-Date: 2001-03-13 13:40+0100\n" +"POT-Creation-Date: 2001-02-17 02:26+0000\n" "PO-Revision-Date: 2001-02-20 21:20+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -43,7 +43,7 @@ msgstr "nein" msgid "nN" msgstr "nN" -#: g10/keyedit.c:581 util/miscutil.c:308 +#: g10/keyedit.c:580 util/miscutil.c:308 msgid "quit" msgstr "quit" @@ -247,17 +247,6 @@ msgstr "nicht verschl msgid "not processed" msgstr "nicht bearbeitet" -#. the key cannot be used for a specific usage -#: util/errors.c:105 -#, fuzzy -msgid "unusable public key" -msgstr "Falscher öffentlicher Schüssel" - -#: util/errors.c:106 -#, fuzzy -msgid "unusable secret key" -msgstr "Falscher geheimer Schlüssel" - #: util/logger.c:224 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -268,64 +257,64 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n" -#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256 +#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256 #, c-format msgid "can't open `%s': %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: cipher/random.c:313 +#: cipher/random.c:315 #, c-format msgid "can't stat `%s': %s\n" msgstr "Status von '%s' ist nicht feststellbar: %s\n" -#: cipher/random.c:318 +#: cipher/random.c:320 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n" -#: cipher/random.c:323 +#: cipher/random.c:325 msgid "note: random_seed file is empty\n" msgstr "Hinweis: 'random_seed'-Datei ist leer\n" -#: cipher/random.c:329 +#: cipher/random.c:331 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:337 +#: cipher/random.c:339 #, c-format msgid "can't read `%s': %s\n" msgstr "'%s' ist unlesbar: %s\n" -#: cipher/random.c:375 +#: cipher/random.c:377 msgid "note: random_seed file not updated\n" msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n" -#: cipher/random.c:395 +#: cipher/random.c:397 #, c-format msgid "can't create `%s': %s\n" msgstr "'%s' kann nicht erzeugt werden: %s\n" -#: cipher/random.c:402 +#: cipher/random.c:404 #, c-format msgid "can't write `%s': %s\n" msgstr "kann '%s' nicht schreiben: %s\n" -#: cipher/random.c:405 +#: cipher/random.c:407 #, c-format msgid "can't close `%s': %s\n" msgstr "kann '%s' nicht schliessen: %s\n" -#: cipher/random.c:416 +#: cipher/random.c:418 #, c-format msgid "too many random bits requested; the limit is %d\n" msgstr "Zu viele Zufallswerte angefordert: Die Grenze liegt bei %d\n" -#: cipher/random.c:648 +#: cipher/random.c:650 msgid "WARNING: using insecure random number generator!!\n" msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n" -#: cipher/random.c:649 +#: cipher/random.c:651 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -351,7 +340,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/g10.c:213 +#: g10/g10.c:212 msgid "" "@Commands:\n" " " @@ -359,139 +348,139 @@ msgstr "" "@Befehle:\n" " " -#: g10/g10.c:215 +#: g10/g10.c:214 msgid "|[file]|make a signature" msgstr "|[Datei]|Eine Unterschrift erzeugen" -#: g10/g10.c:216 +#: g10/g10.c:215 msgid "|[file]|make a clear text signature" msgstr "|[Datei]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:217 +#: g10/g10.c:216 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:218 +#: g10/g10.c:217 msgid "encrypt data" msgstr "Daten verschlüsseln" -#: g10/g10.c:219 +#: g10/g10.c:218 msgid "encryption only with symmetric cipher" msgstr "Daten symmetrisch verschlüsseln" -#: g10/g10.c:220 +#: g10/g10.c:219 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:221 +#: g10/g10.c:220 msgid "decrypt data (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/g10.c:222 +#: g10/g10.c:221 msgid "verify a signature" msgstr "Signatur prüfen" -#: g10/g10.c:224 +#: g10/g10.c:223 msgid "list keys" msgstr "Liste der Schlüssel" -#: g10/g10.c:226 +#: g10/g10.c:225 msgid "list keys and signatures" msgstr "Liste der Schlüssel und ihrer Signaturen" -#: g10/g10.c:227 +#: g10/g10.c:226 msgid "check key signatures" msgstr "Signaturen der Schlüssel prüfen" -#: g10/g10.c:228 +#: g10/g10.c:227 msgid "list keys and fingerprints" msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\"" -#: g10/g10.c:229 +#: g10/g10.c:228 msgid "list secret keys" msgstr "Liste der geheimen Schlüssel" -#: g10/g10.c:230 +#: g10/g10.c:229 msgid "generate a new key pair" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/g10.c:231 +#: g10/g10.c:230 msgid "remove key from the public keyring" msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen" -#: g10/g10.c:233 +#: g10/g10.c:232 msgid "remove key from the secret keyring" msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen" -#: g10/g10.c:234 +#: g10/g10.c:233 msgid "sign a key" msgstr "Schlüssel signieren" -#: g10/g10.c:235 +#: g10/g10.c:234 msgid "sign a key locally" msgstr "Schlüssel nur auf diesem Rechner signieren" -#: g10/g10.c:236 +#: g10/g10.c:235 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines Schl." -#: g10/g10.c:237 +#: g10/g10.c:236 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:238 +#: g10/g10.c:237 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:239 +#: g10/g10.c:238 msgid "export keys to a key server" msgstr "Schlüssel zu einem Schlü.server exportieren" -#: g10/g10.c:240 +#: g10/g10.c:239 msgid "import keys from a key server" msgstr "Schlüssel von einem Schlü.server importieren" -#: g10/g10.c:244 +#: g10/g10.c:243 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:246 +#: g10/g10.c:245 msgid "list only the sequence of packets" msgstr "Lediglich Struktur der Datenpakete anzeigen" -#: g10/g10.c:248 +#: g10/g10.c:247 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:250 +#: g10/g10.c:249 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:252 +#: g10/g10.c:251 msgid "update the trust database" msgstr "Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:254 +#: g10/g10.c:253 msgid "|[NAMES]|check the trust database" msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank" -#: g10/g10.c:255 +#: g10/g10.c:254 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschädigten \"Trust\"-Datenb." -#: g10/g10.c:256 +#: g10/g10.c:255 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-Hülle befreien" -#: g10/g10.c:258 +#: g10/g10.c:257 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-Hülle einpacken" -#: g10/g10.c:260 +#: g10/g10.c:259 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:264 +#: g10/g10.c:263 msgid "" "@\n" "Options:\n" @@ -501,160 +490,160 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:266 +#: g10/g10.c:265 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:268 +#: g10/g10.c:267 msgid "|NAME|encrypt for NAME" msgstr "|NAME|Verschlüsseln für NAME" -#: g10/g10.c:271 +#: g10/g10.c:270 msgid "|NAME|use NAME as default recipient" msgstr "|NAME|NAME als voreingestellten Empfänger benutzen" -#: g10/g10.c:273 +#: g10/g10.c:272 msgid "use the default key as default recipient" msgstr "" "Den Standardschlüssel als voreingestellten\n" "Empfänger benutzen" -#: g10/g10.c:277 +#: g10/g10.c:276 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:278 +#: g10/g10.c:277 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0=keine)" -#: g10/g10.c:280 +#: g10/g10.c:279 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:281 +#: g10/g10.c:280 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:282 +#: g10/g10.c:281 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:283 +#: g10/g10.c:282 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:284 +#: g10/g10.c:283 msgid "don't use the terminal at all" msgstr "das Terminal gar nicht benutzen" -#: g10/g10.c:285 +#: g10/g10.c:284 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" -#: g10/g10.c:286 +#: g10/g10.c:285 msgid "always use a MDC for encryption" msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden" -#: g10/g10.c:287 +#: g10/g10.c:286 msgid "do not make any changes" msgstr "Keine wirklichen Änderungen durchführen" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:289 +#: g10/g10.c:288 msgid "use the gpg-agent" msgstr "verwende den GPG-Agent" -#: g10/g10.c:290 +#: g10/g10.c:289 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:291 +#: g10/g10.c:290 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:292 +#: g10/g10.c:291 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:293 +#: g10/g10.c:292 msgid "add this keyring to the list of keyrings" msgstr "Als öffentlichen Schlüsselbund mitbenutzen" -#: g10/g10.c:294 +#: g10/g10.c:293 msgid "add this secret keyring to the list" msgstr "Als geheimen Schlüsselbund mitbenutzen" -#: g10/g10.c:295 +#: g10/g10.c:294 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" -#: g10/g10.c:296 +#: g10/g10.c:295 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|Schlüssel bei diesem Server nachschlagen" -#: g10/g10.c:297 +#: g10/g10.c:296 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:298 +#: g10/g10.c:297 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:302 +#: g10/g10.c:301 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:307 +#: g10/g10.c:306 msgid "|KEYID|ulimately trust this key" msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen" -#: g10/g10.c:308 +#: g10/g10.c:307 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Erweiterungsmodul DATEI laden" -#: g10/g10.c:309 +#: g10/g10.c:308 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:310 +#: g10/g10.c:309 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:311 +#: g10/g10.c:310 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:313 +#: g10/g10.c:312 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Hashverfahren NAME für Mantras benutzen" -#: g10/g10.c:315 +#: g10/g10.c:314 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen" -#: g10/g10.c:316 +#: g10/g10.c:315 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Verschlü.verfahren NAME benutzen" -#: g10/g10.c:317 +#: g10/g10.c:316 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Hashverfahren NAME benutzen" -#: g10/g10.c:318 +#: g10/g10.c:317 msgid "|N|use compress algorithm N" msgstr "|N|Komprimierverfahren N benutzen" -#: g10/g10.c:319 +#: g10/g10.c:318 msgid "throw keyid field of encrypted packets" msgstr "Entferne Empfänger-ID verschlüsselter Pakete" -#: g10/g10.c:320 +#: g10/g10.c:319 msgid "|NAME=VALUE|use this notation data" msgstr "|NAME=WERT|verwende diese \"notation\"-Daten" -#: g10/g10.c:323 +#: g10/g10.c:322 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -663,7 +652,7 @@ msgstr "" "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und " "Optionen)\n" -#: g10/g10.c:326 +#: g10/g10.c:325 msgid "" "@\n" "Examples:\n" @@ -683,17 +672,17 @@ msgstr "" " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:432 +#: g10/g10.c:431 msgid "Please report bugs to .\n" msgstr "" "Berichte über Bugs (Programmfehler) bitte an .\n" "Sinn- oder Schreibfehler in den deutschen Texten bitte an .\n" -#: g10/g10.c:436 +#: g10/g10.c:435 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:439 +#: g10/g10.c:438 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -703,7 +692,7 @@ msgstr "" "Signieren, prüfen, verschlüsseln, entschlüsseln\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:446 +#: g10/g10.c:445 msgid "" "\n" "Supported algorithms:\n" @@ -711,192 +700,192 @@ msgstr "" "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:525 +#: g10/g10.c:524 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:578 +#: g10/g10.c:577 msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:728 +#: g10/g10.c:727 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:732 +#: g10/g10.c:731 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:739 +#: g10/g10.c:738 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:944 +#: g10/g10.c:943 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:1015 +#: g10/g10.c:1014 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:1019 g10/g10.c:1028 +#: g10/g10.c:1018 g10/g10.c:1027 #, 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:1021 +#: g10/g10.c:1020 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:1024 +#: g10/g10.c:1023 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:1044 g10/g10.c:1056 +#: g10/g10.c:1043 g10/g10.c:1055 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n" -#: g10/g10.c:1050 g10/g10.c:1062 +#: g10/g10.c:1049 g10/g10.c:1061 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:1066 +#: g10/g10.c:1065 msgid "the given policy URL is invalid\n" msgstr "Die angegebene URL für Richtlinien ist ungültig\n" -#: g10/g10.c:1069 +#: g10/g10.c:1068 #, 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:1071 +#: g10/g10.c:1070 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:1073 +#: g10/g10.c:1072 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:1075 +#: g10/g10.c:1074 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:1078 +#: g10/g10.c:1077 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:1082 +#: g10/g10.c:1081 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:1167 +#: g10/g10.c:1166 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:1173 +#: g10/g10.c:1172 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:1180 +#: g10/g10.c:1179 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:1188 +#: g10/g10.c:1187 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:1201 +#: g10/g10.c:1200 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:1214 +#: g10/g10.c:1213 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:1228 +#: g10/g10.c:1227 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1245 +#: g10/g10.c:1244 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1253 +#: g10/g10.c:1252 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:1261 +#: g10/g10.c:1260 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:1269 +#: g10/g10.c:1268 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:1285 +#: g10/g10.c:1284 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key User-ID" -#: g10/g10.c:1288 +#: g10/g10.c:1287 msgid "--delete-key user-id" msgstr "--delete-key User-ID" -#: g10/g10.c:1296 +#: g10/g10.c:1295 msgid "--delete-secret-and-public-key user-id" msgstr "--delete-secret-and-public-key User-ID" -#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393 +#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:1348 +#: g10/g10.c:1347 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:1414 +#: g10/g10.c:1413 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1422 +#: g10/g10.c:1421 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1493 +#: g10/g10.c:1492 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:1580 +#: g10/g10.c:1579 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1584 +#: g10/g10.c:1583 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1587 g10/verify.c:94 g10/verify.c:139 +#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/g10.c:1796 +#: g10/g10.c:1795 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n" "ein Unterstrich sein\n" -#: g10/g10.c:1802 +#: g10/g10.c:1801 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -904,88 +893,88 @@ msgstr "" "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:1808 +#: g10/g10.c:1807 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n" -#: g10/g10.c:1816 +#: g10/g10.c:1815 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/armor.c:304 +#: g10/armor.c:302 #, c-format msgid "armor: %s\n" msgstr "ASCII-Hülle: %s\n" -#: g10/armor.c:333 +#: g10/armor.c:331 msgid "invalid armor header: " msgstr "Ungültige ASCII-Hülle" -#: g10/armor.c:340 +#: g10/armor.c:338 msgid "armor header: " msgstr "ASCII-Hülle: " -#: g10/armor.c:351 +#: g10/armor.c:349 msgid "invalid clearsig header\n" msgstr "Ungültige Klartextsignatur-Einleitung\n" -#: g10/armor.c:403 +#: g10/armor.c:401 msgid "nested clear text signatures\n" msgstr "verschachtelte Klartextunterschriften\n" -#: g10/armor.c:527 +#: g10/armor.c:525 msgid "invalid dash escaped line: " msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: " -#: g10/armor.c:539 +#: g10/armor.c:537 msgid "unexpected armor:" msgstr "Unerwartete ASCII-Hülle:" -#: g10/armor.c:665 +#: g10/armor.c:663 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n" -#: g10/armor.c:708 +#: g10/armor.c:706 msgid "premature eof (no CRC)\n" msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n" -#: g10/armor.c:742 +#: g10/armor.c:740 msgid "premature eof (in CRC)\n" msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n" -#: g10/armor.c:746 +#: g10/armor.c:744 msgid "malformed CRC\n" msgstr "Falsch aufgebaute Prüfsumme\n" -#: g10/armor.c:750 +#: g10/armor.c:748 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Prüfsummenfehler; %06lx - %06lx\n" -#: g10/armor.c:767 +#: g10/armor.c:765 msgid "premature eof (in Trailer)\n" msgstr "vorzeitiges Dateiende (im Nachsatz)\n" -#: g10/armor.c:771 +#: g10/armor.c:769 msgid "error in trailer line\n" msgstr "Fehler in der Nachsatzzeile\n" -#: g10/armor.c:917 +#: g10/armor.c:915 msgid "For info see http://www.gnupg.org" msgstr "Weitere Infos: siehe http://www.gnupg.org" -#: g10/armor.c:1045 +#: g10/armor.c:1043 msgid "no valid OpenPGP data found.\n" msgstr "Keine gültigen OpenPGP-Daten gefunden.\n" -#: g10/armor.c:1050 +#: g10/armor.c:1048 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n" -#: g10/armor.c:1054 +#: g10/armor.c:1052 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -994,7 +983,7 @@ msgstr "" #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID -#: g10/keyedit.c:1190 g10/pkclist.c:53 +#: g10/keyedit.c:1189 g10/pkclist.c:53 msgid " Fingerprint:" msgstr " Fingerabdruck:" @@ -1233,17 +1222,17 @@ msgstr "" " Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen " "Besitzer gehört.\n" -#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011 +#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: übersprungen: %s\n" -#: g10/pkclist.c:826 g10/pkclist.c:993 +#: g10/pkclist.c:827 g10/pkclist.c:994 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n" -#: g10/pkclist.c:853 +#: g10/pkclist.c:854 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -1251,44 +1240,44 @@ msgstr "" "Sie haben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:863 +#: g10/pkclist.c:864 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:875 +#: g10/pkclist.c:876 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:880 +#: g10/pkclist.c:881 msgid "skipped: public key already set as default recipient\n" msgstr "" "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n" -#: g10/pkclist.c:903 +#: g10/pkclist.c:904 msgid "Public key is disabled.\n" msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "skipped: public key already set with --encrypt-to\n" msgstr "" "übersprungen: öffentlicher Schlüssel bereits mittels --encrypt-to gesetzt\n" -#: g10/pkclist.c:941 +#: g10/pkclist.c:942 #, c-format msgid "unknown default recipient `%s'\n" msgstr "Unbekannter voreingestellter Empfänger '%s'\n" -#: g10/pkclist.c:974 +#: g10/pkclist.c:975 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim Prüfen des Schlüssels: %s\n" -#: g10/pkclist.c:979 +#: g10/pkclist.c:980 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n" -#: g10/pkclist.c:1017 +#: g10/pkclist.c:1018 msgid "no valid addressees\n" msgstr "Keine gültigen Adressaten\n" @@ -1567,7 +1556,7 @@ msgstr "" "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keyedit.c:469 g10/keygen.c:955 +#: g10/keyedit.c:468 g10/keygen.c:955 msgid "passphrase not correctly repeated; try again.\n" msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n" @@ -1697,287 +1686,287 @@ msgstr "Schl msgid "key %08lX: not protected - skipped\n" msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n" -#: g10/export.c:236 +#: g10/export.c:232 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" -#: g10/getkey.c:208 +#: g10/getkey.c:211 msgid "too many entries in pk cache - disabled\n" msgstr "zu viele Einträge im pk-Lager - abgeschaltet\n" -#: g10/getkey.c:443 +#: g10/getkey.c:445 msgid "too many entries in unk cache - disabled\n" msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n" -#: g10/getkey.c:2143 +#: g10/getkey.c:2100 #, 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:2185 g10/trustdb.c:577 +#: g10/getkey.c:2141 g10/trustdb.c:577 #, 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/getkey.c:2473 +#: g10/getkey.c:2424 msgid "[User id not found]" msgstr "[User-ID nicht gefunden]" -#: g10/import.c:184 +#: g10/import.c:182 #, c-format msgid "skipping block of type %d\n" msgstr "überspringe den Block vom Typ %d\n" -#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847 +#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu Schlüssel bislang bearbeitet\n" -#: g10/import.c:196 +#: g10/import.c:194 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" -#: g10/import.c:206 +#: g10/import.c:204 #, c-format msgid "Total number processed: %lu\n" msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n" -#: g10/import.c:208 +#: g10/import.c:206 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignorierte neue Schlüssel: %lu\n" -#: g10/import.c:211 +#: g10/import.c:209 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ohne User-ID: %lu\n" -#: g10/import.c:213 +#: g10/import.c:211 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: g10/import.c:219 +#: g10/import.c:217 #, c-format msgid " unchanged: %lu\n" msgstr " unverändert: %lu\n" -#: g10/import.c:221 +#: g10/import.c:219 #, c-format msgid " new user IDs: %lu\n" msgstr " neue User-IDs: %lu\n" -#: g10/import.c:223 +#: g10/import.c:221 #, c-format msgid " new subkeys: %lu\n" msgstr " neue Unterschlüssel: %lu\n" -#: g10/import.c:225 +#: g10/import.c:223 #, c-format msgid " new signatures: %lu\n" msgstr " neue Signaturen: %lu\n" -#: g10/import.c:227 +#: g10/import.c:225 #, c-format msgid " new key revocations: %lu\n" msgstr " neue Schlüsselwiderrufe: %lu\n" -#: g10/import.c:229 +#: g10/import.c:227 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene geheime Schlüssel: %lu\n" -#: g10/import.c:231 +#: g10/import.c:229 #, c-format msgid " secret keys imported: %lu\n" msgstr " geheime Schlüssel importiert: %lu\n" -#: g10/import.c:233 +#: g10/import.c:231 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " unveränderte geh.Schl.: %lu\n" -#: g10/import.c:408 g10/import.c:617 +#: g10/import.c:391 g10/import.c:600 #, c-format msgid "key %08lX: no user ID\n" msgstr "Schlüssel %08lX: Keine User-ID\n" -#: g10/import.c:422 +#: g10/import.c:405 #, c-format msgid "key %08lX: no valid user IDs\n" msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n" -#: g10/import.c:424 +#: g10/import.c:407 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:435 g10/import.c:684 +#: g10/import.c:418 g10/import.c:667 #, 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:440 +#: g10/import.c:423 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n" -#: g10/import.c:448 +#: g10/import.c:431 msgid "no default public keyring\n" msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n" -#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618 +#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733 +#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716 #, c-format msgid "can't lock keyring `%s': %s\n" msgstr "kann Schlüsselbund `%s' nicht sperren: %s\n" -#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736 +#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n" -#: g10/import.c:463 +#: g10/import.c:446 #, c-format msgid "key %08lX: public key imported\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n" -#: g10/import.c:480 +#: g10/import.c:463 #, 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:489 g10/import.c:692 +#: g10/import.c:472 g10/import.c:675 #, 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:495 g10/import.c:698 +#: g10/import.c:478 g10/import.c:681 #, 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:522 +#: g10/import.c:505 #, c-format msgid "key %08lX: 1 new user ID\n" msgstr "Schlüssel %08lX: 1 neue User-ID\n" -#: g10/import.c:525 +#: g10/import.c:508 #, c-format msgid "key %08lX: %d new user IDs\n" msgstr "Schlüssel %08lX: %d neue User-IDs\n" -#: g10/import.c:528 +#: g10/import.c:511 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "Schlüssel %08lX: 1 neue Signatur\n" -#: g10/import.c:531 +#: g10/import.c:514 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "Schlüssel %08lX: %d neue Signaturen\n" -#: g10/import.c:534 +#: g10/import.c:517 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n" -#: g10/import.c:537 +#: g10/import.c:520 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n" -#: g10/import.c:547 +#: g10/import.c:530 #, c-format msgid "key %08lX: not changed\n" msgstr "Schlüssel %08lX: Nicht geändert\n" -#: g10/import.c:610 +#: g10/import.c:593 #, c-format msgid "secret key %08lX not imported (use %s to allow for it)\n" msgstr "" "Geheimer Schlüssel %08lX nicht importiert (%s verwenden, um das zu " "ermöglichen)\n" -#: g10/import.c:640 +#: g10/import.c:623 #, 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:644 +#: g10/import.c:627 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n" -#: g10/import.c:649 +#: g10/import.c:632 #, 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:678 +#: g10/import.c:661 #, 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:709 +#: g10/import.c:692 #, 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:741 +#: g10/import.c:724 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n" -#: g10/import.c:783 +#: g10/import.c:766 #, 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:790 g10/import.c:814 +#: g10/import.c:773 g10/import.c:797 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n" -#: g10/import.c:791 +#: g10/import.c:774 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung\n" -#: g10/import.c:806 +#: g10/import.c:789 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "Schlüssel %08lX: Kein Unterschlüssel für die Schlüsselanbindung\n" -#: g10/import.c:815 +#: g10/import.c:798 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n" -#: g10/import.c:842 +#: g10/import.c:825 #, c-format msgid "key %08lX: accepted non self-signed user ID '" msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID übernommen'" -#: g10/import.c:871 +#: g10/import.c:854 #, c-format msgid "key %08lX: skipped user ID '" msgstr "Schlüssel %08lX: User-ID übergangen '" -#: g10/import.c:894 +#: g10/import.c:877 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n" @@ -1986,33 +1975,33 @@ msgstr "Schl #. * 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:919 +#: g10/import.c:902 #, 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:928 +#: g10/import.c:911 #, 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:936 +#: g10/import.c:919 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n" -#: g10/import.c:1036 +#: g10/import.c:1019 #, 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:1088 +#: g10/import.c:1071 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n" -#: g10/import.c:1202 g10/import.c:1255 +#: g10/import.c:1185 g10/import.c:1238 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "Schlüssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n" @@ -2022,63 +2011,63 @@ msgstr "Schl msgid "%s: user not found\n" msgstr "%s: Benutzer nicht gefunden\n" -#: g10/keyedit.c:156 +#: g10/keyedit.c:155 msgid "[revocation]" msgstr "[Widerruf]" -#: g10/keyedit.c:157 +#: g10/keyedit.c:156 msgid "[self-signature]" msgstr "[Eigenbeglaubigung]" -#: g10/keyedit.c:221 +#: g10/keyedit.c:220 msgid "1 bad signature\n" msgstr "1 falsche Beglaubigung\n" -#: g10/keyedit.c:223 +#: g10/keyedit.c:222 #, c-format msgid "%d bad signatures\n" msgstr "%d falsche Beglaubigungen\n" -#: g10/keyedit.c:225 +#: g10/keyedit.c:224 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/keyedit.c:226 #, 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/keyedit.c:228 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/keyedit.c:230 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n" -#: g10/keyedit.c:233 +#: g10/keyedit.c:232 msgid "1 user ID without valid self-signature detected\n" msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n" -#: g10/keyedit.c:235 +#: g10/keyedit.c:234 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. -#: g10/keyedit.c:317 +#: g10/keyedit.c:316 #, c-format msgid "Already signed by key %08lX\n" msgstr "Ist bereits durch Schlüssel %08lX beglaubigt.\n" -#: g10/keyedit.c:325 +#: g10/keyedit.c:324 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n" -#: g10/keyedit.c:334 +#: g10/keyedit.c:333 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2086,7 +2075,7 @@ msgstr "" "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n" "Schlüssel beglaubigen wollen: \"" -#: g10/keyedit.c:343 +#: g10/keyedit.c:342 msgid "" "The signature will be marked as non-exportable.\n" "\n" @@ -2094,33 +2083,33 @@ msgstr "" "Die Unterschrift wird als nicht exportfähig markiert werden.\n" "\n" -#: g10/keyedit.c:348 +#: g10/keyedit.c:347 msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136 +#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" -#: g10/keyedit.c:428 +#: g10/keyedit.c:427 msgid "This key is not protected.\n" msgstr "Dieser Schlüssel ist nicht geschützt.\n" -#: g10/keyedit.c:432 +#: g10/keyedit.c:431 msgid "Secret parts of primary key are not available.\n" msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n" -#: g10/keyedit.c:436 +#: g10/keyedit.c:435 msgid "Key is protected.\n" msgstr "Schlüssel ist geschützt.\n" -#: g10/keyedit.c:456 +#: g10/keyedit.c:455 #, c-format msgid "Can't edit this key: %s\n" msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n" -#: g10/keyedit.c:461 +#: g10/keyedit.c:460 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2128,7 +2117,7 @@ msgstr "" "Geben Sie das neue Mantra für diesen geheimen Schlüssel ein.\n" "\n" -#: g10/keyedit.c:473 +#: g10/keyedit.c:472 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2136,420 +2125,420 @@ msgstr "" "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n" "\n" -#: g10/keyedit.c:476 +#: g10/keyedit.c:475 msgid "Do you really want to do this? " msgstr "Möchten Sie dies wirklich tun? " -#: g10/keyedit.c:540 +#: g10/keyedit.c:539 msgid "moving a key signature to the correct place\n" msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" -#: g10/keyedit.c:581 +#: g10/keyedit.c:580 msgid "quit this menu" msgstr "Menü verlassen" -#: g10/keyedit.c:582 +#: g10/keyedit.c:581 msgid "q" msgstr "q" -#: g10/keyedit.c:583 +#: g10/keyedit.c:582 msgid "save" msgstr "save" -#: g10/keyedit.c:583 +#: g10/keyedit.c:582 msgid "save and quit" msgstr "speichern und Menü verlassen" -#: g10/keyedit.c:584 +#: g10/keyedit.c:583 msgid "help" msgstr "help" -#: g10/keyedit.c:584 +#: g10/keyedit.c:583 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/keyedit.c:586 +#: g10/keyedit.c:585 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:586 +#: g10/keyedit.c:585 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/keyedit.c:587 +#: g10/keyedit.c:586 msgid "list" msgstr "Liste der Schlüssel" -#: g10/keyedit.c:587 +#: g10/keyedit.c:586 msgid "list key and user IDs" msgstr "Schlüssel und User-IDs auflisten" -#: g10/keyedit.c:588 +#: g10/keyedit.c:587 msgid "l" msgstr "l" -#: g10/keyedit.c:589 +#: g10/keyedit.c:588 msgid "uid" msgstr "uid" -#: g10/keyedit.c:589 +#: g10/keyedit.c:588 msgid "select user ID N" msgstr "User-ID N auswählen" -#: g10/keyedit.c:590 +#: g10/keyedit.c:589 msgid "key" msgstr "key" -#: g10/keyedit.c:590 +#: g10/keyedit.c:589 msgid "select secondary key N" msgstr "Zweitschlüssel N auswählen" -#: g10/keyedit.c:591 +#: g10/keyedit.c:590 msgid "check" msgstr "check" -#: g10/keyedit.c:591 +#: g10/keyedit.c:590 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:592 +#: g10/keyedit.c:591 msgid "c" msgstr "c" -#: g10/keyedit.c:593 +#: g10/keyedit.c:592 msgid "sign" msgstr "sign" -#: g10/keyedit.c:593 +#: g10/keyedit.c:592 msgid "sign the key" msgstr "Den Schlüssel signieren" -#: g10/keyedit.c:594 +#: g10/keyedit.c:593 msgid "s" msgstr "s" -#: g10/keyedit.c:595 +#: g10/keyedit.c:594 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:595 +#: g10/keyedit.c:594 msgid "sign the key locally" msgstr "Den Schlüssel nur auf diesem Rechner signieren" -#: g10/keyedit.c:596 +#: g10/keyedit.c:595 msgid "debug" msgstr "debug" -#: g10/keyedit.c:597 +#: g10/keyedit.c:596 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:597 +#: g10/keyedit.c:596 msgid "add a user ID" msgstr "Eine User-ID hinzufügen" -#: g10/keyedit.c:598 +#: g10/keyedit.c:597 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:598 +#: g10/keyedit.c:597 msgid "delete user ID" msgstr "User-ID entfernen" -#: g10/keyedit.c:599 +#: g10/keyedit.c:598 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:599 +#: g10/keyedit.c:598 msgid "add a secondary key" msgstr "Einen Zweitschlüssel hinzufügen" -#: g10/keyedit.c:600 +#: g10/keyedit.c:599 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:600 +#: g10/keyedit.c:599 msgid "delete a secondary key" msgstr "Einen Zweitschlüssel entfernen" -#: g10/keyedit.c:601 +#: g10/keyedit.c:600 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:601 +#: g10/keyedit.c:600 msgid "delete signatures" msgstr "Signatur entfernen" -#: g10/keyedit.c:602 +#: g10/keyedit.c:601 msgid "expire" msgstr "expire" -#: g10/keyedit.c:602 +#: g10/keyedit.c:601 msgid "change the expire date" msgstr "Ändern des Verfallsdatums" -#: g10/keyedit.c:603 +#: g10/keyedit.c:602 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:603 +#: g10/keyedit.c:602 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel" -#: g10/keyedit.c:605 +#: g10/keyedit.c:604 msgid "t" msgstr "t" -#: g10/keyedit.c:606 +#: g10/keyedit.c:605 msgid "pref" msgstr "pref" -#: g10/keyedit.c:606 +#: g10/keyedit.c:605 msgid "list preferences" msgstr "Liste der Voreinstellungen" -#: g10/keyedit.c:607 +#: g10/keyedit.c:606 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:607 +#: g10/keyedit.c:606 msgid "change the passphrase" msgstr "Das Mantra ändern" -#: g10/keyedit.c:608 +#: g10/keyedit.c:607 msgid "trust" msgstr "trust" -#: g10/keyedit.c:608 +#: g10/keyedit.c:607 msgid "change the ownertrust" msgstr "Den \"Owner trust\" ändern" -#: g10/keyedit.c:609 +#: g10/keyedit.c:608 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:609 +#: g10/keyedit.c:608 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:610 +#: g10/keyedit.c:609 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:610 +#: g10/keyedit.c:609 msgid "revoke a secondary key" msgstr "Einen Zweitschlüssel widerrufen" -#: g10/keyedit.c:611 +#: g10/keyedit.c:610 msgid "disable" msgstr "disable" -#: g10/keyedit.c:611 +#: g10/keyedit.c:610 msgid "disable a key" msgstr "Schlüssel abschalten" -#: g10/keyedit.c:612 +#: g10/keyedit.c:611 msgid "enable" msgstr "enable" -#: g10/keyedit.c:612 +#: g10/keyedit.c:611 msgid "enable a key" msgstr "Schlüssel anschalten" -#: g10/delkey.c:110 g10/keyedit.c:632 +#: g10/delkey.c:110 g10/keyedit.c:631 msgid "can't do that in batchmode\n" msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" #. check that they match #. fixme: check that they both match -#: g10/keyedit.c:670 +#: g10/keyedit.c:669 msgid "Secret key is available.\n" msgstr "Geheimer Schlüssel ist vorhanden.\n" -#: g10/keyedit.c:699 +#: g10/keyedit.c:698 msgid "Command> " msgstr "Befehl> " -#: g10/keyedit.c:729 +#: g10/keyedit.c:728 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime Schlüssel benötigt.\n" -#: g10/keyedit.c:733 +#: g10/keyedit.c:732 msgid "Please use the command \"toggle\" first.\n" msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n" -#: g10/keyedit.c:780 +#: g10/keyedit.c:779 msgid "Really sign all user IDs? " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:781 +#: g10/keyedit.c:780 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:813 g10/keyedit.c:995 +#: g10/keyedit.c:812 g10/keyedit.c:994 #, c-format msgid "update of trustdb failed: %s\n" msgstr "Änderung der \"Trust-DB\" fehlgeschlagen: %s\n" -#: g10/keyedit.c:824 g10/keyedit.c:845 +#: g10/keyedit.c:823 g10/keyedit.c:844 msgid "You must select at least one user ID.\n" msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n" -#: g10/keyedit.c:826 +#: g10/keyedit.c:825 msgid "You can't delete the last user ID!\n" msgstr "Die letzte User-ID kann nicht gelöscht werden!\n" -#: g10/keyedit.c:829 +#: g10/keyedit.c:828 msgid "Really remove all selected user IDs? " msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? " -#: g10/keyedit.c:830 +#: g10/keyedit.c:829 msgid "Really remove this user ID? " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:866 g10/keyedit.c:888 +#: g10/keyedit.c:865 g10/keyedit.c:887 msgid "You must select at least one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:870 +#: g10/keyedit.c:869 msgid "Do you really want to delete the selected keys? " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? " -#: g10/keyedit.c:871 +#: g10/keyedit.c:870 msgid "Do you really want to delete this key? " msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? " -#: g10/keyedit.c:892 +#: g10/keyedit.c:891 msgid "Do you really want to revoke the selected keys? " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? " -#: g10/keyedit.c:893 +#: g10/keyedit.c:892 msgid "Do you really want to revoke this key? " msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? " -#: g10/keyedit.c:959 +#: g10/keyedit.c:958 msgid "Save changes? " msgstr "Änderungen speichern? " -#: g10/keyedit.c:962 +#: g10/keyedit.c:961 msgid "Quit without saving? " msgstr "Beenden ohne zu speichern? " -#: g10/keyedit.c:973 +#: g10/keyedit.c:972 #, c-format msgid "update failed: %s\n" msgstr "Änderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:980 +#: g10/keyedit.c:979 #, c-format msgid "update secret failed: %s\n" msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:987 +#: g10/keyedit.c:986 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:1002 +#: g10/keyedit.c:1001 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/keyedit.c:1082 g10/keyedit.c:1108 +#: g10/keyedit.c:1081 g10/keyedit.c:1107 #, 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:1091 +#: g10/keyedit.c:1090 #, c-format msgid " trust: %c/%c" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:1095 +#: g10/keyedit.c:1094 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:1124 +#: g10/keyedit.c:1123 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! Unterschlüssel wurde widerrufen: %s\n" -#: g10/keyedit.c:1127 +#: g10/keyedit.c:1126 msgid "rev- faked revocation found\n" msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n" -#: g10/keyedit.c:1129 +#: g10/keyedit.c:1128 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n" -#: g10/keyedit.c:1367 +#: g10/keyedit.c:1366 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:1371 +#: g10/keyedit.c:1370 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:1375 +#: g10/keyedit.c:1374 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:1381 +#: g10/keyedit.c:1380 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:1395 +#: g10/keyedit.c:1394 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:1396 +#: g10/keyedit.c:1395 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:1399 +#: g10/keyedit.c:1398 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:1468 +#: g10/keyedit.c:1467 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:1474 +#: g10/keyedit.c:1473 msgid "Please select at most one secondary key.\n" msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n" -#: g10/keyedit.c:1478 +#: g10/keyedit.c:1477 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1479 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:1522 +#: g10/keyedit.c:1521 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:1538 +#: g10/keyedit.c:1537 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:1599 +#: g10/keyedit.c:1598 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:1645 +#: g10/keyedit.c:1644 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/keyedit.c:1743 +#: g10/keyedit.c:1742 msgid "user ID: \"" msgstr "User-ID: \"" -#: g10/keyedit.c:1746 +#: g10/keyedit.c:1745 #, c-format msgid "" "\"\n" @@ -2558,34 +2547,34 @@ msgstr "" "\"\n" "unterschrieben mit Ihrem Schlüssel %08lX um %s\n" -#: g10/keyedit.c:1750 +#: g10/keyedit.c:1749 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:1774 +#: g10/keyedit.c:1773 msgid "You have signed these user IDs:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/keyedit.c:1788 g10/keyedit.c:1823 +#: g10/keyedit.c:1787 g10/keyedit.c:1822 #, c-format msgid " signed by %08lX at %s\n" msgstr " beglaubigt durch %08lX um %s\n" -#: g10/keyedit.c:1793 +#: g10/keyedit.c:1792 #, c-format msgid " revoked by %08lX at %s\n" msgstr " widerrufen durch %08lX um %s\n" -#: g10/keyedit.c:1813 +#: g10/keyedit.c:1812 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:1831 +#: g10/keyedit.c:1830 msgid "Really create the revocation certificates? (y/N)" msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:1860 +#: g10/keyedit.c:1859 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" @@ -2598,132 +2587,132 @@ msgid "revoked" msgstr "widerrufen" #. of subkey -#: g10/keylist.c:402 g10/mainproc.c:837 +#: g10/keylist.c:404 g10/mainproc.c:836 #, c-format msgid " [expires: %s]" msgstr " [verfällt: %s]" -#: g10/mainproc.c:271 +#: g10/mainproc.c:270 #, c-format msgid "public key is %08lX\n" msgstr "Öffentlicher Schlüssel ist %08lX\n" -#: g10/mainproc.c:316 +#: g10/mainproc.c:315 msgid "public key encrypted data: good DEK\n" msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n" -#: g10/mainproc.c:368 +#: g10/mainproc.c:367 #, c-format msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( # [kw] -#: g10/mainproc.c:378 +#: g10/mainproc.c:377 #, c-format msgid "encrypted with %s key, ID %08lX\n" msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n" -#: g10/mainproc.c:392 +#: g10/mainproc.c:391 #, c-format msgid "public key decryption failed: %s\n" msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n" -#: g10/mainproc.c:432 +#: g10/mainproc.c:431 msgid "decryption okay\n" msgstr "Enschlüsselung fehlgeschlagen: %s\n" -#: g10/mainproc.c:437 +#: g10/mainproc.c:436 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n" -#: g10/mainproc.c:442 +#: g10/mainproc.c:441 #, c-format msgid "decryption failed: %s\n" msgstr "Enschlüsselung fehlgeschlagen: %s\n" -#: g10/mainproc.c:461 +#: g10/mainproc.c:460 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "" "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n" -#: g10/mainproc.c:463 +#: g10/mainproc.c:462 #, c-format msgid "original file name='%.*s'\n" msgstr "Ursprünglicher Dateiname='%.*s'\n" -#: g10/mainproc.c:618 +#: g10/mainproc.c:617 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n" -#: g10/mainproc.c:705 g10/mainproc.c:714 +#: g10/mainproc.c:704 g10/mainproc.c:713 msgid "WARNING: invalid notation data found\n" msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n" -#: g10/mainproc.c:717 +#: g10/mainproc.c:716 msgid "Notation: " msgstr "\"Notation\": " -#: g10/mainproc.c:726 +#: g10/mainproc.c:725 msgid "Policy: " msgstr "Richtlinie: " -#: g10/mainproc.c:1177 +#: g10/mainproc.c:1235 msgid "signature verification suppressed\n" msgstr "Unterschriften-Überprüfung unterdrückt\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( -#: g10/mainproc.c:1214 +#: g10/mainproc.c:1272 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n" #. just in case that we have no userid -#: g10/mainproc.c:1242 g10/mainproc.c:1250 +#: g10/mainproc.c:1307 g10/mainproc.c:1318 msgid "BAD signature from \"" msgstr "FALSCHE Unterschrift von \"" -#: g10/mainproc.c:1243 g10/mainproc.c:1251 +#: g10/mainproc.c:1308 g10/mainproc.c:1319 msgid "Good signature from \"" msgstr "Korrekte Unterschrift von \"" -#: g10/mainproc.c:1266 +#: g10/mainproc.c:1310 msgid " aka \"" msgstr " alias \"" -#: g10/mainproc.c:1316 +#: g10/mainproc.c:1366 #, c-format msgid "Can't check signature: %s\n" msgstr "Unterschrift kann nicht geprüft werden: %s\n" -#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450 +#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500 msgid "not a detached signature\n" msgstr "keine abgetrennte Unterschrift\n" -#: g10/mainproc.c:1399 +#: g10/mainproc.c:1449 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "Einzelne Unterschrift der Klasse 0x%02x\n" -#: g10/mainproc.c:1454 +#: g10/mainproc.c:1504 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:1459 +#: g10/mainproc.c:1509 msgid "invalid root packet detected in proc_tree()\n" msgstr "ungültiges root-Paket in proc_tree() entdeckt\n" -#: g10/misc.c:98 +#: g10/misc.c:97 #, c-format msgid "can't disable core dumps: %s\n" msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n" -#: g10/misc.c:208 +#: g10/misc.c:207 msgid "Experimental algorithms should not be used!\n" msgstr "Experimentiermethoden sollten nicht benutzt werden!\n" -#: g10/misc.c:238 +#: g10/misc.c:237 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n" msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n" @@ -2732,7 +2721,7 @@ msgstr "Es ist davon abzuraten, diese Verschl msgid "can't handle public key algorithm %d\n" msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" -#: g10/parse-packet.c:1010 +#: g10/parse-packet.c:998 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" @@ -2745,7 +2734,7 @@ msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n" msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n" -#: g10/hkp.c:147 g10/passphrase.c:248 +#: g10/hkp.c:170 g10/passphrase.c:248 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" @@ -2872,36 +2861,36 @@ msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl msgid "NOTE: secret key %08lX expired at %s\n" msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n" -#: g10/hkp.c:59 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s ...\n" msgstr "Schlüssel %08lX von %s wird angefordert ...\n" -#: g10/hkp.c:72 +#: g10/hkp.c:85 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "Schlüssel ist beim Schlüsselserver nicht erhältlich: %s\n" -#: g10/hkp.c:91 g10/hkp.c:125 +#: g10/hkp.c:109 g10/hkp.c:148 msgid "no keyserver known (use option --keyserver)\n" msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n" -#: g10/hkp.c:99 +#: g10/hkp.c:117 #, c-format msgid "%s: not a valid key ID\n" msgstr "%s: Dies ist keine gültige Schlüssel-ID\n" -#: g10/hkp.c:171 +#: g10/hkp.c:194 #, c-format msgid "error sending to `%s': %s\n" msgstr "Fehler beim Senden an `%s': %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:206 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "Senden an `%s' erfolgreich (status=%u)\n" -#: g10/hkp.c:186 +#: g10/hkp.c:209 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Senden an `%s' erfolglos (status=%u)\n" @@ -3434,46 +3423,36 @@ msgstr "%s: Schl msgid "%s: keyring created\n" msgstr "%s: Schlüsselbund erstellt\n" -#: g10/ringedit.c:1555 +#: g10/ringedit.c:1551 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n" -#: g10/ringedit.c:1556 +#: g10/ringedit.c:1552 #, c-format msgid "%s is the unchanged one\n" msgstr "%s ist der Unveränderte\n" -#: g10/ringedit.c:1557 +#: g10/ringedit.c:1553 #, c-format msgid "%s is the new one\n" msgstr "%s ist der Neue\n" -#: g10/ringedit.c:1558 +#: g10/ringedit.c:1554 msgid "Please fix this possible security flaw\n" msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n" -#: g10/skclist.c:110 g10/skclist.c:166 +#: g10/skclist.c:88 g10/skclist.c:125 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n" "echten Zufallsgenerator verwendbar\n" -#: g10/skclist.c:138 -#, fuzzy, c-format -msgid "skipped `%s': duplicated\n" -msgstr "übersprungen '%s': %s\n" - -#: g10/skclist.c:145 g10/skclist.c:153 +#: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" msgstr "übersprungen '%s': %s\n" -#: g10/skclist.c:149 -#, fuzzy -msgid "skipped: secret key already present\n" -msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n" - -#: g10/skclist.c:160 +#: g10/skclist.c:119 #, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " diff --git a/tools/ChangeLog b/tools/ChangeLog index 2bd21e350..afb0f57dd 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2001-03-21 Werner Koch + + * shmtest.c: Add sys/types.h + Fri Sep 15 18:40:36 CEST 2000 Werner Koch * ring-a-party: An array start at offset 1 no 0. Many thanks to Mike diff --git a/tools/shmtest.c b/tools/shmtest.c index 1cfb9b4ed..9791dcd0c 100644 --- a/tools/shmtest.c +++ b/tools/shmtest.c @@ -10,6 +10,7 @@ #include #include #ifdef HAVE_SYS_IPC_H + #include #include #endif #ifdef HAVE_SYS_SHM_H diff --git a/util/iobuf.c b/util/iobuf.c index 67e44de9f..471653877 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -1,5 +1,5 @@ /* iobuf.c - file handling - * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. * * This file is part of GnuPG. *