diff --git a/ChangeLog b/ChangeLog index 74dd88feb..d404c56a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Oct 9 20:34:41 CEST 1999 Werner Koch + + * configure.in: Tweaked handling of random modules and removed + dummy support for libgcrypt. + * Makefile.am: Removed libgcrypt support. + * cgrypt/ : Removed. + + * Makefile.am: Removed libtool. + Fri Oct 8 20:32:01 CEST 1999 Werner Koch * configure.in: Fixed quoting in test for development version. diff --git a/Makefile.am b/Makefile.am index bf6e3e2da..f78406b23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,25 +1,16 @@ ## Process this file with automake to produce Makefile.in -if COMPILE_LIBGCRYPT -gcrypt = gcrypt -my_clean_gcrypt = -else -gcrypt = -my_clean_gcrypt = gcrypt/Makefile -endif - if CROSS_COMPILING checks = else checks = checks endif -SUBDIRS = intl zlib util mpi cipher tools g10 po doc ${checks} ${gcrypt} +SUBDIRS = intl zlib util mpi cipher tools g10 po doc ${checks} EXTRA_DIST = VERSION PROJECTS BUGS # gettext never gets it right, so we take here care of deleting the -# symlink. my_clean_gcrypt is just a kludge until we can include -# libgcrypt. -DISTCLEANFILES = g10defs.h intl/libintl.h ${my_clean_gcrypt} +# symlink. +DISTCLEANFILES = g10defs.h intl/libintl.h dist-hook: @set -e; \ @@ -34,7 +25,6 @@ dist-hook: sed -e 's/@pkg_version@/$(VERSION)/g' \ $(top_srcdir)/scripts/gnupg.spec.in \ > $(distdir)/scripts/gnupg.spec - -rm $(distdir)/gcrypt/*.[ch] if MAINTAINER_MODE diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 13cd1f7d5..f263761a4 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 9 20:34:41 CEST 1999 Werner Koch + + * Makefile.am: Tweaked module build and removed libtool + Fri Oct 8 20:32:01 CEST 1999 Werner Koch * rndw32.c (load_and_init_winseed): Use the Registry to locate the DLL diff --git a/cipher/Makefile.am b/cipher/Makefile.am index e68ee19fc..ac637920e 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -3,17 +3,10 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -noinst_LTLIBRARIES = libcipher.la +noinst_LIBRARIES = libcipher.a -# The configure script greps the module names from the following lines. -# You must also add all these names to EXTRA_PROGRAMS some lines below -# and EXTRA_foo_SOURCES entries. -# Hmmm is there a more easy way to do this? (EXTRA_PROGRAMS -# might also list programs which are not modules) -# MODULES: rndunix rndlinux rndegd rndw32 -# MODULES: sha1 rmd160 md5 tiger -EXTRA_PROGRAMS = rndunix rndlinux rndegd rndw32 \ - sha1 rmd160 md5 tiger +# The configure script greps the module names from the EXTRA_PROGRAMS line +EXTRA_PROGRAMS = rndlinux rndunix rndegd rndw32 sha1 rmd160 md5 tiger EXTRA_rndlinux_SOURCES = rndlinux.c EXTRA_rndunix_SOURCES = rndunix.c @@ -34,8 +27,8 @@ endif DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@ -libcipher_la_LDFLAGS = -libcipher_la_SOURCES = cipher.c \ +#libcipher_a_LDFLAGS = +libcipher_a_SOURCES = cipher.c \ pubkey.c \ md.c \ dynload.c \ @@ -65,8 +58,8 @@ libcipher_la_SOURCES = cipher.c \ BUILT_SOURCES = construct.c -libcipher_la_DEPENDENCIES = @STATIC_CIPHER_OBJS@ -libcipher_la_LIBADD = @STATIC_CIPHER_OBJS@ +libcipher_a_DEPENDENCIES = @STATIC_CIPHER_OBJS@ +libcipher_a_LIBADD = @STATIC_CIPHER_OBJS@ # If I remember it correct, automake 1.4 has a feature to set @@ -99,9 +92,3 @@ rndlinux: $(srcdir)/rndlinux.c rndegd: $(srcdir)/rndegd.c $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c -# We need to have a better system for selection which modules -# to compile. For now this works. -rndw32: $(srcdir)/rndw32.c - echo "#!/bin/sh" >rndw32 - echo "Not usable as a module" >>rndw32 - diff --git a/configure.in b/configure.in index 9fd641499..d1e301bf3 100644 --- a/configure.in +++ b/configure.in @@ -17,13 +17,14 @@ VERSION=`cat $srcdir/VERSION` PACKAGE=gnupg ALL_LINGUAS="de es_ES fr id it pl pt_BR pt_PT ru" static_modules="sha1 md5 rmd160" +static_random_module="" AC_SUBST(VERSION) AC_SUBST(PACKAGE) AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -MODULES_IN_CIPHER=`awk '/# MODULES: / { for(i=3;i<=NF;i++) print $i}' \ - $srcdir/cipher/Makefile.am` +MODULES_IN_CIPHER=`awk '/^EXTRA_PROGRAMS/ { for(i=3;i<=NF;i++) print $i}' \ + $srcdir/cipher/Makefile.am` dnl dnl Check for random module options @@ -104,29 +105,6 @@ AC_ARG_WITH(included-zlib, [g10_force_zlib=yes], [g10_force_zlib=no] ) AC_MSG_RESULT($g10_force_zlib) -dnl -dnl Check wether we want to compile libgcrypt -dnl -AC_MSG_CHECKING([whether compilation of libgcrypt is requested]) -AC_ARG_ENABLE(libgcrypt, - [ --enable-libgcrypt compile the libgcrypt [default=no]], -[compile_libgcrypt="$enableval"],[compile_libgcrypt=no]) -AC_MSG_RESULT($compile_libgcrypt) -if test x$compile_libgcrypt = xyes ; then - if test -f $srcdir/gcrypt/gcrypt.h; then - : - else - compile_libgcrypt=no - AC_MSG_WARN([[ -*** -*** LIBGCRYPT is not yet ready for public testing. -*** Maybe you have more luck with the next release of GnuPG -*** Watch the gnupg-announce mailing list or the webpage. -***]]) - fi -fi -AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes) - dnl dnl Check whether we want to use Linux capabilities @@ -154,12 +132,13 @@ case "${target}" in # special stuff for Windoze NT # Do we need to set cross_compiling here or is it sufficient # to rely on AC_PROG_CC which is called later? - cross_compiling=yes CC="${target}-gcc" CPP="${target}-gcc -E" RANLIB="${target}-ranlib" + disallowed_modules="rndunix rndlinux rndegd" ;; *) + disallowed_modules="rndw32" ;; esac @@ -181,15 +160,6 @@ AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes) -dnl -dnl Build shared libraries only when compilation of libgcrypt -dnl has been requested -dnl -AM_DISABLE_SHARED -enable_shared="$compile_libgcrypt" -AM_PROG_LIBTOOL - - MPI_OPT_FLAGS="" if test "$GCC" = yes; then CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes" @@ -495,31 +465,29 @@ fi dnl -dnl Figure out the default linkage mode for cipher modules +dnl Figure out the default linkage mode for random modules dnl -dnl (We always need a static rmd160) print_egd_notice=no -static_modules="$static_modules rmd160" if test "$use_static_rnd" = default; then if test "$ac_cv_have_dev_random" = yes; then - static_modules="$static_modules rndlinux" + static_random_module="rndlinux" else case "${target}" in *-*-mingw32) - static_modules="$static_modules rndw32" + static_random_module="rndw32" AC_DEFINE(USE_STATIC_RNDW32) ;; i?86-emx-os2|i?86-*-os2*emx) - static_modules="$static_modules rndos2" + static_random_module="rndos2" ;; m68k-atari-mint) - static_modules="$static_modules rndatari" + static_random_module="rndatari" ;; i?86-*-msdosdjgpp*) - static_modules="$static_modules" + : ;; *) - static_modules="$static_modules rndunix" + static_random_module="rndunix" print_egd_notice=yes ;; esac @@ -528,7 +496,7 @@ else if test "$use_static_rnd" = none; then : else - static_modules="$static_modules rnd$use_static_rnd" + static_random_module="rnd$use_static_rnd" if test "$use_static_rnd" = "unix"; then print_egd_notice=yes fi @@ -561,23 +529,31 @@ dnl dnl Parse the modules list and build the list dnl of static and dymically linked modules dnl +dnl (We always need a static rmd160) +static_modules="$static_modules rmd160 $static_random_module" STATIC_CIPHER_NAMES="" STATIC_CIPHER_OBJS="" DYNAMIC_CIPHER_MODS="" GNUPG_MSG_PRINT([dynamically linked cipher modules:]) for name in $MODULES_IN_CIPHER; do - x="no" - for i in $static_modules; do - if test "$name" = "$i" ; then - x="yes" - fi + x="yes" + for i in $disallowed_modules; do + if test "$name" = "$i" ; then x="no" ; fi done; if test $x = yes; then - STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name" - STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.lo" - else - DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name" - GNUPG_MSG_PRINT([$name]) + x="no" + for i in $static_modules; do + if test "$name" = "$i" ; then + x="yes" + fi + done; + if test $x = yes; then + STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name" + STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.o" + else + DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name" + GNUPG_MSG_PRINT([$name]) + fi fi done AC_MSG_RESULT() @@ -644,7 +620,7 @@ if test "$ac_cv_mpi_extra_asm_modules" != ""; then GNUPG_MSG_PRINT([mpi extra asm functions:]) for i in $ac_cv_mpi_extra_asm_modules; do GNUPG_MSG_PRINT([$i]) - MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo" + MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o" done AC_MSG_RESULT() fi @@ -732,7 +708,6 @@ doc/gph/Makefile tools/Makefile zlib/Makefile checks/Makefile -gcrypt/Makefile ]) dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/g10/Makefile.am b/g10/Makefile.am index af727cda8..6170b1691 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl EXTRA_DIST = OPTIONS pubring.asc options.skel OMIT_DEPENDENCIES = zlib.h zconf.h LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@ -needed_libs = ../cipher/libcipher.la ../mpi/libmpi.la ../util/libutil.la +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a #noinst_PROGRAMS = gpgd bin_PROGRAMS = gpg diff --git a/mpi/ChangeLog b/mpi/ChangeLog index bc9fa0835..c6f9e4f29 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 9 20:34:41 CEST 1999 Werner Koch + + * Makefile.am: Removed libtool. + Mon Aug 30 20:38:33 CEST 1999 Werner Koch * config.links: Add case label for DJGPP diff --git a/mpi/Makefile.am b/mpi/Makefile.am index ef9816aa5..3bba762b2 100644 --- a/mpi/Makefile.am +++ b/mpi/Makefile.am @@ -11,10 +11,10 @@ DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S \ # Note: we only use .S files so we should delete all left over .s CLEANFILES = *.s -noinst_LTLIBRARIES = libmpi.la +noinst_LIBRARIES = libmpi.a -libmpi_la_LDFLAGS = -libmpi_la_SOURCES = longlong.h \ +# libmpi_a_LDFLAGS = +libmpi_a_SOURCES = longlong.h \ mpi-add.c \ mpi-bit.c \ mpi-cmp.c \ @@ -37,16 +37,16 @@ libmpi_la_SOURCES = longlong.h \ # Note this objects are actually links, the sourcefiles are # distributed by special code in dist-hook -common_asm_objects = mpih-mul1.lo \ - mpih-mul2.lo \ - mpih-mul3.lo \ - mpih-add1.lo \ - mpih-sub1.lo \ - mpih-lshift.lo \ - mpih-rshift.lo +common_asm_objects = mpih-mul1.o \ + mpih-mul2.o \ + mpih-mul3.o \ + mpih-add1.o \ + mpih-sub1.o \ + mpih-lshift.o \ + mpih-rshift.o -libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ -libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ +libmpi_a_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ +libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ # cancel the default rules used by libtool which do not really # work and add one to cpp .S files diff --git a/po/de.po b/po/de.po index 08353eb54..f1df470a2 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ # Walter Koch , 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-09-04 22:36+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -654,176 +654,176 @@ msgstr "Aufruf: gpg [Optionen] " msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "Die angegebene URL für Richtlinien ist ungültig\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, 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:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:973 +#: g10/g10.c:968 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key User-ID" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key User-ID" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "Das erste Zeichen eines \"notation\"-Namens muß ein Buchstabe oder\n" "ein Unterstrich sein\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -831,12 +831,12 @@ msgstr "" "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" @@ -2596,6 +2596,11 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d Beglaubigungen entfernt.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " @@ -2740,7 +2745,7 @@ msgstr "%s: Verzeichnis erzeugt\n" msgid "%s: directory does not exist!\n" msgstr "%s: Verzeichnis existiert nicht!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kann nicht erzeugt werden: %s\n" @@ -3148,26 +3153,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: Schlüsselbund kann nicht erzeugt werden: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: Schlüsselbund erstellt\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s ist der Unveränderte\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s ist der Neue\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n" diff --git a/po/es_ES.po b/po/es_ES.po index ec3aa0e42..8dc312336 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ # GPG version: 0.9.7 msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-06-06 18:33+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" @@ -665,189 +665,189 @@ msgstr "uso: gpg [opciones] " msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado no es válido\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es válido\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:964 +#: g10/g10.c:959 #, 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:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 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:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1148 +#: g10/g10.c:1143 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/g10.c:1156 +#: g10/g10.c:1151 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key nombre_usuario [comandos]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1175 +#: g10/g10.c:1170 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 #, fuzzy msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución no válido `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "" @@ -2621,6 +2621,11 @@ msgstr "Repita contrase msgid "data not saved; use option \"--output\" to save it\n" msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d firmas incorrectas\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " @@ -2759,7 +2764,7 @@ msgstr "%s: directorio creado\n" msgid "%s: directory does not exist!\n" msgstr "%s: ¡el directorio no existe!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: no puede crearse: %s\n" @@ -3168,26 +3173,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: no se puede crear el anillo: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: anillo creado\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s es el que no se ha modificado\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s es el nuevo\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Por favor arregle este posible fallo de seguridad\n" diff --git a/po/fr.po b/po/fr.po index aba894150..60fbdc656 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.1\n" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-10-06 21:43+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -653,176 +653,176 @@ msgstr "utilisation: gpg [options] " msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, 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:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caractères valide\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE : %s n'est pas pour une utilisation normale !\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "l'URL de politique donnée est invalide\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "« completes-needed » doit être supérieur à 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "« marginals-needed » doit être supérieur à 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "« max-cert-depth » doit être compris entre 1 et 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 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:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance : %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key utilisateur" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossible d'ouvrir %s: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non réussie : %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non réussie : %s \n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "impossible d'ouvrir `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "le premier caractère du nom d'une notation doit être un lettre ou un trait\n" "de soulignement\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -831,13 +831,13 @@ msgstr "" "des points ou des traits de soulignement et doit se terminer par un signe " "égal\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "les points dans le nom d'une notation doivent être entourés d'autes " "caractères\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n" @@ -2579,6 +2579,11 @@ msgstr "" "données non enregistrées ; utilisez l'option \"--output\" pour\n" "les enregistrer\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d signature supprimée.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de données : " @@ -2722,7 +2727,7 @@ msgstr "%s : r msgid "%s: directory does not exist!\n" msgstr "%s : le répertoire n'existe pas !\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s : impossible de créer : %s\n" @@ -3142,27 +3147,27 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s : impossible de créer le porte-clés : %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s : porte-clés créé\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s est le fichier original\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s est le nouveau\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Réparez ce problème de sécurité possible\n" diff --git a/po/id.po b/po/id.po index 0e218d459..e8e298f88 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU Privacy Guard 1.0.0\n" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-09-17 15:21+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesia \n" @@ -646,174 +646,174 @@ msgstr "pemakaian: gpg [pilihan] " msgid "conflicting commands\n" msgstr "perintah saling konflik\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "kebijakan URL yang diberikan tidak valid\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritma kompresi harus di antara %d..%d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:977 +#: g10/g10.c:972 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key id-user" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key id-user" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "tidak dapat membuka %s: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "tidak dapat membuka `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -821,11 +821,11 @@ msgstr "" "nama notasi terdiri hanya dari huruf, digit, titik atau garis bawah dan " "diakhiri dengan sebuah '='\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" @@ -2545,6 +2545,11 @@ msgstr "Ulangi passphrase: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "Menghapus %d signature.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Silakan masukkan nama file data: " @@ -2681,7 +2686,7 @@ msgstr "%s: direktori tercipta\n" msgid "%s: directory does not exist!\n" msgstr "%s: direktori tidak ada!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: tidak dapat membuat: %s\n" @@ -3081,26 +3086,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: tidak dapat membuat keyring: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: keyring tercipta\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s adalah yang tidak berubah\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s adalah yang baru\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Silakan perbaikan kemungkinan lubang keamanan\n" diff --git a/po/it.po b/po/it.po index fa6ac514a..1a17a0378 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.0\n" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-09-09 15:51+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -650,176 +650,176 @@ msgstr "uso: gpg [opzioni] " msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "L'URL della policy indicato non è valido\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, 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:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key user-id" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key user-id" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "il primo carattere del nome di una nota deve essere una lettera o un\n" "underscore\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -827,11 +827,11 @@ msgstr "" "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n" "underscore e deve finire con `='\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" @@ -2560,6 +2560,11 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "Cancellata %d firma.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " @@ -2700,7 +2705,7 @@ msgstr "%s: directory creata\n" msgid "%s: directory does not exist!\n" msgstr "%s: la directory non esiste!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossibile creare: %s\n" @@ -3104,26 +3109,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: impossibile creare il portachiavi: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: portachiavi creato\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s è quello non modificato\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s è quello nuovo\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Per favore risolvete questo possibile problema di sicurezza\n" diff --git a/po/pl.po b/po/pl.po index 6d44061d3..fe549c581 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.0\n" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-10-02 21:35+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -660,174 +660,174 @@ msgstr "wywo msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji '%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z '%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s jest niedozwolony z %s!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu z %s!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "podany URL regulaminu jest niepoprawny\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ustawienie algortytmu kompresji musi pochodziæ z zakresu %d..%d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:977 +#: g10/g10.c:972 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [plik]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key nazwa u¿ytkownika" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key nazwa u¿ytkownika" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "usuniêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu '%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "nie mo¿na otworzyæ '%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "adnotacja musi zaczynaæ siê od litery lub podkre¶lenia\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -835,11 +835,11 @@ msgstr "" "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n" "podkre¶lenia, i musi koñczyæ siê '='\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "kropki w adnotacji musz± znajdowaæ siê pomiêdzy innymi znakami\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" @@ -2590,6 +2590,11 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "dane nie zosta³y zapisane; nale¿y u¿yæ opcji \"--output\" aby je zapisaæ\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d podpis usuniêty.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Nazwa pliku danych: " @@ -2732,7 +2737,7 @@ msgstr "%s: katalog utworzony\n" msgid "%s: directory does not exist!\n" msgstr "%s: katalog nie istnieje!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: nie mo¿na utworzyæ: %s\n" @@ -3136,26 +3141,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: stworzenie zbioru kluczy jest niemo¿liwe: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: zbiór kluczy utworzony\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "OSTRZE¯ENIE: Istniej± dwa pliki z poufnymi informacjami.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s pozosta³ bez zmian\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s zosta³ utworzony\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7acd27233..e130470dd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" @@ -677,177 +677,177 @@ msgstr "uso: gpg [op msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 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:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key id-usuário" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key id-usuário" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "o primeiro caractere de um nome de notação deve ser uma letra ou um " "sublinhado\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -855,12 +855,12 @@ msgstr "" "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "pontos em um nome de notação devem estar cercados por outros caracteres\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" @@ -2601,6 +2601,11 @@ msgstr "Repita a frase secreta: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados não salvos; use a opção \"--output\" para salvá-los\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d assinatura removida.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " @@ -2738,7 +2743,7 @@ msgstr "%s: diret msgid "%s: directory does not exist!\n" msgstr "%s: diretório inexistente!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossível criar: %s\n" @@ -3143,26 +3148,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: impossível criar chaveiro: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: chaveiro criado\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: existem 2 arquivos com informações confidenciais.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o não modificado\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Por favor conserte este possível furo de segurança\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 9a0af35fa..2b414298f 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" -"POT-Creation-Date: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "PO-Revision-Date: 1999-09-09 20:28+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt\n" @@ -667,177 +667,177 @@ msgstr "uso: gpg [op msgid "conflicting commands\n" msgstr "comandos em conflito\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opções `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado não é válido\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:973 +#: g10/g10.c:968 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:977 +#: g10/g10.c:972 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:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:1148 +#: g10/g10.c:1143 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:1156 +#: g10/g10.c:1151 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:1172 +#: g10/g10.c:1167 msgid "--delete-secret-key user-id" msgstr "--delete-secret-key id-utilizador" -#: g10/g10.c:1175 +#: g10/g10.c:1170 msgid "--delete-key user-id" msgstr "--delete-key id-utilizador" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" "o primeiro caracter de um nome de notação deve ser uma letra ou um " "sublinhado\n" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -845,12 +845,12 @@ msgstr "" "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" "pontos num nome de notação devem estar cercados por outros caracteres\n" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" @@ -2581,6 +2581,11 @@ msgstr "Repita a frase secreta: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados não gravados; use a opção \"--output\" para gravá-los\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d assinatura removida.\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do ficheiro de dados: " @@ -2718,7 +2723,7 @@ msgstr "%s: directoria criada\n" msgid "%s: directory does not exist!\n" msgstr "%s: diretoria inexistente!\n" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossível criar: %s\n" @@ -3122,26 +3127,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: impossível criar porta-chaves: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, c-format msgid "%s: keyring created\n" msgstr "%s: porta-chaves criado\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: existem 2 ficheiros com informações confidenciais.\n" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o não modificado\n" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "Por favor conserte esta possível falha de segurança\n" diff --git a/po/ru.po b/po/ru.po index 72589cfdb..045dab85e 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: 1999-10-04 21:57+0200\n" +"POT-Creation-Date: 1999-10-09 18:42+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck \n" @@ -724,190 +724,190 @@ msgstr " msgid "conflicting commands\n" msgstr "Widersprüchliche Kommandos\n" -#: g10/g10.c:658 +#: g10/g10.c:662 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" -#: g10/g10.c:662 +#: g10/g10.c:666 #, c-format msgid "option file `%s': %s\n" msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n" -#: g10/g10.c:669 +#: g10/g10.c:673 #, c-format msgid "reading options from `%s'\n" msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n" -#: g10/g10.c:851 +#: g10/g10.c:855 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" -#: g10/g10.c:915 g10/g10.c:924 +#: g10/g10.c:910 g10/g10.c:919 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:917 +#: g10/g10.c:912 #, c-format msgid "%s not allowed with %s!\n" msgstr "" -#: g10/g10.c:920 +#: g10/g10.c:915 #, c-format msgid "%s makes no sense with %s!\n" msgstr "" -#: g10/g10.c:939 g10/g10.c:951 +#: g10/g10.c:934 g10/g10.c:946 msgid "selected cipher algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n" -#: g10/g10.c:945 g10/g10.c:957 +#: g10/g10.c:940 g10/g10.c:952 msgid "selected digest algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" -#: g10/g10.c:961 +#: g10/g10.c:956 msgid "the given policy URL is invalid\n" msgstr "" -#: g10/g10.c:964 +#: g10/g10.c:959 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n" -#: g10/g10.c:966 +#: g10/g10.c:961 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n" -#: g10/g10.c:968 +#: g10/g10.c:963 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n" -#: g10/g10.c:970 +#: g10/g10.c:965 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:973 +#: g10/g10.c:968 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n" -#: g10/g10.c:977 +#: g10/g10.c:972 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n" -#: g10/g10.c:1054 +#: g10/g10.c:1049 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" -#: g10/g10.c:1060 +#: g10/g10.c:1055 msgid "--store [filename]" msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1067 +#: g10/g10.c:1062 msgid "--symmetric [filename]" msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1075 +#: g10/g10.c:1070 msgid "--encrypt [filename]" msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1088 +#: g10/g10.c:1083 msgid "--sign [filename]" msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1101 +#: g10/g10.c:1096 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1115 +#: g10/g10.c:1110 msgid "--clearsign [filename]" msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1132 +#: g10/g10.c:1127 msgid "--decrypt [filename]" msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1140 +#: g10/g10.c:1135 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:1148 +#: g10/g10.c:1143 #, fuzzy msgid "--lsign-key user-id" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1156 +#: g10/g10.c:1151 #, fuzzy msgid "--edit-key user-id [commands]" msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1172 +#: g10/g10.c:1167 #, fuzzy msgid "--delete-secret-key user-id" msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1175 +#: g10/g10.c:1170 #, fuzzy msgid "--delete-key user-id" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/encode.c:260 g10/g10.c:1199 g10/sign.c:366 +#: g10/encode.c:260 g10/g10.c:1194 g10/sign.c:366 #, c-format msgid "can't open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" -#: g10/g10.c:1210 +#: g10/g10.c:1205 #, fuzzy msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]" -#: g10/g10.c:1261 +#: g10/g10.c:1256 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1269 +#: g10/g10.c:1264 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1337 +#: g10/g10.c:1332 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n" -#: g10/g10.c:1418 +#: g10/g10.c:1413 msgid "[filename]" msgstr "[ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1422 +#: g10/g10.c:1417 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1425 g10/verify.c:68 g10/verify.c:113 +#: g10/decrypt.c:59 g10/g10.c:1420 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n" -#: g10/g10.c:1594 +#: g10/g10.c:1589 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "" -#: g10/g10.c:1600 +#: g10/g10.c:1595 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -#: g10/g10.c:1606 +#: g10/g10.c:1601 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "" -#: g10/g10.c:1614 +#: g10/g10.c:1609 msgid "a notation value must not use any control characters\n" msgstr "" @@ -2703,6 +2703,11 @@ msgstr " msgid "data not saved; use option \"--output\" to save it\n" msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n" +#: g10/plaintext.c:311 +#, fuzzy +msgid "Detached signature.\n" +msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n" + #: g10/plaintext.c:315 msgid "Please enter name of data file: " msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: " @@ -2842,7 +2847,7 @@ msgstr "%s: msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458 +#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458 #, fuzzy, c-format msgid "%s: can't create: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" @@ -3253,26 +3258,26 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" -#: g10/ringedit.c:335 g10/ringedit.c:1353 +#: g10/ringedit.c:335 g10/ringedit.c:1355 #, fuzzy, c-format msgid "%s: keyring created\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" -#: g10/ringedit.c:1530 +#: g10/ringedit.c:1532 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/ringedit.c:1531 +#: g10/ringedit.c:1533 #, fuzzy, c-format msgid "%s is the unchanged one\n" msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" -#: g10/ringedit.c:1532 +#: g10/ringedit.c:1534 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/ringedit.c:1533 +#: g10/ringedit.c:1535 msgid "Please fix this possible security flaw\n" msgstr "" diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 23cb5bd0d..e1ed0f645 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -7,7 +7,6 @@ DIE=no autoconf_vers=2.13 automake_vers=1.4 aclocal_vers=1.4 -libtool_vers=1.3 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \ @@ -65,31 +64,12 @@ if (gettext --version /dev/null | awk 'NR==1 { split($4,A,"\."); \ fi -if (libtool --version) < /dev/null > /dev/null 2>&1 ; then - if (libtool --version | awk 'NR==1 { if( $4 >= '$libtool_vers') \ - exit 1; exit 0; }'); - then - echo "**Error**: "\`libtool\'" is too old." - echo ' (version ' $libtool_vers ' or newer is required)' - DIE="yes" - fi -else - echo - echo "**Error**: You must have "\`libtool\'" installed to compile $PGM." - echo ' (version ' $libtool_vers ' or newer is required)' - DIE="yes" -fi - - if test "$DIE" = "yes"; then exit 1 fi echo "Running gettextize... Ignore non-fatal messages." echo "no" | gettextize --force -echo "Running libtoolize... Ignore non-fatal messages." -echo "no" | libtoolize - echo "Running aclocal..." aclocal diff --git a/scripts/distfiles b/scripts/distfiles index 804b73f88..13127323a 100644 --- a/scripts/distfiles +++ b/scripts/distfiles @@ -7,6 +7,4 @@ missing gnupg.spec.in autogen.sh ChangeLog -ltconfig -ltmain.sh diff --git a/tools/Makefile.am b/tools/Makefile.am index 2cf2e20ea..b4050abf9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,8 +2,8 @@ EXTRA_DIST = lspgpot INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -needed_libs = ../cipher/libcipher.la \ - ../mpi/libmpi.la ../util/libutil.la @INTLLIBS@ +needed_libs = ../cipher/libcipher.a \ + ../mpi/libmpi.a ../util/libutil.a @INTLLIBS@ noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest diff --git a/util/ChangeLog b/util/ChangeLog index 965bc71a0..531de7c02 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 9 20:34:41 CEST 1999 Werner Koch + + * Makefile.am: Removed libtool. + Fri Oct 8 20:32:01 CEST 1999 Werner Koch * w32reg.c: New. diff --git a/util/Makefile.am b/util/Makefile.am index 3098ba671..5870fb6a9 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -2,11 +2,11 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -noinst_LTLIBRARIES = libutil.la +noinst_LIBRARIES = libutil.a -libutil_la_LDFLAGS = -libutil_la_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \ +#libutil_a_LDFLAGS = +libutil_a_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \ ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \ dotlock.c http.c simple-gettext.c w32reg.c diff --git a/util/w32reg.c b/util/w32reg.c index 01ca5df89..0cf38090f 100644 --- a/util/w32reg.c +++ b/util/w32reg.c @@ -71,7 +71,7 @@ read_w32_registry_string( const char *root, const char *dir, const char *name ) if( !result ) goto leave; if( RegQueryValueEx( key_handle, name, 0, NULL, result, &n1 ) ) { - m_free(result); result = NULL; + free(result); result = NULL; goto leave; } result[nbytes] = 0; /* make sure it is really a string */