diff --git a/AUTHORS b/AUTHORS index 5b125d900..8a4fb949f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -55,6 +55,11 @@ pt_BR.po Other notes: ============ +This program uses the zlib compression library written by +Jean-loup Gailly and Mark Adler. + +Most of the stuff in mpi has been taken from the GMP library. + The file cipher/rndunix.c is heavily based on Peter Gutmann's rndunix.c from cryptlib. - He promised to add the GPL as an alternative license to this and some other files. We don't have a dissclaimer for diff --git a/ChangeLog b/ChangeLog index 467fe8b64..1498fc57e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 10 20:15:36 CET 1998 Werner Koch + + * acinclude.m (GNUPG_CHECK_PIC): New + * configure.in, acinclude.m4: Renamed all WK_ to GNUPG_ + Tue Dec 8 15:09:29 CET 1998 Werner Koch * VERSION: Set to 0.4.5 diff --git a/NEWS b/NEWS index fadec9ba3..8c069ba6a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ + + * --export does now only exports rfc2440 compatible keys; the + old behavious is available with --export-all. + Generation of v3 ElGamal (sign and encrypt) keys is not longer + supported. + + * Fixed the uncompress bug. + + Noteworthy changes in version 0.4.5 ----------------------------------- diff --git a/THANKS b/THANKS index 386b53dc4..8d5ab857c 100644 --- a/THANKS +++ b/THANKS @@ -50,6 +50,7 @@ Michael Sobolev mss@despair.transas.com Nicolas Graner Nicolas.Graner@cri.u-psud.fr Niklas Hernaeus [Please don't spam him] Nimrod Zimerman zimerman@forfree.at +N J Doye nic@niss.ac.uk Oskari Jääskeläinen f33003a@cc.hut.fi Paul D. Smith psmith@baynetworks.com Peter Gutmann pgut001@cs.auckland.ac.nz diff --git a/TODO b/TODO index 6d09dca73..454384600 100644 --- a/TODO +++ b/TODO @@ -11,20 +11,11 @@ a next pointer ro more records - check wehther the reuse code really works. Maybe this is the reason for the "Hmmm public key lost" - * use zlib 1.1.13 to avoid a bug with 13 bit windows - but there are more problems with large files - - * FreeBSD: - #define USE_DYNAMIC_LINKING - #define HAVE_DL_DLOPEN - and the ld option -export-dynamic. - Why does autoconf not figure that out? - * clearsig: keep lineendings as they are. Remember that trailings blanks are not hashed. * OpenBSD: dynamic loading with dlopen works on OpenBSD, but: - OpenBSD binaries are a.out, so every symbol begins with "_" + OpenBSD binaries are a.out, so every symbol begins with "_" * should we flush the getkey.c caches while doing an import? @@ -40,8 +31,6 @@ * new menu to delete signatures and list signature in menu - * -rdynamic auf Solaris Problem - * Replace the SIGUSR1 stuff by semaphores to avoid loss of a signal. * add test cases for invalid data (scrambled armor or other random data) @@ -66,3 +55,9 @@ * Use "user ID", "trustdb", "NOTE" and "WARNING". + * Replace Blowfish by Twofish + + * Print a warning when a experimental algorithm is used. + + * Remove ElGamal signatures. + diff --git a/acinclude.m4 b/acinclude.m4 index bb8700f51..13eff5fa9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,41 +1,41 @@ dnl macros to configure g10 -dnl WK_MSG_PRINT(STRING) +dnl GNUPG_MSG_PRINT(STRING) dnl print a message dnl -define(WK_MSG_PRINT, +define(GNUPG_MSG_PRINT, [ echo $ac_n "$1"" $ac_c" 1>&AC_FD_MSG ]) -dnl WK_CHECK_TYPEDEF(TYPE, HAVE_NAME) +dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) dnl Check whether a typedef exists and create a #define $2 if it exists dnl -AC_DEFUN(WK_CHECK_TYPEDEF, +AC_DEFUN(GNUPG_CHECK_TYPEDEF, [ AC_MSG_CHECKING(for $1 typedef) - AC_CACHE_VAL(wk_cv_typedef_$1, + AC_CACHE_VAL(gnupg_cv_typedef_$1, [AC_TRY_COMPILE([#include #include ], [ #undef $1 int a = sizeof($1); - ], wk_cv_typedef_$1=yes, wk_cv_typedef_$1=no )]) - AC_MSG_RESULT($wk_cv_typedef_$1) - if test "$wk_cv_typedef_$1" = yes; then + ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )]) + AC_MSG_RESULT($gnupg_cv_typedef_$1) + if test "$gnupg_cv_typedef_$1" = yes; then AC_DEFINE($2) fi ]) -dnl WK_LINK_FILES( SRC, DEST ) +dnl GNUPG_LINK_FILES( SRC, DEST ) dnl same as AC_LINK_FILES, but collect the files to link in dnl some special variables and do the link -dnl when WK_DO_LINK_FILES is called +dnl when GNUPG_DO_LINK_FILES is called dnl This is a workaround for AC_LINK_FILES, because it does not work dnl correct when using a caching scheme dnl -define(WK_LINK_FILES, +define(GNUPG_LINK_FILES, [ if test "x$wk_link_files_src" = "x"; then wk_link_files_src="$1" wk_link_files_dst="$2" @@ -44,21 +44,21 @@ define(WK_LINK_FILES, wk_link_files_dst="$wk_link_files_dst $2" fi ]) -define(WK_DO_LINK_FILES, +define(GNUPG_DO_LINK_FILES, [ AC_LINK_FILES( $wk_link_files_src, $wk_link_files_dst ) ]) -dnl WK_CHECK_ENDIAN +dnl GNUPG_CHECK_ENDIAN dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST dnl -define(WK_CHECK_ENDIAN, +define(GNUPG_CHECK_ENDIAN, [ if test "$cross_compiling" = yes; then AC_MSG_WARN(cross compiling; assuming little endianess) fi AC_MSG_CHECKING(endianess) - AC_CACHE_VAL(wk_cv_c_endian, - [ wk_cv_c_endian=unknown + AC_CACHE_VAL(gnupg_cv_c_endian, + [ gnupg_cv_c_endian=unknown # See if sys/param.h defines the BYTE_ORDER macro. AC_TRY_COMPILE([#include #include ], [ @@ -69,8 +69,8 @@ define(WK_CHECK_ENDIAN, #include ], [ #if BYTE_ORDER != BIG_ENDIAN not big endian - #endif], wk_cv_c_endian=big, wk_cv_c_endian=little)]) - if test "$wk_cv_c_endian" = unknown; then + #endif], gnupg_cv_c_endian=big, gnupg_cv_c_endian=little)]) + if test "$gnupg_cv_c_endian" = unknown; then AC_TRY_RUN([main () { /* Are we little or big endian? From Harbison&Steele. */ union @@ -81,27 +81,27 @@ define(WK_CHECK_ENDIAN, u.l = 1; exit (u.c[sizeof (long) - 1] == 1); }], - wk_cv_c_endian=little, - wk_cv_c_endian=big, - wk_cv_c_endian=little + gnupg_cv_c_endian=little, + gnupg_cv_c_endian=big, + gnupg_cv_c_endian=little ) fi ]) - AC_MSG_RESULT([$wk_cv_c_endian]) - if test "$wk_cv_c_endian" = little; then + AC_MSG_RESULT([$gnupg_cv_c_endian]) + if test "$gnupg_cv_c_endian" = little; then AC_DEFINE(LITTLE_ENDIAN_HOST) else AC_DEFINE(BIG_ENDIAN_HOST) fi ]) -dnl WK_CHECK_CACHE +dnl GNUPG_CHECK_CACHE dnl -define(WK_CHECK_CACHE, +define(GNUPG_CHECK_CACHE, [ AC_MSG_CHECKING(cached information) - wk_hostcheck="$target" - AC_CACHE_VAL(wk_cv_hostcheck, [ wk_cv_hostcheck="$wk_hostcheck" ]) - if test "$wk_cv_hostcheck" != "$wk_hostcheck"; then + gnupg_hostcheck="$target" + AC_CACHE_VAL(gnupg_cv_hostcheck, [ gnupg_cv_hostcheck="$gnupg_hostcheck" ]) + if test "$gnupg_cv_hostcheck" != "$gnupg_hostcheck"; then AC_MSG_RESULT(changed) AC_MSG_WARN(config.cache exists!) AC_MSG_ERROR(you must do 'make distclean' first to compile for @@ -112,65 +112,138 @@ define(WK_CHECK_CACHE, ]) - - ###################################################################### -# Check for SysV IPC (from GIMP) -# And see whether we have a SHM_LOCK (FreeBSD does not have it). +# Check for -fPIC etc (taken from libtool) +# This sets CFLAGS_PIC to the required flags +# NO_PIC to yes if it is not possible to +# generate PIC ###################################################################### -dnl WK_CHECK_IPC +dnl GNUPG_CHECK_PIC dnl -define(WK_CHECK_IPC, - [ AC_CHECK_HEADERS(sys/ipc.h sys/shm.h) - if test "$ac_cv_header_sys_shm_h" = "yes"; then - AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches) - AC_TRY_RUN([ - #include - #include - #include - int main() - { - int id; - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777); - if (id == -1) - exit (2); - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); - exit (1); - } - shmdt (shmaddr); - shmdt (shmaddr); - exit (0); - } - ], - AC_DEFINE(IPC_RMID_DEFERRED_RELEASE) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no), - AC_MSG_RESULT(assuming no)) - AC_MSG_CHECKING(whether SHM_LOCK is available) - AC_TRY_COMPILE([#include - #include - #include ],[ - int foo( int shm_id ) { shmctl(shm_id, SHM_LOCK, 0); } - ], - AC_DEFINE(IPC_HAVE_SHM_LOCK) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) +define(GNUPG_CHECK_PIC, + [ AC_MSG_CHECKING(for option to create PIC) + CFLAGS_PIC= + NO_PIC=no + if test "$cross_compiling" = yes; then + AC_MSG_RESULT(assume none) + else + if test "$GCC" = yes; then + CFLAGS_PIC="-fPIC" + else + case "$host_os" in + aix3* | aix4*) + # All rs/6000 code is PIC + # but is there any non-rs/6000 AIX platform? + ;; + + hpux9* | hpux10*) + CFLAGS_PIC="+Z" + ;; + + irix5* | irix6*) + # PIC (with -KPIC) is the default. + ;; + + osf3* | osf4*) + # FIXME - pic_flag is probably required for + # hppa*-osf* and i860-osf* + ;; + + sco3.2v5*) + CFLAGS_PIC='-Kpic' + ;; + + solaris2* | solaris7* ) + CFLAGS_PIC='-KPIC' + ;; + + sunos4*) + CFLAGS_PIC='-PIC' + ;; + + *) + NO_PIC=yes + ;; + esac + fi + + case "$host_cpu" in + rs6000 | powerpc | powerpcle) + # Yippee! All RS/6000 and PowerPC code is position-independent. + CFLAGS_PIC="" + ;; + esac + + if test "$NO_PIC" = yes; then + AC_MSG_RESULT(not possible) + else + if test -z "$CFLAGS_PIC"; then + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($CFLAGS_PIC) + fi + fi fi ]) +##################################################################### +# Check for SysV IPC (from GIMP) +# And see whether we have a SHM_LOCK (FreeBSD does not have it). +##################################################################### +dnl GNUPG_CHECK_IPC +dnl +define(GNUPG_CHECK_IPC, + [ AC_CHECK_HEADERS(sys/ipc.h sys/shm.h) + if test "$ac_cv_header_sys_shm_h" = "yes"; then + AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches) + AC_TRY_RUN([ + #include + #include + #include + int main() + { + int id; + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777); + if (id == -1) + exit (2); + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); + exit (1); + } + shmdt (shmaddr); + shmdt (shmaddr); + exit (0); + } + ], + AC_DEFINE(IPC_RMID_DEFERRED_RELEASE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no), + AC_MSG_RESULT(assuming no)) + AC_MSG_CHECKING(whether SHM_LOCK is available) + AC_TRY_COMPILE([#include + #include + #include ],[ + int foo( int shm_id ) { shmctl(shm_id, SHM_LOCK, 0); } + ], + AC_DEFINE(IPC_HAVE_SHM_LOCK) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + fi + ]) + + ###################################################################### # Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock # is not called from uid 0 (not tested whether uid 0 works) ###################################################################### -dnl WK_CHECK_MLOCK +dnl GNUPG_CHECK_MLOCK dnl -define(WK_CHECK_MLOCK, +define(GNUPG_CHECK_MLOCK, [ AC_CHECK_FUNCS(mlock) if test "$ac_cv_func_mlock" = "yes"; then AC_MSG_CHECKING(whether mlock is broken) @@ -533,3 +606,4 @@ strdup __argz_count __argz_stringify __argz_next]) < $srcdir/po/POTFILES.in > po/POTFILES ]) +dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/checks/genkey1024.test b/checks/genkey1024.test index b67626da7..e613160f5 100755 --- a/checks/genkey1024.test +++ b/checks/genkey1024.test @@ -13,18 +13,16 @@ fi LANG= LANGUAGE= - expect - < + + * dynload.c (load_extension): increased needed verbosity level. + + * random.c (fast_random_poll): Fallback to a default fast random + poll function. + (read_random_source): Always use the faked entroy gatherer if no + gather module is available. + * rndlinux.c (fast_poll): Removed. + * rndunix.c (fast_poll): Removed. + + Wed Nov 25 12:33:41 1998 Werner Koch (wk@isil.d.shuttle.de) * rand-*.c: Removed. diff --git a/cipher/dynload.c b/cipher/dynload.c index 7278928f1..204f186b0 100644 --- a/cipher/dynload.c +++ b/cipher/dynload.c @@ -231,7 +231,7 @@ load_extension( EXTLIST el ) name = (char**)addr; #endif - if( g10_opt_verbose ) + if( g10_opt_verbose > 1 ) log_info("%s: %s%s%s%s\n", el->name, *name, el->hintstr? " (":"", el->hintstr? el->hintstr:"", @@ -262,7 +262,7 @@ load_extension( EXTLIST el ) #endif #ifdef HAVE_DL_DLOPEN - if( g10_opt_verbose > 1 ) { + if( g10_opt_verbose > 2 ) { /* list the contents of the module */ while( (sym = (*el->enumfunc)(0, &seq, &class, &vers)) ) { if( vers != 1 ) { diff --git a/cipher/random.c b/cipher/random.c index e173a5279..32415bd0b 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -32,6 +32,18 @@ #include #include #include +#include +#include +#include +#ifdef HAVE_GETHRTIME + #include +#endif +#ifdef HAVE_GETTIMEOFDAY + #include +#endif +#ifdef HAVE_GETRUSAGE + #include +#endif #include "util.h" #include "rmd.h" #include "ttyio.h" @@ -83,9 +95,7 @@ static void read_pool( byte *buffer, size_t length, int level ); static void add_randomness( const void *buffer, size_t length, int source ); static void random_poll(void); static void read_random_source( byte *buffer, size_t length, int level ); -#ifndef HAVE_DEV_RANDOM static int gather_faked( byte *buffer, size_t *r_length, int level ); -#endif static void @@ -329,11 +339,39 @@ fast_random_poll() initialize(); initialized = 1; fnc = dynload_getfnc_fast_random_poll(); - if( !fnc ) - log_info("Ooops: No fast random poll function\n"); } - if( fnc ) + if( fnc ) { (*fnc)( add_randomness ); + return; + } + + /* fall back to the generic function */ + #if HAVE_GETHRTIME + { hrtime_t tv; + tv = gethrtime(); + add_randomness( &tv, sizeof(tv), 1 ); + } + #elif 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 ); + } + #else /* use times */ + { struct tms buf; + times( &buf ); + add_randomness( &buf, sizeof buf, 1 ); + } + #endif + #ifdef HAVE_GETRUSAGE + { struct rusage buf; + if( getrusage( RUSAGE_SELF, &buf ) ) + BUG(); + add_randomness( &buf, sizeof buf, 1 ); + memset( &buf, 0, sizeof buf ); + } + #endif } @@ -351,11 +389,7 @@ read_random_source( byte *buffer, size_t length, int level ) fnc = dynload_getfnc_gather_random(); if( !fnc ) { faked_rng = 1; - #ifndef HAVE_DEV_RANDOM fnc = gather_faked; - #else - BUG(); - #endif } } while( length ) { @@ -368,7 +402,6 @@ read_random_source( byte *buffer, size_t length, int level ) } -#ifndef HAVE_DEV_RANDOM static int gather_faked( byte *buffer, size_t *r_length, int level ) { @@ -378,7 +411,7 @@ gather_faked( byte *buffer, size_t *r_length, int level ) if( !initialized ) { log_info(_("WARNING: using insecure random number generator!!\n")); tty_printf(_("The random number generator is only a kludge to let\n" - "it compile - it is in no way a strong RNG!\n\n" + "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 @@ -398,5 +431,3 @@ gather_faked( byte *buffer, size_t *r_length, int level ) return 100; /* We really fake it ;-) */ } -#endif /* ! HAVE_DEV_RANDOM */ - diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c index 69af64f5d..3d0ac1b58 100644 --- a/cipher/rndlinux.c +++ b/cipher/rndlinux.c @@ -27,15 +27,9 @@ #include #include #include -#ifdef HAVE_GETHRTIME - #include -#endif #ifdef HAVE_GETTIMEOFDAY #include #endif -#ifdef HAVE_GETRUSAGE - #include -#endif #include #include #include @@ -61,38 +55,6 @@ static void tty_printf(const char *fmt, ... ) #endif -static void -fast_poll( void (*add)(const void*, size_t, int) ) -{ - #if HAVE_GETHRTIME - { hrtime_t tv; - tv = gethrtime(); - (*add)( &tv, sizeof(tv), 1 ); - } - #elif HAVE_GETTIMEOFDAY - { struct timeval tv; - if( gettimeofday( &tv, NULL ) ) - BUG(); - (*add)( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); - (*add)( &tv.tv_usec, sizeof(tv.tv_usec), 1 ); - } - #else /* use times */ - { struct tms buf; - times( &buf ); - (*add)( &buf, sizeof buf, 1 ); - } - #endif - #ifdef HAVE_GETRUSAGE - { struct rusage buf; - if( getrusage( RUSAGE_SELF, &buf ) ) - BUG(); - (*add)( &buf, sizeof buf, 1 ); - memset( &buf, 0, sizeof buf ); - } - #endif -} - - /**************** * Used to open the Linux and xBSD /dev/random devices @@ -192,7 +154,6 @@ static struct { void *func; } func_table[] = { { 40, 1, gather_random }, - { 41, 1, fast_poll }, }; diff --git a/cipher/rndunix.c b/cipher/rndunix.c index 530971723..3eca9df81 100644 --- a/cipher/rndunix.c +++ b/cipher/rndunix.c @@ -617,38 +617,6 @@ slowPoll(void) } -static void -fast_poll( void (*add)(const void*, size_t, int) ) -{ - #if HAVE_GETHRTIME - { hrtime_t tv; - tv = gethrtime(); - (*add)( &tv, sizeof(tv), 1 ); - } - #elif HAVE_GETTIMEOFDAY - { struct timeval tv; - if( gettimeofday( &tv, NULL ) ) - BUG(); - (*add)( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); - (*add)( &tv.tv_usec, sizeof(tv.tv_usec), 1 ); - } - #else /* use times */ - { struct tms buf; - times( &buf ); - (*add)( &buf, sizeof buf, 1 ); - } - #endif - #ifdef HAVE_GETRUSAGE - { struct rusage buf; - if( getrusage( RUSAGE_SELF, &buf ) ) - BUG(); - (*add)( &buf, sizeof buf, 1 ); - memset( &buf, 0, sizeof buf ); - } - #endif -} - - static int gather_random( byte *buffer, size_t *r_length, int level ) @@ -698,7 +666,6 @@ static struct { void *func; } func_table[] = { { 40, 1, gather_random }, - { 41, 1, fast_poll }, }; /**************** diff --git a/configure.in b/configure.in index 096d1ce6d..374e57102 100644 --- a/configure.in +++ b/configure.in @@ -55,9 +55,13 @@ else fi if test "$use_m_guard" = yes ; then AC_DEFINE(M_GUARD) - CFLAGS="$CFLAGS -g -Wall" + CFLAGS="$CFLAGS -g" else - CFLAGS="$CFLAGS -O2 -Wall" + CFLAGS="$CFLAGS -O2" +fi + +if test "$GCC" = yes; then + CFLAGS="$CFLAGS -Wall" fi @@ -87,7 +91,6 @@ AC_PROG_INSTALL AM_CYGWIN32 - case "${target}" in i386--mingw32) # special stuff for Windoze NT @@ -108,6 +111,13 @@ case "${target}" in ;; esac + +GNUPG_CHECK_PIC +if test "$NO_PIC" = yes; then + try_dynload=no +fi + + case "${target}" in i386--mingw32) PRINTABLE_OS_NAME="MingW32" @@ -131,7 +141,7 @@ case "${target}" in *) NAME_OF_DEV_RANDOM="/dev/random" NAME_OF_DEV_URANDOM="/dev/urandom" - DYNLINK_MOD_CFLAGS="-shared -fPIC -lc" + DYNLINK_MOD_CFLAGS="-shared $CFLAGS_PIC -lc" ;; esac AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM") @@ -144,19 +154,20 @@ AM_GNU_GETTEXT AC_CHECK_LIB(gdbm,gdbm_firstkey) + if test "$try_dynload" = yes ; then AC_CHECK_LIB(dl,dlopen) if test "$ac_cv_lib_dl_dlopen" = "yes"; then AC_DEFINE(USE_DYNAMIC_LINKING) AC_DEFINE(HAVE_DL_DLOPEN) - DYNLINK_LDFLAGS=-rdynamic + DYNLINK_LDFLAGS="-Wl,-export-dynamic" use_gnupg_extensions=yes else AC_CHECK_LIB(dld,dld_link) if test "$ac_cv_lib_dld_dld_link" = "yes"; then AC_DEFINE(USE_DYNAMIC_LINKING) AC_DEFINE(HAVE_DLD_DLD_LINK) - DYNLINK_LDFLAGS=-rdynamic + DYNLINK_LDFLAGS="-Wl,-export-dynamic" use_gnupg_extensions=yes fi fi @@ -185,14 +196,14 @@ AC_TYPE_SIZE_T AC_TYPE_SIGNAL AC_DECL_SYS_SIGLIST -WK_CHECK_ENDIAN +GNUPG_CHECK_ENDIAN -WK_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) -WK_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF) -WK_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) -WK_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) -WK_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) +GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) +GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF) +GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) +GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) +GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) AC_CHECK_SIZEOF(unsigned short, 2) AC_CHECK_SIZEOF(unsigned int, 4) @@ -212,9 +223,9 @@ AC_CHECK_FUNCS(strerror stpcpy strlwr tcgetattr rand strtoul mmap) AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit) AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime) -WK_CHECK_MLOCK +GNUPG_CHECK_MLOCK -WK_CHECK_IPC +GNUPG_CHECK_IPC if test "$ac_cv_header_sys_shm_h" = "yes"; then AC_DEFINE(USE_SHM_COPROCESSING) fi @@ -239,7 +250,7 @@ dnl setup assembler stuff AC_MSG_CHECKING(for mpi assembler functions) if test -f $srcdir/mpi/config.links ; then . $srcdir/mpi/config.links - WK_LINK_FILES($mpi_ln_src, $mpi_ln_dst) + GNUPG_LINK_FILES($mpi_ln_src, $mpi_ln_dst) ac_cv_mpi_extra_asm_modules="$mpi_extra_modules" ac_cv_mpi_sflags="$mpi_sflags" ac_cv_mpi_config_done="yes" @@ -250,9 +261,9 @@ else fi MPI_EXTRA_ASM_OBJS="" if test "$ac_cv_mpi_extra_asm_modules" != ""; then -WK_MSG_PRINT([mpi extra asm functions:]) +GNUPG_MSG_PRINT([mpi extra asm functions:]) for i in $ac_cv_mpi_extra_asm_modules; do - WK_MSG_PRINT([$i]) + GNUPG_MSG_PRINT([$i]) MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o" done AC_MSG_RESULT() @@ -266,8 +277,8 @@ dnl when compiling a conftest (due to the "-lz" from LIBS). if test "$g10_force_zlib" = "yes"; then ZLIBS="../zlib/libzlib.a" AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) - WK_LINK_FILES(zlib/zlib.h, zlib.h ) - WK_LINK_FILES(zlib/zconf.h, zconf.h ) + GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) + GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) else AC_CHECK_HEADERS(zlib.h) if test "$ac_cv_header_zlib_h" = yes ; then @@ -277,13 +288,13 @@ if test "$ac_cv_header_zlib_h" = yes ; then else ZLIBS="../zlib/libzlib.a" AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) - WK_LINK_FILES(zlib/zlib.h, zlib.h ) - WK_LINK_FILES(zlib/zconf.h, zconf.h ) + GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) + GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) fi fi AC_SUBST(ZLIBS) -WK_DO_LINK_FILES +GNUPG_DO_LINK_FILES AC_OUTPUT([ diff --git a/g10/ChangeLog b/g10/ChangeLog index bbebbd920..2a7186cd0 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,35 @@ +Thu Dec 10 20:15:36 CET 1998 Werner Koch + + * ringedit.c (gdbm_store): Fix for inserts + + * g10.c (main): New option --export-all + * export.c (export_pubkeys): New arg. + (do_export): Now may skip old keys. + + * status.c: Minor patches for Sun's cc + + * keygen.c (ask_algo): Disabled v3 ElGamal choice, rearranged + the numbers. Add a warning question when a sign+encrypt key + is selected. + + * g10.c (do_not_use_RSA): Removed. + * misc.c (print_pubkey_algo_note): New as replacement for the + do_not_use_RSA() and chnaged all callers. + (print_cipher_algo_note): New. + (print_hash_algo_note): New. + + * cipher.c (write_header): Add a call to print_cipher_algo_note. + * seckey-cert.c (protect_secret_key): Ditto + * sign.c (do_sign): Add a call to print_digest_algo_note. + + * getkey.c (get_long_user_id_string): New. + * mainproc.c (check_sig_and_print): Changed the format of the + status output. + + * encrypt.c (write_pubkey_enc_from_list): print used symmetric cipher. + + * pkclist.c (do_we_trust): Changed a message. + Wed Dec 9 13:41:06 CET 1998 Werner Koch * misc.c (trap_unaligned) [ALPHA]: Only if UAC_SIGBUS is defined. diff --git a/g10/cipher.c b/g10/cipher.c index 4c4e85f78..4664a4a83 100644 --- a/g10/cipher.c +++ b/g10/cipher.c @@ -59,6 +59,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a ) randomize_buffer( temp, blocksize, 1 ); temp[blocksize] = temp[blocksize-2]; temp[blocksize+1] = temp[blocksize-1]; + print_cipher_algo_note( cfx->dek->algo ); cfx->cipher_hd = cipher_open( cfx->dek->algo, CIPHER_MODE_AUTO_CFB, 1 ); cipher_setkey( cfx->cipher_hd, cfx->dek->key, cfx->dek->keylen ); cipher_setiv( cfx->cipher_hd, NULL ); diff --git a/g10/encode.c b/g10/encode.c index b0cdd7e6a..8245dd02e 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -379,8 +379,8 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out ) MPI frame; pk = pk_list->pk; - if( is_RSA(pk->pubkey_algo) ) - do_not_use_RSA(); + + print_pubkey_algo_note( pk->pubkey_algo ); enc = m_alloc_clear( sizeof *enc ); enc->pubkey_algo = pk->pubkey_algo; keyid_from_pk( pk, enc->keyid ); @@ -394,8 +394,9 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out ) else { if( opt.verbose ) { char *ustr = get_user_id_string( enc->keyid ); - log_info(_("%s encrypted for: %s\n"), - pubkey_algo_to_string(enc->pubkey_algo), ustr ); + log_info(_("%s/%s encrypted for: %s\n"), + pubkey_algo_to_string(enc->pubkey_algo), + cipher_algo_to_string(dek->algo), ustr ); m_free(ustr); } /* and write it */ diff --git a/g10/export.c b/g10/export.c index ff003cc74..c9056115d 100644 --- a/g10/export.c +++ b/g10/export.c @@ -34,27 +34,28 @@ #include "main.h" #include "i18n.h" -static int do_export( STRLIST users, int secret ); +static int do_export( STRLIST users, int secret, int onlyrfc ); /**************** * Export the public keys (to standard out or --output). * Depending on opt.armor the output is armored. + * If onlyrfc is True only RFC24404 compatible keys are exported. * If USERS is NULL, the complete ring will be exported. */ int -export_pubkeys( STRLIST users ) +export_pubkeys( STRLIST users, int onlyrfc ) { - return do_export( users, 0 ); + return do_export( users, 0, onlyrfc ); } int export_seckeys( STRLIST users ) { - return do_export( users, 1 ); + return do_export( users, 1, 0 ); } static int -do_export( STRLIST users, int secret ) +do_export( STRLIST users, int secret, int onlyrfc ) { int rc = 0; armor_filter_context_t afx; @@ -110,7 +111,7 @@ do_export( STRLIST users, int secret ) rc = secret? find_secret_keyblock_byname( &kbpos, sl->d ) : find_keyblock_byname( &kbpos, sl->d ); if( rc ) { - log_error("%s: user not found: %s\n", sl->d, g10_errstr(rc) ); + log_error(_("%s: user not found: %s\n"), sl->d, g10_errstr(rc)); rc = 0; continue; } @@ -119,10 +120,21 @@ do_export( STRLIST users, int secret ) } if( rc ) { - log_error("certificate read problem: %s\n", g10_errstr(rc)); + log_error(_("certificate read problem: %s\n"), g10_errstr(rc)); goto leave; } + + /* do not export keys which are incompatible with rfc2440 */ + if( onlyrfc && (node = find_kbnode( keyblock, PKT_PUBLIC_KEY )) ) { + PKT_public_key *pk = node->pkt->pkt.public_key; + if( pk->version == 3 && pk->pubkey_algo > 3 ) { + log_info(_("key %08lX: not a rfc2440 key - skipped\n"), + (ulong)keyid_from_pk( pk, NULL) ); + continue; + } + } + /* and write it */ for( kbctx=NULL; (node = walk_kbnode( keyblock, &kbctx, 0 )); ) { /* don't export any comment packets but those in the diff --git a/g10/g10.c b/g10/g10.c index 5e16bc42c..b2c96e565 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -84,6 +84,7 @@ enum cmd_and_opt_values { aNull = 0, aListSigs, aListSecretKeys, aExport, + aExportAll, aExportSecret, aCheckKeys, aGenRevoke, @@ -180,7 +181,8 @@ static ARGPARSE_OPTS opts[] = { { aEditKey, "edit-key" ,256, N_("sign or edit a key")}, { aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")}, #endif - { aExport, "export" , 256, N_("export keys") }, + { aExport, "export" , 256, N_("export keys") }, + { aExportAll, "export-all" , 256, "@" }, { aExportSecret, "export-secret-keys" , 256, "@" }, { aImport, "import", 256 , N_("import/merge keys")}, { aFastImport, "fast-import", 256 , "@"}, @@ -634,6 +636,7 @@ main( int argc, char **argv ) case aImport: set_cmd( &cmd, aImport); break; case aFastImport: set_cmd( &cmd, aFastImport); break; case aExport: set_cmd( &cmd, aExport); break; + case aExportAll: set_cmd( &cmd, aExportAll); break; case aListKeys: set_cmd( &cmd, aListKeys); break; case aListSigs: set_cmd( &cmd, aListSigs); break; case aExportSecret: set_cmd( &cmd, aExportSecret); break; @@ -1084,10 +1087,11 @@ main( int argc, char **argv ) break; case aExport: + case aExportAll: sl = NULL; for( ; argc; argc--, argv++ ) add_to_strlist( &sl, *argv ); - export_pubkeys( sl ); + export_pubkeys( sl, (cmd == aExport) ); free_strlist(sl); break; @@ -1315,17 +1319,6 @@ g10_exit( int rc ) } -void -do_not_use_RSA() -{ - static int did_rsa_note = 0; - - if( !did_rsa_note ) { - did_rsa_note = 1; - log_info(_("RSA keys are deprecated; please consider " - "creating a new key and use this key in the future\n")); - } -} #ifdef IS_G10MAINT diff --git a/g10/getkey.c b/g10/getkey.c index 762c4da20..65c0ae495 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1413,6 +1413,27 @@ get_user_id_string( u32 *keyid ) return p; } +char* +get_long_user_id_string( u32 *keyid ) +{ + user_id_db_t r; + char *p; + int pass=0; + /* try it two times; second pass reads from key resources */ + do { + for(r=user_id_db; r; r = r->next ) + if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) { + p = m_alloc( r->len + 20 ); + sprintf(p, "%08lX%08lX %.*s", + (ulong)keyid[0], (ulong)keyid[1], r->len, r->name ); + return p; + } + } while( ++pass < 2 && !get_pubkey( NULL, keyid ) ); + p = m_alloc( 25 ); + sprintf(p, "%08lX%08lX [?]", (ulong)keyid[0], (ulong)keyid[1] ); + return p; +} + char* get_user_id( u32 *keyid, size_t *rn ) { diff --git a/g10/gpgd.c b/g10/gpgd.c index ce92c95d7..5d85e1f13 100644 --- a/g10/gpgd.c +++ b/g10/gpgd.c @@ -258,18 +258,6 @@ g10_exit( int rc ) exit(rc ); } -void -do_not_use_RSA() -{ - static int did_rsa_note = 0; - - if( !did_rsa_note ) { - did_rsa_note = 1; - log_info("RSA keys are depreciated; please consider " - "creating a new key and use this key in the future\n"); - } -} - static void become_daemon() diff --git a/g10/helptext.c b/g10/helptext.c index ea27e69dd..ee5565e81 100644 --- a/g10/helptext.c +++ b/g10/helptext.c @@ -72,11 +72,17 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = { "does this but other OpenPGP implemenations are not required to understand\n" "the signature+encryption flavor.\n" "The first (primary) key must always be a key which is capable of signing;\n" -"this is the reason why the ecrytion only ElGamal key is disabled in this.\n" -"You should not select the \"ElGamal in a v3 packet\", because that key is\n" -"not compatible to other OpenPGP implementations." +"this is the reason why the ecrytion only ElGamal key is disabled in this." }, + +{ N_("keygen.algo.elg_se"), +"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." +}, + + { N_("keygen.size"), "Enter the size of the key" }, diff --git a/g10/keydb.h b/g10/keydb.h index 5b517d76d..a3abbe76f 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -145,6 +145,7 @@ int get_seckey_byname( PKT_secret_key *sk, const char *name, int unlock ); int enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys ); void merge_keys_and_selfsig( KBNODE keyblock ); char*get_user_id_string( u32 *keyid ); +char*get_long_user_id_string( u32 *keyid ); char*get_user_id( u32 *keyid, size_t *rn ); /*-- keyid.c --*/ diff --git a/g10/keygen.c b/g10/keygen.c index fc64d496e..cea7ffdb5 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -388,11 +388,13 @@ ask_algo( int *ret_v4, int addmode ) tty_printf(_("Please select what kind of key you want:\n")); if( !addmode ) tty_printf(_(" (%d) DSA and ElGamal (default)\n"), 1 ); - tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 2 ); + tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); if( addmode ) tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); - tty_printf( _(" (%d) DSA (sign only)\n"), 4 ); + tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); + #if 0 tty_printf( _(" (%d) ElGamal in a v3 packet\n"), 5 ); + #endif *ret_v4 = 1; for(;;) { @@ -404,23 +406,28 @@ ask_algo( int *ret_v4, int addmode ) algo = 0; /* create both keys */ break; } - else if( algo == 2 ) { - algo = PUBKEY_ALGO_ELGAMAL; - break; + 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? "))) { + algo = PUBKEY_ALGO_ELGAMAL; + break; + } } else if( algo == 3 && addmode ) { algo = PUBKEY_ALGO_ELGAMAL_E; break; } - else if( algo == 4 ) { + else if( algo == 2 ) { algo = PUBKEY_ALGO_DSA; break; } + #if 0 else if( algo == 5 ) { algo = PUBKEY_ALGO_ELGAMAL_E; *ret_v4 = 0; break; } + #endif else tty_printf(_("Invalid selection.\n")); } diff --git a/g10/main.h b/g10/main.h index 424cc8d9a..72f433fcc 100644 --- a/g10/main.h +++ b/g10/main.h @@ -45,7 +45,9 @@ extern int g10_errors_seen; #else void g10_exit(int rc); #endif -void do_not_use_RSA(void); +void print_pubkey_algo_note( int algo ); +void print_cipher_algo_note( int algo ); +void print_digest_algo_note( int algo ); /*-- misc.c --*/ void trap_unaligned(void); @@ -108,7 +110,7 @@ KBNODE make_mpi_comment_node( const char *s, MPI a ); /*-- import.c --*/ int import_keys( const char *filename, int fast ); /*-- export.c --*/ -int export_pubkeys( STRLIST users ); +int export_pubkeys( STRLIST users, int onlyrfc ); int export_seckeys( STRLIST users ); /* dearmor.c --*/ diff --git a/g10/mainproc.c b/g10/mainproc.c index 559b057f8..02d42223b 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -841,7 +841,7 @@ check_sig_and_print( CTX c, KBNODE node ) rc = do_check_sig(c, node, NULL ); if( !rc || rc == G10ERR_BAD_SIGN ) { - char *us = get_user_id_string( sig->keyid ); + char *us = get_long_user_id_string( sig->keyid ); write_status_text( rc? STATUS_BADSIG : STATUS_GOODSIG, us ); m_free(us); log_info(rc? _("BAD signature from \"") diff --git a/g10/misc.c b/g10/misc.c index adab4321f..a52114748 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -187,3 +187,61 @@ buffer_to_u32( const byte *buffer ) return a; } + +static void +no_exp_algo(void) +{ + static int did_note = 0; + + if( !did_note ) { + did_note = 1; + log_info(_("Experimental algorithms should not be used!\n")); + } +} + +void +print_pubkey_algo_note( int algo ) +{ + if( algo >= 100 && algo <= 110 ) + no_exp_algo(); + else if( is_RSA( algo ) ) { + static int did_note = 0; + + if( !did_note ) { + did_note = 1; + log_info(_("RSA keys are deprecated; please consider " + "creating a new key and use this key in the future\n")); + } + } +} + +void +print_cipher_algo_note( int algo ) +{ + if( algo >= 100 && algo <= 110 ) + no_exp_algo(); + else if( algo == CIPHER_ALGO_3DES + || algo == CIPHER_ALGO_CAST5 + || algo == CIPHER_ALGO_BLOWFISH + ) + ; + else { + static int did_note = 0; + + if( !did_note ) { + did_note = 1; + log_info(_("This cipher algorithm is depreciated; " + "please use a more standard one!\n")); + } + } +} + +void +print_digest_algo_note( int algo ) +{ + if( algo >= 100 && algo <= 110 ) + no_exp_algo(); +} + + + diff --git a/g10/pkclist.c b/g10/pkclist.c index b117dcc1e..480b17535 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -302,7 +302,7 @@ do_we_trust( PKT_public_key *pk, int trustlevel ) case TRUST_ULTIMATE: if( opt.verbose ) - log_info(_("This key belongs to us (we have the secret key)\n")); + log_info(_("This key belongs to us\n")); return 1; /* yes */ default: BUG(); diff --git a/g10/ringedit.c b/g10/ringedit.c index e7ffdbfa8..008fa18c9 100644 --- a/g10/ringedit.c +++ b/g10/ringedit.c @@ -249,7 +249,7 @@ add_keyblock_resource( const char *url, int force, int secret ) goto leave; case rt_RING: - iobuf = iobuf_fopen( filename, "rb" ); + iobuf = iobuf_open( filename ); if( !iobuf && !force ) { rc = G10ERR_OPEN_FILE; goto leave; @@ -689,7 +689,7 @@ enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root ) kbpos->rt = resource_table[i].rt; switch( kbpos->rt ) { case rt_RING: - kbpos->fp = iobuf_fopen( rentry->fname, "rb" ); + kbpos->fp = iobuf_open( rentry->fname ); if( !kbpos->fp ) { log_error("can't open '%s'\n", rentry->fname ); return G10ERR_OPEN_FILE; @@ -1083,7 +1083,7 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root ) if( !(rentry=check_pos(kbpos)) ) return G10ERR_GENERAL; - a = iobuf_fopen( rentry->fname, "rb" ); + a = iobuf_open( rentry->fname ); if( !a ) { log_error("can't open '%s'\n", rentry->fname ); return G10ERR_OPEN_FILE; @@ -1246,7 +1246,7 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root ) log_fatal("can't lock '%s'\n", rentry->fname ); /* open the source file */ - fp = iobuf_fopen( rentry->fname, "rb" ); + fp = iobuf_open( rentry->fname ); if( mode == 1 && !fp && errno == ENOENT ) { /* no file yet */ KBNODE kbctx, node; @@ -1526,6 +1526,9 @@ do_gdbm_store( KBPOS *kbpos, KBNODE root, int update ) content.dsize = iobuf_get_temp_length( fp ); rc = gdbm_store( rentry->dbf, key, content, update? GDBM_REPLACE : GDBM_INSERT ); + if( rc == 1 && !update ) + rc = gdbm_store( rentry->dbf, key, content, GDBM_REPLACE ); + if( rc ) { log_error("%s: gdbm_store failed: %s\n", rentry->fname, rc == 1 ? "already stored" diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index c7e0038e5..1950ae0e1 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -209,6 +209,7 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek ) else if( cipher_get_blocksize( sk->protect.algo ) != 8 ) rc = G10ERR_CIPHER_ALGO; /* unsupport protection algorithm */ else { + print_cipher_algo_note( sk->protect.algo ); cipher_hd = cipher_open( sk->protect.algo, CIPHER_MODE_AUTO_CFB, 1 ); if( cipher_setkey( cipher_hd, dek->key, dek->keylen ) ) diff --git a/g10/sign.c b/g10/sign.c index 012b7e85a..9b78acf7e 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -47,12 +47,12 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig, byte *dp; int rc; - if( is_RSA(sk->pubkey_algo) ) - do_not_use_RSA(); + print_pubkey_algo_note(sk->pubkey_algo); if( !digest_algo ) digest_algo = md_get_algo(md); + print_digest_algo_note( digest_algo ); dp = md_read( md, digest_algo ); sig->digest_algo = digest_algo; sig->digest_start[0] = dp[0]; diff --git a/g10/status.c b/g10/status.c index 3b9e197b8..e441d5e21 100644 --- a/g10/status.c +++ b/g10/status.c @@ -152,7 +152,8 @@ init_shm_coprocessing ( ulong requested_shm_size, int lock_mem ) else shm_is_locked = 1; #elif defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK) - if ( mlock (shm_area, shm_size) ) + /* (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 @@ -307,7 +308,8 @@ cpr_kill_prompt(void) if( opt.shm_coprocess ) return; #endif - return tty_kill_prompt(); + tty_kill_prompt(); + return; } int diff --git a/po/ChangeLog b/po/ChangeLog index d71ca9747..384ce7713 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 10 20:15:36 CET 1998 Werner Koch + + * *.po: Changed some english strings. + Tue Dec 8 15:09:29 CET 1998 Werner Koch * pt_BR.po: Add translation by Thiago Jung Bauermann. diff --git a/po/de.po b/po/de.po index 54980db76..65a41e0b6 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1998-12-08 14:48+0100\n" +"POT-Creation-Date: 1998-12-10 20:11+0100\n" "PO-Revision-Date: 1998-11-18 20:10+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -217,14 +217,14 @@ msgstr "Ohhh jeeee ... dies ist eine Wanze (Programmfehler) (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben eine Wanze (Programmfehler) gefunden ... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:412 msgid "WARNING: using insecure random number generator!!\n" msgstr "Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n" -#: cipher/random.c:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -235,7 +235,7 @@ msgstr "" "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -247,7 +247,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -255,123 +255,123 @@ msgstr "" "@Kommandos:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 msgid "|[file]|make a signature" msgstr "|[file]|Eine Unterschrift erzeugen" -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a clear text signature" msgstr "|[file]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "Daten verschlüsseln" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "Daten nur symmetrisch verschlüsseln" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "Signatur prüfen" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "Liste der Schlüssel" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "Liste der Schlüssel und ihrer Signaturen" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "Signaturen der Schlüssel prüfen" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\"" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "Liste der geheimen Schlüssel" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "Schlüssel entfernen" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines Schlüssels" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpackete anzeigen" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:194 +#: g10/g10.c:196 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|Überprüfen der \"Trust\"-Datenbank" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschädigten \"Trust\"-Datenbank" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-Hülle befreien" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-Hülle einpacken" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|algo [files]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "Message-Digests für die Eingabedaten ausgeben" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -381,141 +381,141 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "Verschlüsseln für diese User-ID" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0 = keine Kompr.)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "Als öffentlichen Schlüsselbund mitbenutzen" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "Als geheimen Schlüsselbund mitbenutzen" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "Benötigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "Benötigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "|FILE|load extension module FILE" msgstr "|FILE|Erweiterungsmodul DATEI laden" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:242 +#: g10/g10.c:244 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden der \"Passphrase\"-Methode N" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Das Hashverfahren NAME f. \"Passphrase\" benutzen" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Das Verschlü.verfahren NAME f. \"Passphrase\" benutzen" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Das Verschlü.verfahren NAME benutzen" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Das Hashverfahren NAME benutzen" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|Die Komprimierverfahren N benutzen" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "entferne die AbsenderI-ID verschlüsselter Pakete" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "" "@\n" "Examples:\n" @@ -535,19 +535,19 @@ msgstr "" " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "Berichte über Wanzen (Programmfehler) bitte an .\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Aufruf: gpgm [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:349 +#: g10/g10.c:351 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -555,7 +555,7 @@ msgstr "" "Syntax: gpgm [options] [files]\n" "GnuPG Wartungs-Hilfsprogramm\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -565,7 +565,7 @@ msgstr "" "Signieren, prüfen, verschlüsseln, entschlüsseln\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -573,161 +573,153 @@ msgstr "" "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "Aufruf: gpgm [Optionen] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "Widersprüchliche Kommandos\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, c-format msgid "NOTE: no default option file '%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, 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:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:837 +#: g10/g10.c:840 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:841 +#: g10/g10.c:844 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:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 msgid "--edit-key username [commands]" msgstr "--edit-key Username [Befehle]" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key Username" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key Benutzername" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen " -"neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "ASCII-Hülle: " @@ -909,10 +901,10 @@ msgstr "" #: g10/pkclist.c:300 msgid "This key probably belongs to the owner\n" -msgstr "" +msgstr "Dieser Schlüssel gehört wahrscheinlich dem Besitzer\n" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "" "Dieser Schlüssel gehört uns (alldieweil wir den geheimen Schlüssel dazu " "haben)\n" @@ -1025,8 +1017,8 @@ msgstr " (%d) DSA und ElGamal (voreingestellt)\n" #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (signieren und verschlüsseln)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (nur signieren)\n" #: g10/keygen.c:393 #, c-format @@ -1035,23 +1027,28 @@ msgstr " (%d) ElGamal (nur verschl #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (nur signieren)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (signieren und verschlüsseln)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal in einem v3-Paket\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Ihre Auswahl? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "Ungültige Auswahl.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1064,19 +1061,19 @@ msgstr "" " standard Schlüssellänge ist 1024 Bits\n" " größte sinnvolle Schlüssellänge ist 2048 Bits\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "Welche Schlüssellänge wünschen Sie? (1024) " -#: g10/keygen.c:449 +#: g10/keygen.c:456 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:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1084,11 +1081,11 @@ msgstr "" "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n" "Berechnungen dann WIRKLICH lange brauchen!\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1096,21 +1093,21 @@ 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:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "aufgerundet auf %u Bit\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1126,29 +1123,29 @@ msgstr "" " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "Der Schlüssel bleibt wie lange gültig? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "Ungültiger Wert.\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "Der Schlüssel verfällt nie.\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "Der Schlüssel verfällt am %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "Ist dies richtig? (j/n) " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1164,39 +1161,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "Ungültiges Zeichen im Namen\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "Der Name muß min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "E-Mail-Adresse: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "E-Mail-Adresse is ungültig\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "Ungültiges Zeichen im Kommentar.\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1207,15 +1204,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:663 +#: g10/keygen.c:670 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Ändern: N=Name, C=Kommentar, E=E-Mail, O=Okay oder Q=Beenden? " -#: g10/keygen.c:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1223,11 +1220,11 @@ msgstr "" "Sie benötigen eine \"passphrase\", um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "\"passphrase\" nicht richtig wiederholt; noch einmal.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 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" @@ -1240,7 +1237,7 @@ msgstr "" "aufrufen.\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1251,34 +1248,34 @@ msgstr "" "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n" "tippen oder irgendwelche anderen Programme benutzen.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "" "Die Schlüsselerzeugung kann nur im interaktiven Modus benutzt werden.\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "Der DSA Schlüssel wird 1024 Bits haben.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 msgid "Key generation cancelled.\n" msgstr "Schlüsselerzeugung abgebrochen: %s\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1287,12 +1284,12 @@ msgstr "" "werden kann. Sie können aber mit dem Kommando \"--add-key\" einen\n" "Zweitschlüssel zu diesem Schlüssel hinzufügen.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 msgid "Really create? " msgstr "Wirklich erzeugen? " @@ -1318,11 +1315,26 @@ msgid "reading from '%s'\n" msgstr "Lesen von '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlüsselt für: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: Benutzer nicht gefunden\n" + +#: g10/export.c:123 +#, fuzzy, c-format +msgid "certificate read problem: %s\n" +msgstr "User '%s' Leseproblem: %s\n" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "Schlüssel %08lX: geheimer, aber kein öffentlicher Schlüssel.\n" + +#: g10/export.c:174 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" @@ -1438,7 +1450,7 @@ msgstr "Schl msgid "no default public keyring\n" msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 #, c-format msgid "writing to '%s'\n" msgstr "Schreiben nach '%s'\n" @@ -2065,6 +2077,22 @@ msgstr "core-dump-Erzeugung kann nicht abgeschaltet werden: %s\n" msgid "WARNING: Program may create a core file!\n" msgstr "WARNUNG: Programm könnte einen core-dump schreiben!\n" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen " +"neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, c-format msgid "can't handle public key algorithm %d\n" @@ -2138,7 +2166,7 @@ msgstr "Schutzverfahren %d wird nicht unterst msgid "Invalid passphrase; please try again ...\n" msgstr "Ungültige \"passphrase\"; versuchen Sie's doch noch einmal ...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" "WARNUNG: Unsicherer Schlüssel entdeckt -\n" @@ -2167,7 +2195,7 @@ msgstr "Hinweis: Schl msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:564 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" @@ -2947,84 +2975,88 @@ msgstr "" msgid "keygen.algo" msgstr "" -#: g10/helptext.c:80 +#: g10/helptext.c:79 +msgid "keygen.algo.elg_se" +msgstr "" + +#: g10/helptext.c:86 msgid "keygen.size" msgstr "" -#: g10/helptext.c:84 +#: g10/helptext.c:90 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:95 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:94 +#: g10/helptext.c:100 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:98 +#: g10/helptext.c:104 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:109 msgid "keygen.name" msgstr "" -#: g10/helptext.c:108 +#: g10/helptext.c:114 msgid "keygen.email" msgstr "" -#: g10/helptext.c:112 +#: g10/helptext.c:118 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:117 +#: g10/helptext.c:123 #, fuzzy msgid "keygen.userid.cmd" msgstr "Geben Sie bitte \"help\" ein." -#: g10/helptext.c:126 +#: g10/helptext.c:132 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:130 +#: g10/helptext.c:136 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:135 +#: g10/helptext.c:141 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:140 +#: g10/helptext.c:146 msgid "keyedit.cmd" msgstr "Geben Sie bitte \"help\" ein." -#: g10/helptext.c:144 +#: g10/helptext.c:150 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:149 +#: g10/helptext.c:155 #, fuzzy msgid "keyedit.cancel.okay" msgstr "Geben Sie bitte \"help\" ein." -#: g10/helptext.c:153 +#: g10/helptext.c:159 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:157 +#: g10/helptext.c:163 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:162 +#: g10/helptext.c:168 msgid "keyedit.remove.subkey.okay" msgstr "" # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:166 +#: g10/helptext.c:172 msgid "passphrase.enter" msgstr "" "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" @@ -3039,26 +3071,26 @@ msgstr "" "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:173 +#: g10/helptext.c:179 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daß Sie sich bei der Eingabe der \"Passphrase\" nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "übereinstimmen, wird die \"Passphrase\" akzeptiert." -#: g10/helptext.c:177 +#: g10/helptext.c:183 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:181 +#: g10/helptext.c:187 msgid "openfile.overwrite.okay" msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten" -#: g10/helptext.c:195 +#: g10/helptext.c:201 msgid "No help available" msgstr "Keine Hilfe vorhanden." -#: g10/helptext.c:207 +#: g10/helptext.c:213 #, c-format msgid "No help available for '%s'" msgstr "Keine Hilfe für '%s' vorhanden." diff --git a/po/es_ES.po b/po/es_ES.po index 43bd27c56..6fb48aeae 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # I also got inspiration from it.po by Marco d'Itri msgid "" msgstr "" -"POT-Creation-Date: 1998-12-08 14:48+0100\n" +"POT-Creation-Date: 1998-12-10 20:11+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa \n" @@ -211,15 +211,15 @@ msgstr " msgid "you found a bug ... (%s:%d)\n" msgstr "Ha encontrado Vd. un bug... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:412 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "Aviso: ¡se está usando un generador de números aleatorios inseguro!\n" -#: cipher/random.c:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -230,7 +230,7 @@ msgstr "" "¡NO USE NINGÚN DATO GENERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -242,7 +242,7 @@ msgstr "" "otro trabajo para que el sistema pueda recolectar más entropía\n" "(se necesitan %d bytes más).\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -250,123 +250,123 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "cifra sólo con un cifrado simétrico" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "sólo almacenar" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "lista las claves" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "lista las claves y firmas" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "lista las claves y huellas dactilares" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "lista las claves secretas" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo público" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "genera un certificado de revocación" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "exporta las claves" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "importa/fusiona las claves" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "lista sólo la secuencia de paquetes" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:194 +#: g10/g10.c:196 msgid "|[NAMES]|update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza dañada" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|algo [files]|imprime resúmenes de mensaje" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "imprime todos los resúmenes de mensaje" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -376,145 +376,145 @@ msgstr "" "Opciones:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "usa este usuario para cifrar" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresión N (0 no comprime)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "usa modo de texto canónico" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "force v3 signatures" msgstr "fuerza firmas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "asume \"sí\" en casi todas las preguntas" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "añade este anillo a la lista de anillos" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "añade este anillo secreto a la lista" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "establece los parámetros de depuración" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "habilita depuración completa" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|DF|escribe información de estado en descriptor DF" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga módulo de extensiones FICHERO" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:242 +#: g10/g10.c:244 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseña N" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n" "para las contraseñas" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseñas" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresión N" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "" "@\n" "Examples:\n" @@ -534,19 +534,19 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:349 +#: g10/g10.c:351 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -554,7 +554,7 @@ msgstr "" "Sintaxis: gpgm [opciones] [ficheros]\n" "Utilidad de mantenimiento de GnuPG\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -564,7 +564,7 @@ msgstr "" "firma, comprueba, cifra o descifra\n" "la operación por defecto depende del tipo de datos de entrada\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -572,163 +572,155 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "uso: gpgm [opciones] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "nota: no existe fichero de opciones predefinido '%s'\n" -#: g10/g10.c:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "fichero de opciones '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "leyendo opciones desde '%s'\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Caracter no válido en el comentario\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifra seleccionado no es válido\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es válido\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, 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:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:837 +#: g10/g10.c:840 #, fuzzy 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:841 +#: g10/g10.c:844 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:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza '%s' fallida\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nombre_usuario" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse '%s': %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo de distribución no válido '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "no puede abrirse '%s'\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"Las claves RSA están en desuso, considere la creación de una nueva clave " -"para futuros usos\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "cabecera de armadura: " @@ -903,7 +895,7 @@ msgid "This key probably belongs to the owner\n" msgstr "" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "" #: g10/pkclist.c:330 @@ -1011,8 +1003,8 @@ msgstr " (%d) DSA y ElGamal (por defecto)\n" #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (firma y cifrado)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (sólo firma)\n" #: g10/keygen.c:393 #, c-format @@ -1021,23 +1013,28 @@ msgstr " (%d) ElGamal (s #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (sólo firma)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (firma y cifrado)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal en un paquete v3\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Su elección: " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "¿Borrar realmente las claves seleccionadas? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "Elección no válida.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1050,19 +1047,19 @@ msgstr "" " el tamaño por defecto es 1024 bits\n" " el tamaño máximo recomendado en 2048 bits\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "¿De qué tamaño quiere la clave (1024)? " -#: g10/keygen.c:449 +#: g10/keygen.c:456 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:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1070,11 +1067,11 @@ msgstr "" "No se recomiendan claves de más de 2048 bits porque\n" "el tiempo de computación es REALMENTE largo.\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "¿Seguro que quiere una clave de este tamaño? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1083,21 +1080,21 @@ msgstr "" "teclado\n" "también son vulnerables a un ataque!\n" -#: g10/keygen.c:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "¿De verdad necesita una clave tan grande? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "El tamaño requerido es de %u bits\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "redondeados a %u bits\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1113,29 +1110,29 @@ msgstr "" " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "¿Validez de la clave (0)? " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "valor no válido\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "La clave nunca caduca\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "La clave caduca el %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "¿Es correcto (s/n)? " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1153,39 +1150,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "Nombre y apellidos: " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "Caracter no válido en el nombre\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "El nombre no puede empezar con un número\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "El nombre debe tener al menos 5 caracteres\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "Dirección de correo electrónico: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "Dirección no válida\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "Caracter no válido en el comentario\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1196,15 +1193,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "NnCcDdVvSs" -#: g10/keygen.c:663 +#: g10/keygen.c:670 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:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1212,11 +1209,11 @@ msgstr "" "Necesita una contraseña para proteger su clave secreta.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 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" @@ -1228,7 +1225,7 @@ msgstr "" "la opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1241,33 +1238,33 @@ msgstr "" "generador de números aleatorios mayor oportunidad de recoger suficiente\n" "entropía.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "La creación de claves sólo es posible en modo interactivo\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "El par de claves DSA tendrá 1024 bits.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 msgid "Key generation cancelled.\n" msgstr "Creación de claves cancelada.\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "escribiendo certificado público en '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "escribiendo certificado privado en '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "Claves pública y secreta creadas y firmadas.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1276,12 +1273,12 @@ msgstr "" "el comando \"--add-key\" para crear una clave secundaria con este " "propósito.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 msgid "Really create? " msgstr "¿Crear de verdad? " @@ -1307,11 +1304,26 @@ msgid "reading from '%s'\n" msgstr "leyendo desde '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s cifrado para: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: usuario no encontrado\n" + +#: g10/export.c:123 +#, c-format +msgid "certificate read problem: %s\n" +msgstr "" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n" + +#: g10/export.c:174 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n" @@ -1427,7 +1439,7 @@ msgstr "clave %08lX: clave p msgid "no default public keyring\n" msgstr "no hay anillo público por defecto\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 #, c-format msgid "writing to '%s'\n" msgstr "escribiendo en '%s'\n" @@ -2056,6 +2068,22 @@ msgstr "no puede abrirse '%s': %s\n" msgid "WARNING: Program may create a core file!\n" msgstr "" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"Las claves RSA están en desuso, considere la creación de una nueva clave " +"para futuros usos\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, fuzzy, c-format msgid "can't handle public key algorithm %d\n" @@ -2131,7 +2159,7 @@ msgstr "el algoritmo de protecci msgid "Invalid passphrase; please try again ...\n" msgstr "Contraseña incorrecta, inténtelo de nuevo...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 #, fuzzy msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "Aviso: detectada clave débil - por favor cambie la contraseña.\n" @@ -2159,7 +2187,7 @@ msgstr "atenci msgid "%s signature from: %s\n" msgstr "Firma INCORRECTA de \"" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:564 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "no puede abrirse '%s': %s\n" @@ -2951,99 +2979,103 @@ msgstr "" msgid "keygen.algo" msgstr "" -#: g10/helptext.c:80 +#: g10/helptext.c:79 +msgid "keygen.algo.elg_se" +msgstr "" + +#: g10/helptext.c:86 msgid "keygen.size" msgstr "" -#: g10/helptext.c:84 +#: g10/helptext.c:90 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:95 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:94 +#: g10/helptext.c:100 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:98 +#: g10/helptext.c:104 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:109 msgid "keygen.name" msgstr "" -#: g10/helptext.c:108 +#: g10/helptext.c:114 msgid "keygen.email" msgstr "" -#: g10/helptext.c:112 +#: g10/helptext.c:118 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:117 +#: g10/helptext.c:123 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:126 +#: g10/helptext.c:132 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:130 +#: g10/helptext.c:136 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:135 +#: g10/helptext.c:141 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:140 +#: g10/helptext.c:146 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:144 +#: g10/helptext.c:150 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:149 +#: g10/helptext.c:155 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:153 +#: g10/helptext.c:159 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:157 +#: g10/helptext.c:163 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:162 +#: g10/helptext.c:168 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:166 +#: g10/helptext.c:172 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:173 +#: g10/helptext.c:179 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:177 +#: g10/helptext.c:183 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:181 +#: g10/helptext.c:187 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:195 +#: g10/helptext.c:201 msgid "No help available" msgstr "Ayuda no disponible" -#: g10/helptext.c:207 +#: g10/helptext.c:213 #, c-format msgid "No help available for '%s'" msgstr "Ayuda no disponible para '%s'" diff --git a/po/fr.po b/po/fr.po index fc6530035..95cacdce5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.1a\n" -"POT-Creation-Date: 1998-12-08 14:48+0100\n" +"POT-Creation-Date: 1998-12-10 20:11+0100\n" "PO-Revision-Date: 1998-10-29 19:01+0100\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -207,16 +207,16 @@ 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:379 +#: cipher/random.c:412 #, fuzzy 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:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -227,7 +227,7 @@ msgstr "" "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME!!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -238,7 +238,7 @@ msgstr "" "Il n'y a pas assez d'octets aléatoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie! (il faut %d octets de plus)\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -246,124 +246,124 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "faire une signature détachée" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "crypter les données" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "chiffrement symétrique seumement" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "décrypter les données (défaut)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "vérifier une signature" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "lister les clés" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "lister les clés et les signatures" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "vérifier les signatures des clés" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "lister les clés et les empreintes" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "lister les clés secrètes" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "générer une nouvelle paire de clés" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "enlever la clé du porte-clés public" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "signer ou éditer une clé" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "générer un certificat de révocation" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "exporter les clés" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "importer/fusionner les clés" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "ne lister qu'une suite de paquets" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "export the ownertrust values" msgstr "exporter les valeurs de confiance" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "import ownertrust values" msgstr "importer les valeurs de confiance" # -#: g10/g10.c:194 +#: g10/g10.c:196 msgid "|[NAMES]|update the trust database" msgstr "|[NOMS]|mettre la base de confiance à jour" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vérifier la base de confiance" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "réparer une base de confiance corrompue" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "Mettre une armure à un fichier ou à stdin" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "écrire toutes les fonctions de hachage" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -373,142 +373,142 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "créer une sortie ascii armurée" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou décrypter" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "utiliser ce nom d'utilisateur pour crypter" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 désactive)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "utiliser le mode de texte canonique" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "bavard" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" # -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "force v3 signatures" msgstr "forcer les signatures en v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "mode automatique: ne jamais rien demander" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "supposer oui à la plupart des questions" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "supposer non à la plupart des questions" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clés à la liste des porte-clés" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clés secret à la liste" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clé secrète par défaut" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|utiliser l'algorithme de cryptage NOM" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "choisir les attributs de déboguage" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "permettre un déboguage complet" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|FD|écrire les informations d'état sur ce descripteur" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "ne pas écrire de paquets de commentaire" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "(1 par défaut)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "(3 par défaut)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "émuler le mode décrit dans la RFC1991" -#: g10/g10.c:242 +#: g10/g10.c:244 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de mots de passe N" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le cryptage NOM pour les mots de passe" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de cryptage NOM" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "enlever l'identification des paquets cryptés" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "" "@\n" "Examples:\n" @@ -528,20 +528,20 @@ msgstr "" " --list-keys [utilisateur] montrer les clés\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "Rapporter toutes anomalies à .\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" # -#: g10/g10.c:349 +#: g10/g10.c:351 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -549,7 +549,7 @@ msgstr "" "Syntaxe: gpgm [options] [fichiers]\n" "utilitaire de maitenance de GnuPG\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -559,7 +559,7 @@ msgstr "" "signer, vérifier, crypter ou décrypter\n" "l'opération par défaut dépend des données entrées\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -567,163 +567,155 @@ msgstr "" "\n" "Algorithmes supportés:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "utilisation: gpgm [options] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, fuzzy, 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:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "fichier d'options '%s' : %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "lire les options de '%s'\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Caractère invalide dans le commentaire\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de cryptage sélectionné est invalide\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'échelle %d..%d\n" -#: g10/g10.c:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "le nombre de signatures complètes minimal doit être supérieur à 0\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "le nombre de singatures marginales minimal doit être supérieur à 1\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:837 +#: g10/g10.c:840 #, fuzzy 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:841 +#: g10/g10.c:844 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; doit être 0, 1 ou 3\n" -#: g10/g10.c:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "n'a pas pu initialiser la base de confiance: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key utilisateur" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key utilisateur" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non réussie: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "mise d'armure non réussie:%s \n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algorithme de hachage invalide '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "ne peut ouvrir '%s'\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"Les clés RSA sont déconseillées: considérez créer une nouvelle clé et " -"l'utiliser dans l'avenir\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "entête d'armure: " @@ -897,7 +889,7 @@ msgid "This key probably belongs to the owner\n" msgstr "" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "" #: g10/pkclist.c:330 @@ -1008,8 +1000,8 @@ msgstr " (%d) DSA et ElGamal (d #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (signature et cryptage)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (signature seulement)\n" #: g10/keygen.c:393 #, c-format @@ -1018,23 +1010,28 @@ msgstr " (%d) ElGamal (cryptage seulement)\n" #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (signature seulement)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (signature et cryptage)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal dans un paquet v3\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Votre choix? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "Voulez-vous supprimer les clés sélectionnées? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "Choix invalide.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1047,19 +1044,19 @@ msgstr "" " la taille par défaut est 1024 bits\n" " la taille maximale conseillée est 2048 bits\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "Quelle taille de clé désirez-vous? (1024) " -#: g10/keygen.c:449 +#: g10/keygen.c:456 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:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "taille trop petite; 768 est la plus petite valeur permise.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1067,11 +1064,11 @@ msgstr "" "Les tailles supérieures à 2048 ne sont pas conseillées car\n" "les calculs sont VRAIMENT longs!\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "Etes-vous sûr que vous voulez cette taille? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1079,21 +1076,21 @@ msgstr "" "D'accord, mais n'oubliez pas que votre écran et les radiations du clavier " "sont aussi très vulnérables aux attaques!\n" -#: g10/keygen.c:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "Avez-vous réellement besoin d'une taille aussi grande? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La taille demandée est %u bits\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "arrondie à %u bits\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1109,29 +1106,29 @@ msgstr "" " m = la clé expire dans n mois\n" " y = la clé expire dans n ans\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "La clé est valide pour? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "valeur invalide\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "La clé n'expire pas du tout\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "La clé expire le %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "Est-ce correct (o/n)? " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1147,39 +1144,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \n" "Language-Team: Italian \n" @@ -207,16 +207,16 @@ msgstr "... questo msgid "you found a bug ... (%s:%d)\n" msgstr "Hai trovato un bug... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:412 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "" "Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n" -#: cipher/random.c:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -224,7 +224,7 @@ msgstr "" "Il generatore di numeri casuali è solo un ripiego per fare\n" "compilare il programma - non è assolutamente un RNG forte!\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -236,7 +236,7 @@ msgstr "" "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -244,123 +244,123 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:194 +#: g10/g10.c:196 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "stampa tutti i message digests" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -370,141 +370,141 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "usa questo user-id per cifrare" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "assumi \"sì\" a quasi tutte le domande" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|usa NAME come chiave segreta predefinita" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "(predefinito è 1)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "(predefinito è 3)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto nel RFC1991" -#: g10/g10.c:242 +#: g10/g10.c:244 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti crittografati" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "" "@\n" "Examples:\n" @@ -524,19 +524,19 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:349 +#: g10/g10.c:351 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -544,7 +544,7 @@ msgstr "" "Sintassi: gpgm [opzioni] [file]\n" "Utility di manutenzione di GnuPG\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -554,7 +554,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -562,163 +562,155 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "uso: gpgm [options] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "nota: nessun file con opzioni predefinite '%s'\n" -#: g10/g10.c:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "file con opzioni predefinite '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "lettura delle opzioni da '%s'\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Carattere non valido nel commento\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, 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:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:837 +#: g10/g10.c:840 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "nota: il modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:841 +#: g10/g10.c:844 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:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nomeutente" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key nomeutente" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire '%s': %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo di hash non valido '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "impossibile aprire '%s'\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"L'uso di chiavi RSA è deprecato; per favore in futuro considera di creare e\n" -"usare una nuova chiave.\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "header dell'armatura: " @@ -895,7 +887,7 @@ msgid "This key probably belongs to the owner\n" msgstr "" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "" #: g10/pkclist.c:330 @@ -1003,8 +995,8 @@ msgstr " (%d) DSA e ElGamal (default)\n" #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (firma e crittografa)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (firma solo)\n" #: g10/keygen.c:393 #, c-format @@ -1013,23 +1005,28 @@ msgstr " (%d) ElGamal (crittografa solo)\n" #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (firma solo)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (firma e crittografa)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal in un pacchetto v3\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Cosa scegli? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "Vuoi davvero cancellare le chiavi selezionate? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "Scelta non valida.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1042,19 +1039,19 @@ msgstr "" " la dimensione predefinita è 1024 bit\n" " la dimensione massima consigliata è 2048 bit\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "Di che dimensioni vuoi la chiave? (1024) " -#: g10/keygen.c:449 +#: g10/keygen.c:456 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permette solo chiavi di dimensioni da 512 a 1024\n" -#: g10/keygen.c:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1062,11 +1059,11 @@ msgstr "" "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono \n" "VERAMENTE lunghi!\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "Sei sicuro di volere una chiave di queste dimensioni? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1074,21 +1071,21 @@ 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:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "Ti serve davvero una chiave così lunga? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Le dimensioni della chiave richieste sono %u bit\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "arrotondate a %u bit\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1103,29 +1100,29 @@ msgstr "" " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "Chiave valida per? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "valore non valido\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "La chiave non scade\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "La chiave scadrà il %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "È giusto (s/n)? " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1141,39 +1138,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "Nome e Cognome: " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "Carattere non valido nel nome\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "Il nome non può iniziare con una cifra\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "Il nome deve essere lungo almeno 5 caratteri\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "Indirizzo di Email: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "L'indirizzo di email non è valido\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "Commento: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "Carattere non valido nel commento\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1184,15 +1181,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:663 +#: g10/keygen.c:670 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:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1200,11 +1197,11 @@ msgstr "" "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "passphrase non ripetuta correttamente; riprova.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 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" @@ -1216,7 +1213,7 @@ msgstr "" "programma con l'opzione \"--edit-key\".\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1230,33 +1227,33 @@ msgstr "" "generatore di numeri casuali la possibilità di raccogliere abbastanza\n" "entropia.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "Una chiave può essere generata solo in modo interattivo\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "La coppia DSA avrà 1024 bit.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 msgid "Key generation cancelled.\n" msgstr "Generazione della chiave annullata.\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "scrittura del certificato pubblico in '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "scrittura del certificato privato in '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1265,12 +1262,12 @@ msgstr "" "vorrai usare il comando \"--add-key\" per generare una chiave secondaria\n" "per questo scopo.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 msgid "Really create? " msgstr "Crea davvero? " @@ -1296,11 +1293,26 @@ msgid "reading from '%s'\n" msgstr "lettura da '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s crittografato per: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: utente non trovato\n" + +#: g10/export.c:123 +#, c-format +msgid "certificate read problem: %s\n" +msgstr "" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" + +#: g10/export.c:174 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" @@ -1416,7 +1428,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 #, c-format msgid "writing to '%s'\n" msgstr "scrittura in '%s'\n" @@ -2044,6 +2056,22 @@ msgstr "impossibile aprire '%s': %s\n" msgid "WARNING: Program may create a core file!\n" msgstr "" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"L'uso di chiavi RSA è deprecato; per favore in futuro considera di creare e\n" +"usare una nuova chiave.\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, fuzzy, c-format msgid "can't handle public key algorithm %d\n" @@ -2120,7 +2148,7 @@ msgstr "l'algoritmo di protezione %d non msgid "Invalid passphrase; please try again ...\n" msgstr "Passphrase non valida; riprova...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 #, fuzzy msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" @@ -2149,7 +2177,7 @@ msgstr "attenzione: firma della chiave scaduta il %s\n" msgid "%s signature from: %s\n" msgstr "Firma NON corretta da \"" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:564 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: impossibile creare: %s\n" @@ -2932,99 +2960,104 @@ msgstr "pklist.user_id.enter" msgid "keygen.algo" msgstr "keygen.algo" -#: g10/helptext.c:80 +#: g10/helptext.c:79 +#, fuzzy +msgid "keygen.algo.elg_se" +msgstr "keygen.algo" + +#: g10/helptext.c:86 msgid "keygen.size" msgstr "keygen.size" -#: g10/helptext.c:84 +#: g10/helptext.c:90 msgid "keygen.size.huge.okay" msgstr "keygen.size.huge.okay" -#: g10/helptext.c:89 +#: g10/helptext.c:95 msgid "keygen.size.large.okay" msgstr "keygen.size.large.okay" -#: g10/helptext.c:94 +#: g10/helptext.c:100 msgid "keygen.valid" msgstr "keygen.valid" -#: g10/helptext.c:98 +#: g10/helptext.c:104 msgid "keygen.valid.okay" msgstr "keygen.valid.okay" -#: g10/helptext.c:103 +#: g10/helptext.c:109 msgid "keygen.name" msgstr "keygen.name" -#: g10/helptext.c:108 +#: g10/helptext.c:114 msgid "keygen.email" msgstr "keygen.email" -#: g10/helptext.c:112 +#: g10/helptext.c:118 msgid "keygen.comment" msgstr "keygen.comment" -#: g10/helptext.c:117 +#: g10/helptext.c:123 msgid "keygen.userid.cmd" msgstr "keygen.userid.cmd" -#: g10/helptext.c:126 +#: g10/helptext.c:132 msgid "keygen.sub.okay" msgstr "keygen.sub.okay" -#: g10/helptext.c:130 +#: g10/helptext.c:136 msgid "sign_uid.okay" msgstr "sign_uid.okay" -#: g10/helptext.c:135 +#: g10/helptext.c:141 msgid "change_passwd.empty.okay" msgstr "change_passwd.empty.okay" -#: g10/helptext.c:140 +#: g10/helptext.c:146 msgid "keyedit.cmd" msgstr "keyedit.cmd" -#: g10/helptext.c:144 +#: g10/helptext.c:150 msgid "keyedit.save.okay" msgstr "keyedit.save.okay" -#: g10/helptext.c:149 +#: g10/helptext.c:155 msgid "keyedit.cancel.okay" msgstr "keyedit.cancel.okay" -#: g10/helptext.c:153 +#: g10/helptext.c:159 msgid "keyedit.sign_all.okay" msgstr "keyedit.sign_all.okay" -#: g10/helptext.c:157 +#: g10/helptext.c:163 msgid "keyedit.remove.uid.okay" msgstr "keyedit.remove.uid.okay" -#: g10/helptext.c:162 +#: g10/helptext.c:168 msgid "keyedit.remove.subkey.okay" msgstr "keyedit.remove.subkey.okay" -#: g10/helptext.c:166 +#: g10/helptext.c:172 msgid "passphrase.enter" msgstr "passphrase.enter" -#: g10/helptext.c:173 +#: g10/helptext.c:179 msgid "passphrase.repeat" msgstr "passphrase.repeat" -#: g10/helptext.c:177 +#: g10/helptext.c:183 msgid "detached_signature.filename" msgstr "detached_signature.filename" -#: g10/helptext.c:181 +#: g10/helptext.c:187 msgid "openfile.overwrite.okay" msgstr "openfile.overwrite.okay" -#: g10/helptext.c:195 +#: g10/helptext.c:201 msgid "No help available" msgstr "Nessun aiuto disponibile" -#: g10/helptext.c:207 +#: g10/helptext.c:213 #, c-format msgid "No help available for '%s'" msgstr "Nessun aiuto disponibile per '%s'" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8cfa7ec25..e5431c181 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1998-12-08 14:48+0100\n" +"POT-Creation-Date: 1998-12-10 20:11+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" @@ -210,14 +210,14 @@ msgstr "... isto msgid "you found a bug ... (%s:%d)\n" msgstr "você encontrou um bug ... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:412 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: usando gerador de números aleatórios inseguro!\n" -#: cipher/random.c:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -228,7 +228,7 @@ msgstr "" "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -240,7 +240,7 @@ msgstr "" "para que o sistema possa coletar mais entropia!\n" "(São necessários mais %d bytes)\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -248,123 +248,123 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:162 +#: g10/g10.c:163 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "codifica dados" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "codifica apenas com criptografia simétrica" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "decodifica dados (padrão)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressões digitais" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "remove a chave do anel de chaves público" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "gera um certificado de revogação" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "lista apenas as seqüências de pacotes" -#: g10/g10.c:190 +#: g10/g10.c:192 msgid "export the ownertrust values" msgstr "exporta os valores de confiança" -#: g10/g10.c:192 +#: g10/g10.c:194 msgid "import ownertrust values" msgstr "importa os valores de confiança" -#: g10/g10.c:194 +#: g10/g10.c:196 msgid "|[NAMES]|update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confiança" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confiança" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "conserta um banco de dados de confiança danificado" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou \"stdin\"" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "imprime todos os \"digests\" de mensagens" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -374,145 +374,145 @@ msgstr "" "Opções:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "cria uma saída ascii com armadura" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "usa este identificador de usuário para assinar ou decodificar" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "usa este identificador de usuário para codificar" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nível de compressão N (0 desabilita)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "usa modo de texto canônico" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "usa como arquivo de saída" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "prolixo" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:221 +#: g10/g10.c:223 msgid "force v3 signatures" msgstr "força assinaturas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "processo de lote: nunca perguntar" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "assumir não para a maioria das perguntas" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "adiciona este anel de chaves à lista de anéis de chaves" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "adiciona este anel de chaves secreto à lista" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrão" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "lê opções do arquivo" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "estabelece parâmetros de depuração" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "habilita depuração completa" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|DA|escreve informações de status para este DA" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "não escreve pacotes de comentário" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "(o padrão é 1)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "(o padrão é 3)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega módulo de extensão ARQUIVO" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:242 +#: g10/g10.c:244 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:244 +#: g10/g10.c:246 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n" "frases secretas" -#: g10/g10.c:246 +#: g10/g10.c:248 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressão N" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes codificados" -#: g10/g10.c:259 +#: g10/g10.c:261 msgid "" "@\n" "Examples:\n" @@ -532,19 +532,19 @@ msgstr "" " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressões digitais\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:349 +#: g10/g10.c:351 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -552,7 +552,7 @@ msgstr "" "Sintaxe: gpgm [opções] [arquivos]\n" "Utilitário de manutenção do GnuPG\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -562,7 +562,7 @@ msgstr "" "assina, verifica, codifica ou decodifica\n" "a operação padrão depende dos dados de entrada\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -570,161 +570,153 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "Uso: gpgm [opções] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, c-format msgid "NOTE: no default option file '%s'\n" msgstr "NOTA: arquivo de opções padrão '%s' inexistente\n" -#: g10/g10.c:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "arquivo de opções '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "lendo opções de '%s'\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um mapa de caracteres válido\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na faixa 1 a 255\n" -#: g10/g10.c:837 +#: g10/g10.c:840 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:841 +#: g10/g10.c:844 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:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiança: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 msgid "--edit-key username [commands]" msgstr "--edit-key nome_do_usuário [comandos]" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key nome_do_usuário" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key nome_do_usuário" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuário] [anel_de_chaves]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo de distribuição inválido '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "impossível abrir '%s'\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e " -"usá-la no futuro\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "cabeçalho de armadura: " @@ -903,7 +895,7 @@ msgid "This key probably belongs to the owner\n" msgstr "Esta chave provavelmente pertence ao dono\n" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "Esta chave pertence a nós (nós temos a chave secreta)\n" #: g10/pkclist.c:330 @@ -1009,8 +1001,8 @@ msgstr " (%d) DSA e ElGamal (padr #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (assinatura e criptografia)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (apenas assinatura)\n" #: g10/keygen.c:393 #, c-format @@ -1019,23 +1011,28 @@ msgstr " (%d) ElGamal (apenas criptografia)\n" #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (apenas assinatura)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (assinatura e criptografia)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal em um pacote v3\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "Sua opção? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "Você realmente quer deletar as chaves selecionadas? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1048,19 +1045,19 @@ msgstr "" " tamanho padrão é 1024 bits\n" " tamanho máximo sugerido é 2048 bits\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "Que tamanho de chave você quer? (1024) " -#: g10/keygen.c:449 +#: g10/keygen.c:456 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA permite apenas tamanhos de 512 a 1024\n" -#: g10/keygen.c:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1068,11 +1065,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:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1080,21 +1077,21 @@ 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:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "Você realmente precisa de uma chave tão grande? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1110,29 +1107,29 @@ msgstr "" " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "A chave não expira nunca\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "A chave expira em %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "Está correto (s/n)? " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1148,39 +1145,39 @@ msgstr "" " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "O nome não deve começar com um dígito\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "Endereço de correio eletrônico: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "Endereço eletrônico inválido\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "Caractere inválido no comentário\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1191,15 +1188,15 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "NnCcEeVvSs" -#: g10/keygen.c:663 +#: g10/keygen.c:670 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (V)álido/(S)air? " -#: g10/keygen.c:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1207,11 +1204,11 @@ msgstr "" "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 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" @@ -1223,7 +1220,7 @@ msgstr "" "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1237,33 +1234,33 @@ msgstr "" "aleatórios\n" "uma chance melhor de conseguir entropia suficiente.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "A geração de chaves só pode ser feita em modo interativo\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "O par de chaves DSA terá 1024 bits.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 msgid "Key generation cancelled.\n" msgstr "Geração de chaves cancelada.\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "escrevendo certificado público para '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "escrevendo certificado privado para '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1272,12 +1269,12 @@ msgstr "" "o comando \"--add-key\" para gerar uma chave secundária para esse " "propósito.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 msgid "Really create? " msgstr "Realmente criar? " @@ -1303,11 +1300,26 @@ msgid "reading from '%s'\n" msgstr "lendo de '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s codificado para: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: usuário não encontrado\n" + +#: g10/export.c:123 +#, fuzzy, c-format +msgid "certificate read problem: %s\n" +msgstr "erro de leitura do usuário '%s': %s\n" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" + +#: g10/export.c:174 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" @@ -1422,7 +1434,7 @@ msgstr "chave %08lX: chave p msgid "no default public keyring\n" msgstr "sem anel de chaves público padrão\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 #, c-format msgid "writing to '%s'\n" msgstr "escrevendo para '%s'\n" @@ -2049,6 +2061,22 @@ msgstr "imposs msgid "WARNING: Program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e " +"usá-la no futuro\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, c-format msgid "can't handle public key algorithm %d\n" @@ -2121,7 +2149,7 @@ msgstr "algoritmo de prote msgid "Invalid passphrase; please try again ...\n" msgstr "Frase secreta inválida; por favor tente novamente ...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "" "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n" @@ -2147,7 +2175,7 @@ msgstr "NOTA: chave de assinatura expirou %s\n" msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:564 #, c-format msgid "can't create %s: %s\n" msgstr "impossível criar %s: %s\n" @@ -2937,99 +2965,103 @@ msgstr "" msgid "keygen.algo" msgstr "" -#: g10/helptext.c:80 +#: g10/helptext.c:79 +msgid "keygen.algo.elg_se" +msgstr "" + +#: g10/helptext.c:86 msgid "keygen.size" msgstr "" -#: g10/helptext.c:84 +#: g10/helptext.c:90 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:95 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:94 +#: g10/helptext.c:100 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:98 +#: g10/helptext.c:104 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:109 msgid "keygen.name" msgstr "" -#: g10/helptext.c:108 +#: g10/helptext.c:114 msgid "keygen.email" msgstr "" -#: g10/helptext.c:112 +#: g10/helptext.c:118 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:117 +#: g10/helptext.c:123 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:126 +#: g10/helptext.c:132 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:130 +#: g10/helptext.c:136 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:135 +#: g10/helptext.c:141 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:140 +#: g10/helptext.c:146 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:144 +#: g10/helptext.c:150 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:149 +#: g10/helptext.c:155 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:153 +#: g10/helptext.c:159 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:157 +#: g10/helptext.c:163 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:162 +#: g10/helptext.c:168 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/helptext.c:166 +#: g10/helptext.c:172 msgid "passphrase.enter" msgstr "" -#: g10/helptext.c:173 +#: g10/helptext.c:179 msgid "passphrase.repeat" msgstr "" -#: g10/helptext.c:177 +#: g10/helptext.c:183 msgid "detached_signature.filename" msgstr "" -#: g10/helptext.c:181 +#: g10/helptext.c:187 msgid "openfile.overwrite.okay" msgstr "" -#: g10/helptext.c:195 +#: g10/helptext.c:201 msgid "No help available" msgstr "Nenhuma ajuda disponível" -#: g10/helptext.c:207 +#: g10/helptext.c:213 #, c-format msgid "No help available for '%s'" msgstr "Nenhuma ajuda disponível para '%s'" diff --git a/po/ru.po b/po/ru.po index f466a0dfa..ec2603dc9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ # QingLong (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1998-12-08 14:48+0100\n" +"POT-Creation-Date: 1998-12-10 20:11+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -218,15 +218,15 @@ msgstr " msgid "you found a bug ... (%s:%d)\n" msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n" -#: cipher/random.c:379 +#: cipher/random.c:412 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n" -#: cipher/random.c:380 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" -"it compile - it is in no way a strong RNG!\n" +"it run - it is in no way a strong RNG!\n" "\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" @@ -237,7 +237,7 @@ msgstr "" "îå ðïìøúõêôåóø äáîîùíé óïúäáîîùíé üôïê ðòïçòáííïê!\n" "\n" -#: cipher/rndlinux.c:154 +#: cipher/rndlinux.c:116 #, c-format msgid "" "\n" @@ -248,7 +248,7 @@ msgstr "" "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n" "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n" -#: g10/g10.c:158 +#: g10/g10.c:159 msgid "" "@Commands:\n" " " @@ -256,128 +256,128 @@ msgstr "" "@ëÏÍÁÎÄÙ:\n" " " -#: g10/g10.c:161 +#: g10/g10.c:162 #, fuzzy msgid "|[file]|make a signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:162 +#: g10/g10.c:163 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:163 +#: g10/g10.c:164 msgid "make a detached signature" msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:164 +#: g10/g10.c:165 msgid "encrypt data" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" -#: g10/g10.c:165 +#: g10/g10.c:166 msgid "encryption only with symmetric cipher" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ" -#: g10/g10.c:166 +#: g10/g10.c:167 msgid "store only" msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ" -#: g10/g10.c:167 +#: g10/g10.c:168 msgid "decrypt data (default)" msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: g10/g10.c:168 +#: g10/g10.c:169 msgid "verify a signature" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:170 +#: g10/g10.c:171 msgid "list keys" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ" -#: g10/g10.c:171 +#: g10/g10.c:172 msgid "list keys and signatures" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ" -#: g10/g10.c:172 +#: g10/g10.c:173 msgid "check key signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" -#: g10/g10.c:173 +#: g10/g10.c:174 msgid "list keys and fingerprints" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\"" -#: g10/g10.c:174 +#: g10/g10.c:175 msgid "list secret keys" msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ" -#: g10/g10.c:176 +#: g10/g10.c:177 msgid "generate a new key pair" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)" -#: g10/g10.c:178 +#: g10/g10.c:179 msgid "remove key from the public keyring" msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ" -#: g10/g10.c:180 +#: g10/g10.c:181 msgid "sign or edit a key" msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ" -#: g10/g10.c:181 +#: g10/g10.c:182 msgid "generate a revocation certificate" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" -#: g10/g10.c:183 +#: g10/g10.c:184 msgid "export keys" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ" -#: g10/g10.c:185 +#: g10/g10.c:187 msgid "import/merge keys" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ" -#: g10/g10.c:187 +#: g10/g10.c:189 msgid "list only the sequence of packets" msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×" -#: g10/g10.c:190 +#: g10/g10.c:192 #, fuzzy msgid "export the ownertrust values" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:192 +#: g10/g10.c:194 #, fuzzy msgid "import ownertrust values" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:194 +#: g10/g10.c:196 #, fuzzy msgid "|[NAMES]|update the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:196 +#: g10/g10.c:198 msgid "|[NAMES]|check the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:197 +#: g10/g10.c:199 msgid "fix a corrupted trust database" msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:198 +#: g10/g10.c:200 msgid "De-Armor a file or stdin" msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ" -#: g10/g10.c:199 +#: g10/g10.c:201 msgid "En-Armor a file or stdin" msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ" -#: g10/g10.c:200 +#: g10/g10.c:202 msgid "|algo [files]|print message digests" msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ" -#: g10/g10.c:201 +#: g10/g10.c:203 msgid "print all message digests" msgstr "ÎÁÐÅÞÁÔÁÔØ ×ÓÅ ÄÁÊÄÖÅÓÔÙ ÓÏÏÂÝÅÎÉÑ" -#: g10/g10.c:208 +#: g10/g10.c:210 msgid "" "@\n" "Options:\n" @@ -387,147 +387,147 @@ msgstr "" "ðÁÒÁÍÅÔÒÙ:\n" " " -#: g10/g10.c:210 +#: g10/g10.c:212 msgid "create ascii armored output" msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ" -#: g10/g10.c:212 +#: g10/g10.c:214 msgid "use this user-id to sign or decrypt" msgstr "" "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ" -#: g10/g10.c:213 +#: g10/g10.c:215 msgid "use this user-id for encryption" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ" -#: g10/g10.c:214 +#: g10/g10.c:216 msgid "|N|set compress level N (0 disables)" msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)" -#: g10/g10.c:216 +#: g10/g10.c:218 msgid "use canonical text mode" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ" -#: g10/g10.c:218 +#: g10/g10.c:220 msgid "use as output file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: g10/g10.c:219 +#: g10/g10.c:221 msgid "verbose" msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ" -#: g10/g10.c:220 +#: g10/g10.c:222 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:221 +#: g10/g10.c:223 #, fuzzy msgid "force v3 signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:223 +#: g10/g10.c:225 msgid "batch mode: never ask" msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ" -#: g10/g10.c:224 +#: g10/g10.c:226 msgid "assume yes on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:225 +#: g10/g10.c:227 msgid "assume no on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:226 +#: g10/g10.c:228 msgid "add this keyring to the list of keyrings" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:227 +#: g10/g10.c:229 msgid "add this secret keyring to the list" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:228 +#: g10/g10.c:230 msgid "|NAME|use NAME as default secret key" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: g10/g10.c:229 +#: g10/g10.c:231 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:230 +#: g10/g10.c:232 msgid "read options from file" msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ" -#: g10/g10.c:232 +#: g10/g10.c:234 msgid "set debugging flags" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ" -#: g10/g10.c:233 +#: g10/g10.c:235 msgid "enable full debugging" msgstr "ÒÁÚÒÅÛÉÔØ ×ÓÀ ÏÔÌÁÄËÕ" -#: g10/g10.c:234 +#: g10/g10.c:236 msgid "|FD|write status info to this FD" msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)" -#: g10/g10.c:235 +#: g10/g10.c:237 msgid "do not write comment packets" msgstr "ÎÅ ÐÉÓÁÔØ ÐÁËÅÔÙ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ" -#: g10/g10.c:236 +#: g10/g10.c:238 msgid "(default is 1)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 1)" -#: g10/g10.c:237 +#: g10/g10.c:239 msgid "(default is 3)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 3)" -#: g10/g10.c:239 +#: g10/g10.c:241 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:240 +#: g10/g10.c:242 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ" -#: g10/g10.c:241 +#: g10/g10.c:243 msgid "emulate the mode described in RFC1991" msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991" -#: g10/g10.c:242 +#: g10/g10.c:244 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n" -#: g10/g10.c:244 +#: g10/g10.c:246 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:246 +#: g10/g10.c:248 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:248 +#: g10/g10.c:250 msgid "|NAME|use cipher algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:249 +#: g10/g10.c:251 msgid "|NAME|use message digest algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ" -#: g10/g10.c:250 +#: g10/g10.c:252 msgid "|N|use compress algorithm N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N" -#: g10/g10.c:251 +#: g10/g10.c:253 msgid "throw keyid field of encrypted packets" msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×" -#: g10/g10.c:259 +#: g10/g10.c:261 #, fuzzy msgid "" "@\n" @@ -548,21 +548,21 @@ msgstr "" " --list-keys [names] ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n" " --fingerprint [names] ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n" -#: g10/g10.c:337 +#: g10/g10.c:339 msgid "Please report bugs to .\n" msgstr "" "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ " ".\n" -#: g10/g10.c:342 +#: g10/g10.c:344 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" -#: g10/g10.c:344 +#: g10/g10.c:346 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" -#: g10/g10.c:349 +#: g10/g10.c:351 #, fuzzy msgid "" "Syntax: gpgm [options] [files]\n" @@ -571,7 +571,7 @@ msgstr "" "óÉÎÔÁËÓÉÓ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ]\n" "ðÒÏÇÒÁÍÍÁ ÓÏÐÒÏ×ÏÖÄÅÎÉÑ GNUPG\n" -#: g10/g10.c:352 +#: g10/g10.c:354 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -581,7 +581,7 @@ msgstr "" "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n" "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "\n" "Supported algorithms:\n" @@ -589,163 +589,155 @@ msgstr "" "\n" "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n" -#: g10/g10.c:433 +#: g10/g10.c:435 msgid "usage: gpgm [options] " msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] " -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "usage: gpg [options] " msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] " -#: g10/g10.c:476 +#: g10/g10.c:478 msgid "conflicting commands\n" msgstr "Widersprüchliche Kommandos\n" -#: g10/g10.c:614 +#: g10/g10.c:616 #, fuzzy, c-format msgid "NOTE: no default option file '%s'\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ '%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" -#: g10/g10.c:618 +#: g10/g10.c:620 #, c-format msgid "option file '%s': %s\n" msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× '%s': %s\n" -#: g10/g10.c:625 +#: g10/g10.c:627 #, c-format msgid "reading options from '%s'\n" msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ '%s'\n" -#: g10/g10.c:773 +#: g10/g10.c:776 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" -#: g10/g10.c:807 g10/g10.c:819 +#: g10/g10.c:810 g10/g10.c:822 msgid "selected cipher algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n" -#: g10/g10.c:813 g10/g10.c:825 +#: g10/g10.c:816 g10/g10.c:828 msgid "selected digest algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" -#: g10/g10.c:828 +#: g10/g10.c:831 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n" -#: g10/g10.c:830 +#: g10/g10.c:833 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n" -#: g10/g10.c:832 +#: g10/g10.c:835 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n" -#: g10/g10.c:834 +#: g10/g10.c:837 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:837 +#: g10/g10.c:840 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n" -#: g10/g10.c:841 +#: g10/g10.c:844 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n" -#: g10/g10.c:924 +#: g10/g10.c:927 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" -#: g10/g10.c:930 +#: g10/g10.c:933 msgid "--store [filename]" msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:938 +#: g10/g10.c:941 msgid "--symmetric [filename]" msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:946 +#: g10/g10.c:949 msgid "--encrypt [filename]" msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:959 +#: g10/g10.c:962 msgid "--sign [filename]" msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:972 +#: g10/g10.c:975 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:986 +#: g10/g10.c:989 msgid "--clearsign [filename]" msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:998 +#: g10/g10.c:1001 msgid "--decrypt [filename]" msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1007 +#: g10/g10.c:1010 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1023 +#: g10/g10.c:1026 msgid "--delete-secret-key username" msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1026 +#: g10/g10.c:1029 msgid "--delete-key username" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/encode.c:216 g10/g10.c:1049 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1052 g10/sign.c:301 #, c-format msgid "can't open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s': %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1063 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]" -#: g10/g10.c:1116 +#: g10/g10.c:1120 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1124 +#: g10/g10.c:1128 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1190 +#: g10/g10.c:1194 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ '%s'\n" -#: g10/g10.c:1269 +#: g10/g10.c:1273 msgid "[filename]" msgstr "[ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1273 +#: g10/g10.c:1277 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1276 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1280 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s'\n" -#: g10/g10.c:1325 -msgid "" -"RSA keys are deprecated; please consider creating a new key and use this key " -"in the future\n" -msgstr "" -"ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n" -"ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\n" - #: g10/armor.c:344 g10/armor.c:391 msgid "armor header: " msgstr "" @@ -924,7 +916,7 @@ msgid "This key probably belongs to the owner\n" msgstr "" #: g10/pkclist.c:305 -msgid "This key belongs to us (we have the secret key)\n" +msgid "This key belongs to us\n" msgstr "" #: g10/pkclist.c:330 @@ -1031,8 +1023,8 @@ msgstr " (%d) DSA #: g10/keygen.c:391 #, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n" +msgid " (%d) DSA (sign only)\n" +msgstr " (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n" #: g10/keygen.c:393 #, c-format @@ -1041,23 +1033,28 @@ msgstr " (%d) ElGamal ( #: g10/keygen.c:394 #, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n" +msgid " (%d) ElGamal (sign and encrypt)\n" +msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n" -#: g10/keygen.c:395 +#: g10/keygen.c:396 #, c-format msgid " (%d) ElGamal in a v3 packet\n" msgstr " (%d) ElGamal × v3-ÐÁËÅÔÅ\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 msgid "Your selection? " msgstr "÷ÁÛ ×ÙÂÏÒ? " -#: g10/keygen.c:425 +#: g10/keygen.c:411 +#, fuzzy +msgid "Do you really want to create a sign and encrypt key? " +msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? " + +#: g10/keygen.c:432 msgid "Invalid selection.\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n" -#: g10/keygen.c:437 +#: g10/keygen.c:444 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1070,19 +1067,19 @@ msgstr "" " ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n" " ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n" -#: g10/keygen.c:444 +#: g10/keygen.c:451 msgid "What keysize do you want? (1024) " msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)" -#: g10/keygen.c:449 +#: g10/keygen.c:456 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n" -#: g10/keygen.c:451 +#: g10/keygen.c:458 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n" -#: g10/keygen.c:454 +#: g10/keygen.c:461 #, fuzzy msgid "" "Keysizes larger than 2048 are not suggested because\n" @@ -1091,11 +1088,11 @@ msgstr "" "ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ " "ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n" -#: g10/keygen.c:457 +#: g10/keygen.c:464 msgid "Are you sure that you want this keysize? " msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? " -#: g10/keygen.c:458 +#: g10/keygen.c:465 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1103,21 +1100,21 @@ msgstr "" "ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n" "ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n" -#: g10/keygen.c:466 +#: g10/keygen.c:473 msgid "Do you really need such a large keysize? " msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? " -#: g10/keygen.c:472 +#: g10/keygen.c:479 #, c-format msgid "Requested keysize is %u bits\n" msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n" -#: g10/keygen.c:475 g10/keygen.c:479 +#: g10/keygen.c:482 g10/keygen.c:486 #, c-format msgid "rounded up to %u bits\n" msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n" -#: g10/keygen.c:492 +#: g10/keygen.c:499 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1133,29 +1130,29 @@ msgstr "" " m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n" " y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n" -#: g10/keygen.c:507 +#: g10/keygen.c:514 msgid "Key is valid for? (0) " msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) " -#: g10/keygen.c:518 +#: g10/keygen.c:525 msgid "invalid value\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n" -#: g10/keygen.c:523 +#: g10/keygen.c:530 msgid "Key does not expire at all\n" msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n" #. print the date when the key expires -#: g10/keygen.c:529 +#: g10/keygen.c:536 #, c-format msgid "Key expires at %s\n" msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n" -#: g10/keygen.c:535 +#: g10/keygen.c:542 msgid "Is this correct (y/n)? " msgstr "üÔÏ ×ÅÒÎÏ? (y/n) " -#: g10/keygen.c:577 +#: g10/keygen.c:584 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1171,39 +1168,39 @@ msgstr "" " \"Vasya Pupkin (KRUTOI) \"\n" "\n" -#: g10/keygen.c:588 +#: g10/keygen.c:595 msgid "Real name: " msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): " -#: g10/keygen.c:592 +#: g10/keygen.c:599 msgid "Invalid character in name\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n" -#: g10/keygen.c:594 +#: g10/keygen.c:601 msgid "Name may not start with a digit\n" msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n" -#: g10/keygen.c:596 +#: g10/keygen.c:603 msgid "Name must be at least 5 characters long\n" msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n" -#: g10/keygen.c:604 +#: g10/keygen.c:611 msgid "Email address: " msgstr "E-Mail: " -#: g10/keygen.c:616 +#: g10/keygen.c:623 msgid "Not a valid email address\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n" -#: g10/keygen.c:624 +#: g10/keygen.c:631 msgid "Comment: " msgstr "ëÏÍÍÅÎÔÁÒÉÊ: " -#: g10/keygen.c:630 +#: g10/keygen.c:637 msgid "Invalid character in comment\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" -#: g10/keygen.c:650 +#: g10/keygen.c:657 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1214,16 +1211,16 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:653 +#: g10/keygen.c:660 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:663 +#: g10/keygen.c:670 #, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? " -#: g10/keygen.c:715 +#: g10/keygen.c:722 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1231,11 +1228,11 @@ msgstr "" "äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n" "\n" -#: g10/keyedit.c:389 g10/keygen.c:723 +#: g10/keyedit.c:389 g10/keygen.c:730 msgid "passphrase not correctly repeated; try again.\n" msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n" -#: g10/keygen.c:729 +#: g10/keygen.c:736 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" @@ -1247,7 +1244,7 @@ msgstr "" "×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n" "\n" -#: g10/keygen.c:750 +#: g10/keygen.c:757 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (work in another window, move the mouse, utilize the\n" @@ -1259,34 +1256,34 @@ msgstr "" "ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n" "ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n" -#: g10/keygen.c:820 +#: g10/keygen.c:827 msgid "Key generation can only be used in interactive mode\n" msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ.\n" -#: g10/keygen.c:828 +#: g10/keygen.c:835 msgid "DSA keypair will have 1024 bits.\n" msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n" -#: g10/keygen.c:834 +#: g10/keygen.c:841 #, fuzzy msgid "Key generation cancelled.\n" msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n" -#: g10/keygen.c:844 +#: g10/keygen.c:851 #, c-format msgid "writing public certificate to '%s'\n" msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" -#: g10/keygen.c:845 +#: g10/keygen.c:852 #, c-format msgid "writing secret certificate to '%s'\n" msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" -#: g10/keygen.c:922 +#: g10/keygen.c:929 msgid "public and secret key created and signed.\n" msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n" -#: g10/keygen.c:924 +#: g10/keygen.c:931 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--add-key\" to generate a secondary key for this purpose.\n" @@ -1296,12 +1293,12 @@ msgstr "" "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n" "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n" -#: g10/keygen.c:938 g10/keygen.c:1023 +#: g10/keygen.c:945 g10/keygen.c:1030 #, c-format msgid "Key generation failed: %s\n" msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" -#: g10/keygen.c:1001 +#: g10/keygen.c:1008 #, fuzzy msgid "Really create? " msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? " @@ -1328,11 +1325,26 @@ msgid "reading from '%s'\n" msgstr "þÉÔÁÅÔÓÑ ÉÚ '%s'\n" #: g10/encode.c:397 -#, c-format -msgid "%s encrypted for: %s\n" +#, fuzzy, c-format +msgid "%s/%s encrypted for: %s\n" msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n" -#: g10/export.c:162 +#: g10/export.c:114 +#, fuzzy, c-format +msgid "%s: user not found: %s\n" +msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" + +#: g10/export.c:123 +#, c-format +msgid "certificate read problem: %s\n" +msgstr "" + +#: g10/export.c:132 +#, fuzzy, c-format +msgid "key %08lX: not a rfc2440 key - skipped\n" +msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" + +#: g10/export.c:174 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" @@ -1448,7 +1460,7 @@ msgstr " msgid "no default public keyring\n" msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" -#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:563 +#: g10/import.c:359 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:569 #, c-format msgid "writing to '%s'\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × '%s'\n" @@ -2099,6 +2111,22 @@ msgstr " msgid "WARNING: Program may create a core file!\n" msgstr "" +#: g10/misc.c:198 +msgid "Experimental algorithms should not be used!\n" +msgstr "" + +#: g10/misc.c:212 +msgid "" +"RSA keys are deprecated; please consider creating a new key and use this key " +"in the future\n" +msgstr "" +"ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n" +"ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\n" + +#: g10/misc.c:233 +msgid "This cipher algorithm is depreciated; please use a more standard one!\n" +msgstr "" + #: g10/parse-packet.c:109 #, fuzzy, c-format msgid "can't handle public key algorithm %d\n" @@ -2174,7 +2202,7 @@ msgstr " msgid "Invalid passphrase; please try again ...\n" msgstr "îÅÐÒÁ×ÉÌØÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á ...\n" -#: g10/seckey-cert.c:215 +#: g10/seckey-cert.c:216 #, fuzzy msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÎÁÒÕÖÅÎ ÓÌÁÂÙÊ ËÌÀÞ - ÓÍÅÎÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ.\n" @@ -2200,7 +2228,7 @@ msgstr " msgid "%s signature from: %s\n" msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/sign.c:200 g10/sign.c:558 +#: g10/sign.c:200 g10/sign.c:564 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" @@ -2988,82 +3016,86 @@ msgstr "" msgid "keygen.algo" msgstr "" -#: g10/helptext.c:80 +#: g10/helptext.c:79 +msgid "keygen.algo.elg_se" +msgstr "" + +#: g10/helptext.c:86 msgid "keygen.size" msgstr "" -#: g10/helptext.c:84 +#: g10/helptext.c:90 msgid "keygen.size.huge.okay" msgstr "" -#: g10/helptext.c:89 +#: g10/helptext.c:95 msgid "keygen.size.large.okay" msgstr "" -#: g10/helptext.c:94 +#: g10/helptext.c:100 msgid "keygen.valid" msgstr "" -#: g10/helptext.c:98 +#: g10/helptext.c:104 msgid "keygen.valid.okay" msgstr "" -#: g10/helptext.c:103 +#: g10/helptext.c:109 msgid "keygen.name" msgstr "" -#: g10/helptext.c:108 +#: g10/helptext.c:114 msgid "keygen.email" msgstr "" -#: g10/helptext.c:112 +#: g10/helptext.c:118 msgid "keygen.comment" msgstr "" -#: g10/helptext.c:117 +#: g10/helptext.c:123 msgid "keygen.userid.cmd" msgstr "" -#: g10/helptext.c:126 +#: g10/helptext.c:132 msgid "keygen.sub.okay" msgstr "" -#: g10/helptext.c:130 +#: g10/helptext.c:136 msgid "sign_uid.okay" msgstr "" -#: g10/helptext.c:135 +#: g10/helptext.c:141 msgid "change_passwd.empty.okay" msgstr "" -#: g10/helptext.c:140 +#: g10/helptext.c:146 msgid "keyedit.cmd" msgstr "" -#: g10/helptext.c:144 +#: g10/helptext.c:150 msgid "keyedit.save.okay" msgstr "" -#: g10/helptext.c:149 +#: g10/helptext.c:155 msgid "keyedit.cancel.okay" msgstr "" -#: g10/helptext.c:153 +#: g10/helptext.c:159 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/helptext.c:157 +#: g10/helptext.c:163 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/helptext.c:162 +#: g10/helptext.c:168 msgid "keyedit.remove.subkey.okay" msgstr "" # ################################ # ####### Help msgids ############ # ################################ -#: g10/helptext.c:166 +#: g10/helptext.c:172 msgid "passphrase.enter" msgstr "" "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" @@ -3078,27 +3110,27 @@ msgstr "" "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/helptext.c:173 +#: g10/helptext.c:179 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, daß Sie sich bei der Eingabe der \"Passphrase\" nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "übereinstimmen, wird die \"Passphrase\" akzeptiert." -#: g10/helptext.c:177 +#: g10/helptext.c:183 #, fuzzy msgid "detached_signature.filename" msgstr "ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÄÅÌØÎÏÊ ÐÏÄÐÉÓÉ" -#: g10/helptext.c:181 +#: g10/helptext.c:187 msgid "openfile.overwrite.okay" msgstr "÷Ù ÖÅÌÁÅÔÅ ÐÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ (×ÏÚÍÏÖÎÁ ÐÏÔÅÒÑ ÄÁÎÎÙÈ)" -#: g10/helptext.c:195 +#: g10/helptext.c:201 msgid "No help available" msgstr "ðÏÍÏÝØ ÏÔÓÕÔÓÔ×ÕÅÔ." -#: g10/helptext.c:207 +#: g10/helptext.c:213 #, c-format msgid "No help available for '%s'" msgstr "ðÏÍÏÝØ ÄÌÑ '%s' ÏÔÓÕÔÓÔ×ÕÅÔ." diff --git a/tools/ChangeLog b/tools/ChangeLog index bd342718a..0f956055b 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 10 20:15:36 CET 1998 Werner Koch + + * mpicalc.c (main): Moved initialization out of definition. + Mon May 18 15:39:22 1998 Werner Koch (wk@isil.d.shuttle.de) * mk-tdata.c: New. diff --git a/tools/mpicalc.c b/tools/mpicalc.c index 0e2980587..3d7ae37ca 100644 --- a/tools/mpicalc.c +++ b/tools/mpicalc.c @@ -211,12 +211,16 @@ main(int argc, char **argv) { static ARGPARSE_OPTS opts[] = { {0} }; - ARGPARSE_ARGS pargs = { &argc, &argv, 0 }; + ARGPARSE_ARGS pargs; int i, c; int state = 0; char strbuf[1000]; int stridx=0; + pargs.argc = &argc; + pargs.argv = &argv; + pargs.flags = 0; + i18n_init(); while( arg_parse( &pargs, opts) ) { switch( pargs.r_opt ) {