* Makefile.am (AUTOMAKE_OPTIONS): New.

* configure.ac (AC_CANONICAL_TARGET): Replaced by AC_CANONICAL_HOST. Changed all reference to TARGET to HOST. Made sure that i586-mingw32msvc gets detected as mingw32. * ro.po: Updated. * sv.po: Updated.
author: Werner Koch <[email protected]> 2004-12-27 17:27:11 +0000
committer: Werner Koch <[email protected]> 2004-12-27 17:27:11 +0000
commit: f79f61e50d7731105a7bbb093c90c783278043c3 (patch)
tree: 3336f9be50aebc5abda9101cb3319be848964d66
parent: * NEWS: Note pgpgroup-to-gpggroup. (diff)
download: gnupg-f79f61e50d7731105a7bbb093c90c783278043c3.tar.gz
gnupg-f79f61e50d7731105a7bbb093c90c783278043c3.zip
40 files changed, 2215 insertions, 1918 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e7757ed1..c8affc537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-27  Werner Koch  <[email protected]>
+
+	Released 1.2.7.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): New.
+	* configure.ac (AC_CANONICAL_TARGET): Replaced by
+	AC_CANONICAL_HOST. Changed all reference to TARGET to HOST.  Made
+	sure that i586-mingw32msvc gets detected as mingw32.
+
+	Updated to automake 1.9.
+
 2004-12-22  David Shaw  <[email protected]>
 
 	* NEWS: Note pgpgroup-to-gpggroup.
diff --git a/INSTALL b/INSTALL
index 62ea076c1..095b1eb40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,16 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
-Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -67,12 +70,13 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for variables by setting
-them in the environment.  You can do that on the command line like this:
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
 
      ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
@@ -81,7 +85,7 @@ them in the environment.  You can do that on the command line like this:
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -98,19 +102,19 @@ for another architecture.
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
 `/usr/local/bin', `/usr/local/man', etc.  You can specify an
 installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -121,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -136,10 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it cannot guess the host type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -151,27 +156,23 @@ where SYSTEM can have one of these forms:
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the host
-platform (i.e., that on which the generated programs will eventually be
-run) with `--host=TYPE'.  In this case, you should also specify the
-build platform with `--build=TYPE', because, in this case, it may not
-be possible to guess the build platform (it sometimes involves
-compiling and running simple test programs, and this can't be done if
-the compiler is a cross compiler).
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -180,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -194,8 +195,7 @@ overridden in the site shell script).
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
diff --git a/Makefile.am b/Makefile.am
index 6d4493ddd..08b9e8ca7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 ## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
 
 if CROSS_COMPILING
 checks =
@@ -49,9 +51,3 @@ dist-hook:
 	echo "$(VERSION)" > $(distdir)/VERSION
 
 
-
-
-
-
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/NEWS b/NEWS
index 95249496a..dd48c249b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,15 @@
-Noteworthy changes in version 1.2.7
+Noteworthy changes in version 1.2.7 (2004-12-27)
 ------------------------------------------------
 
+    Please note that the 1.2.x series will enter end of life status on
+    January 1, 2005, after which it will only be updated for security
+    critical bugs. 
+
     * New "pgpgroup-to-gpggroup" script (in the tools directory) to
       convert from PGP 6 group syntax to GnuPG group syntax.
 
+    * Translation update and minor bug fixes.
+
 
 Noteworthy changes in version 1.2.6 (2004-08-25)
 ------------------------------------------------
diff --git a/README b/README
index fdb0114e9..b549067a0 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.2.6
+			    Version 1.2.7
 
 	    Copyright 1998, 1999, 2000, 2001, 2002, 2003,
 		 2004 Free Software Foundation, Inc.
@@ -15,6 +15,10 @@
     the implied warranty of MERCHANTABILITY or FITNESS FOR A
     PARTICULAR PURPOSE.
 
+    Please note that the 1.2.x series will enter end of life status on
+    January 1, 2005, after which it will only be updated for security
+    critical bugs.
+
 
     Intro
     -----
diff --git a/configure.ac b/configure.ac
index 4d1e70da0..4dce72998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,12 @@ dnl
 dnl (Process this file with autoconf to produce a configure script.)
 dnlAC_REVISION($Revision$)dnl
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.59)
+min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.2.7-cvs, [email protected])
+AC_INIT(gnupg, 1.2.7, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
@@ -33,8 +34,8 @@ development_version=no
 
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(g10/g10.c)
-AC_CANONICAL_TARGET()
-AM_INIT_AUTOMAKE
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE()
 AM_CONFIG_HEADER(config.h)
 
 AC_GNU_SOURCE
@@ -314,7 +315,7 @@ MPI_OPT_FLAGS=""
 
 try_gettext=yes
 have_dosish_system=no
-case "${target}" in
+case "${host}" in
     *-*-mingw32*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
@@ -472,8 +473,8 @@ fi
 AC_SUBST(GPGKEYS_MAILTO)
 AC_SUBST(GPGKEYS_HKP)
 
-case "${target}" in
-    *-*-mingw32*)
+case "${host}" in
+    *-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
     *-*-cygwin*)
@@ -503,7 +504,7 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
 #
 NAME_OF_DEV_RANDOM="/dev/random"
 NAME_OF_DEV_URANDOM="/dev/urandom"
-case "${target}" in
+case "${host}" in
     *-openbsd*)
         NAME_OF_DEV_RANDOM="/dev/srandom"
         NAME_OF_DEV_URANDOM="/dev/urandom"
@@ -749,8 +750,8 @@ if test "$use_static_rnd" = default; then
      if test "$ac_cv_have_dev_random" = yes; then
         random_modules="rndlinux"
      else
-         case "${target}" in
-            *-*-mingw32*|*-*-cygwin*)
+         case "${host}" in
+            *-mingw32*|*-*-cygwin*)
                 random_modules="rndw32"
                 ;;
             i?86-emx-os2|i?86-*-os2*emx)
@@ -917,8 +918,8 @@ GNUPG_CHECK_GNUMAKE
 
 # add some extra libs here so that previous tests don't fail for
 # mysterious reasons - the final link step should bail out. 
-case "${target}" in
-    *-*-mingw32*)
+case "${host}" in
+    *-mingw32*)
 dnl      NETLIBS="$NETLIBS -lwsock32"
 	W32LIBS="-lwsock32"
         ;;
@@ -1035,7 +1036,7 @@ AC_OUTPUT
 
 # Give some feedback
 echo
-echo   "                Configured for: $PRINTABLE_OS_NAME ($target)"
+echo   "                Configured for: $PRINTABLE_OS_NAME ($host)"
 if test -n "$show_extraasm"; then
   echo "  Extra cpu specific functions:$show_extraasm"
 fi
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e14d9fb61..8db6fa5d1 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -35,7 +33,34 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = m4
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -156,6 +181,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -176,33 +203,47 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
-subdir = m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  m4/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -210,10 +251,6 @@ TAGS:
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -227,7 +264,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -245,7 +282,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -266,7 +302,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -283,6 +319,8 @@ dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -316,8 +354,8 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
diff --git a/po/ChangeLog b/po/ChangeLog
index 03486d3b0..3d107f4f5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-27  Werner Koch  <[email protected]>
+
+	* ro.po: Updated.
+
+	* sv.po: Updated.
+
 2004-08-09  Werner Koch  <[email protected]>
 
 	* ca.po: Updated.
diff --git a/po/be.po b/po/be.po
index 98eec112e..f5f60fce9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -2006,26 +2006,26 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr ""
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -3682,7 +3682,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
@@ -3691,11 +3691,11 @@ msgstr ""
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
@@ -3727,16 +3727,16 @@ msgstr "пароль занадта доўгі\n"
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3746,20 +3746,20 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
@@ -3825,41 +3825,41 @@ msgstr ""
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr ""
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr ""
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr ""
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr ""
@@ -4370,7 +4370,7 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
 
@@ -4659,17 +4659,17 @@ msgstr "Даведка адсутнічае"
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index f9b28eb1b..e569e3da6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -2176,28 +2176,28 @@ msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
@@ -3960,7 +3960,7 @@ msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
@@ -3969,11 +3969,11 @@ msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4016,16 +4016,16 @@ msgstr "la contrasenya és massa llarga\n"
 msgid "invalid response from agent\n"
 msgstr "la resposta de l'agent és invàlida\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -4035,20 +4035,20 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
@@ -4118,41 +4118,41 @@ msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'enviament a «%s» ha tingut èxit (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'enviament a «%s» ha fallat: status=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "aquest servidor de claus no suporta --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "no es pot cercar el servidor de claus: %s\n"
@@ -4723,7 +4723,7 @@ msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
@@ -5137,17 +5137,17 @@ msgstr "No hi ha ajuda disponible"
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 071d557fa..197c19b4b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-07 16:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -2121,28 +2121,28 @@ msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User ID not found]"
 
 # c-format
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� kl�� %08lX zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %08lX - ignorov�no\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "pou��v�m sekund�rn� kl�� %08lX m�sto prim�rn�ho kl��e %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kl�� %08lX: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -3861,7 +3861,7 @@ msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
@@ -3870,11 +3870,11 @@ msgstr "nemohu se p�ipojit k `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hlavn� ID kl��e %08lX)"
@@ -3906,16 +3906,16 @@ msgstr "heslo je p��li� dlouh�\n"
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakce od agenta\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3925,20 +3925,20 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %08lX, vytvo�en� %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4006,41 +4006,41 @@ msgstr "POZN�MKA: platnost tajn�ho kl��e %08lX skon�ila %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "po�aduji kl�� %08lX z %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nemohu dostat kl�� ze serveru kl���: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "chyba p�i pos�l�n� na `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�sp�n� odesl�n� na `%s' (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "chyba odesl�n� na `%s': (status=%u)\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "tento keyserver nepodporuje --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nemohu prohled�vat server kl���: %s\n"
@@ -4580,7 +4580,7 @@ msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
@@ -4980,17 +4980,17 @@ msgstr "Pomoc nen� k dispozici"
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
diff --git a/po/da.po b/po/da.po
index 3125ca130..57307078e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -2070,27 +2070,27 @@ msgstr "ADVARSEL: intet blev eksporteret\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -3788,7 +3788,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -3797,11 +3797,11 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -3832,36 +3832,36 @@ msgstr ""
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -3928,41 +3928,41 @@ msgstr ""
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
@@ -4477,7 +4477,7 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
@@ -4768,17 +4768,17 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
diff --git a/po/de.po b/po/de.po
index 8e9f5c144..321766298 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-07-20 16:01+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -2134,29 +2134,29 @@ msgstr "WARNUNG: Nichts exportiert\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "Kein privater Schl�ssel zum �ffentlichen Schl�ssel %08lX - �bergangen\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -3903,7 +3903,7 @@ msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
@@ -3912,12 +3912,12 @@ msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
@@ -3949,16 +3949,16 @@ msgstr "Passphrase ist zu lang\n"
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3968,20 +3968,20 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
@@ -4048,41 +4048,41 @@ msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schl�ssel wurde widerrufen"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "Schl�ssel ist beim Schl�sselserver nicht erh�ltlich: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "Dieser Schl�sselserver unterst�tzt --search-keys nicht\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kann Schl�sselserver nicht durchsuchen: %s\n"
@@ -4649,7 +4649,7 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
 
@@ -5079,17 +5079,17 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Schl�sselbund `%s' erstellt\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
diff --git a/po/el.po b/po/el.po
index d255e155e..dd30e92ff 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -2127,27 +2127,27 @@ msgstr "�������������: ��� ����� ������ �������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -3873,7 +3873,7 @@ msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
@@ -3882,11 +3882,11 @@ msgstr "�������� �������� ��� `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (����� ������, ID %08lX)"
@@ -3919,16 +3919,16 @@ msgstr "� ����� ������ ����� ���� ������\n"
 msgid "invalid response from agent\n"
 msgstr "�� ������ �������� ��� ��� agent\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3938,20 +3938,20 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
@@ -4017,41 +4017,41 @@ msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�������� ����� ��� �������� ��� �� ����������: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�������� ��� ��������� ��� `%s' (���������=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "�������� ���� �������� ���� �� `%s': ���������=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "����� � keyserver ��� ����������� --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "�������� ���������� ����������: %s\n"
@@ -4604,7 +4604,7 @@ msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
@@ -5012,17 +5012,17 @@ msgstr "��� ������� ��������� �������"
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
diff --git a/po/eo.po b/po/eo.po
index db39143ca..a029c9971 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -2101,26 +2101,26 @@ msgstr "AVERTO: nenio estis eksportita\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -3862,7 +3862,7 @@ msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
@@ -3871,11 +3871,11 @@ msgstr "ne povas konekti�i al '%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
@@ -3907,16 +3907,16 @@ msgstr "pasfrazo estas tro longa\n"
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3926,20 +3926,20 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -4006,41 +4006,41 @@ msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "ne povas ser�i �e �losilservilo: %s\n"
@@ -4575,7 +4575,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
@@ -4968,17 +4968,17 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
diff --git a/po/es.po b/po/es.po
index f987572e0..610833fe3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-18 22:40+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -2158,26 +2158,26 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "no hay subclave secreta para la clave p�blica %08lX -ignorada\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
@@ -3891,7 +3891,7 @@ msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
@@ -3900,11 +3900,11 @@ msgstr "no se puede conectar con `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
@@ -3936,16 +3936,16 @@ msgstr "frase contrase�a demasiado larga\n"
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inv�lida\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3955,20 +3955,20 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
@@ -4034,41 +4034,41 @@ msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede obtenerse la clave en el servidor: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "envi� correcto a `%s` (estado=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fall� el envio a `%s': status=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "este servidor de clave no proporciona --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "no puede buscarse en el servidor: %s\n"
@@ -4609,7 +4609,7 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
@@ -5007,17 +5007,17 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
diff --git a/po/et.po b/po/et.po
index 8feefcb40..11df624b8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -2081,28 +2081,28 @@ msgstr "HOIATUS: midagi ei eksporditud\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -3806,7 +3806,7 @@ msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
@@ -3815,11 +3815,11 @@ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (peamise v�tme ID %08lX)"
@@ -3851,16 +3851,16 @@ msgstr "liiga pikk parool\n"
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3870,20 +3870,20 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -3949,41 +3949,41 @@ msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "v�tmeserverist ei saa v�tit: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "see v�tmeserver ei toeta --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "v�tmeserverist ei saa otsida: %s\n"
@@ -4513,7 +4513,7 @@ msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
@@ -4905,17 +4905,17 @@ msgstr "Abiinfo puudub"
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 04e1eee96..94e8fbf6b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -2115,28 +2115,28 @@ msgstr "VAROITUS: mitään ei viety\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -3858,7 +3858,7 @@ msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
@@ -3867,11 +3867,11 @@ msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (pääavaimen tunnus %08lX)"
@@ -3903,16 +3903,16 @@ msgstr "salasana on liian pitkä\n"
 msgid "invalid response from agent\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3921,20 +3921,20 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
@@ -4001,41 +4001,41 @@ msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "avainpalvelimelta ei saa avainta: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "kohteeseen \"%s\" lähettäminen onnistui (tila=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": tila=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "tämä avainpalvelin ei tue valitsinta --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr " avainpalvelimelta ei pysty etsimään: %s\n"
@@ -4590,7 +4590,7 @@ msgstr ""
 "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
 "yritettiin %d kertaa!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
@@ -4995,17 +4995,17 @@ msgstr "Ei ohjeita saatavilla"
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 10b676b59..8a22d7c0a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-16 20:20+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -2158,29 +2158,29 @@ msgstr "ATTENTION: rien n'a �t� export�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %08lX - ignor�e\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -3922,7 +3922,7 @@ msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
@@ -3931,11 +3931,11 @@ msgstr "impossible de se connecter � `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�me de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
@@ -3968,16 +3968,16 @@ msgstr "mot de passe trop long\n"
 msgid "invalid response from agent\n"
 msgstr "r�ponse de l'agent invalide\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3987,20 +3987,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -4070,41 +4070,41 @@ msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "requ�te de la cl� %08lX de %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "ce serveur de cl�s ne supporte pas --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "recherche de \"%s\" du serveur HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossible de chercher une cl� dans le serveur : %s\n"
@@ -4676,7 +4676,7 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
@@ -5073,17 +5073,17 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
diff --git a/po/gl.po b/po/gl.po
index aaf2e10de..d04a8e890 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -2111,28 +2111,28 @@ msgstr "AVISO: non se exportou nada\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -3860,7 +3860,7 @@ msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
@@ -3869,11 +3869,11 @@ msgstr "non se puido conectar a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -3905,16 +3905,16 @@ msgstr "contrasinal demasiado longo\n"
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non v�lida\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3924,20 +3924,20 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
@@ -4003,41 +4003,41 @@ msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�xito ao enviar a `%s' (estado=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fallo ao enviar a `%s': estado=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "este servidor de chaves non soporta --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "non se pode buscar no servidor de chaves: %s\n"
@@ -4591,7 +4591,7 @@ msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
@@ -4985,17 +4985,17 @@ msgstr "Non hai axuda dispo�ible"
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
diff --git a/po/hu.po b/po/hu.po
index 898712305..08f1540fb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -2091,29 +2091,29 @@ msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
@@ -3827,7 +3827,7 @@ msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
@@ -3836,11 +3836,11 @@ msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
@@ -3875,16 +3875,16 @@ msgstr "A jelsz� t�l hossz�!\n"
 msgid "invalid response from agent\n"
 msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3895,20 +3895,20 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
@@ -3975,41 +3975,41 @@ msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "Nem tudom leh�vni a kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Sikeresen felk�ldtem %s kulcsszerverre. (St�tusz: %u.)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Nem tudtam felk�ldeni %s kulcsszerverre. St�tusz: %u.\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "Ez a kulcsszerver nem t�mogatja a --search-keys kapcsol�t.\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "Nem tudok keresni a %s kulcsszerveren.\n"
@@ -4555,7 +4555,7 @@ msgstr ""
 "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
 "%d alkalommal pr�b�ltam!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
@@ -4958,17 +4958,17 @@ msgstr "Nem �ll rendelkez�sre seg�ts�g."
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
diff --git a/po/id.po b/po/id.po
index 981682f98..1841a75e9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -2102,26 +2102,26 @@ msgstr "PERINGATAN: tidak ada yang diekspor\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -3837,7 +3837,7 @@ msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
@@ -3846,11 +3846,11 @@ msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
@@ -3882,16 +3882,16 @@ msgstr "passphrase terlalu panjang\n"
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3901,20 +3901,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -3980,41 +3980,41 @@ msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "tidak dapat memperoleh kunci keyserver: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "success sending to `%s' (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "failed sending to `%s': status=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "keyserver ini tidak mendukung --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "tidak dapat mencari keyserver: %s\n"
@@ -4554,7 +4554,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
@@ -4960,17 +4960,17 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
diff --git a/po/it.po b/po/it.po
index e8937fdb2..1c5c82126 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -2112,27 +2112,27 @@ msgstr "ATTENZIONE: non � stato esportato nulla\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -3855,7 +3855,7 @@ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
@@ -3864,11 +3864,11 @@ msgstr "impossibile connettersi a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
@@ -3900,16 +3900,16 @@ msgstr "passphrase troppo lunga\n"
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3919,20 +3919,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -4000,41 +4000,41 @@ msgstr "NOTA: chiave %08lX scaduta il %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "inviata con successo a `%s' (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "questo keyserver non gestisce --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossibile cercare sul keyserver: %s\n"
@@ -4592,7 +4592,7 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
@@ -5003,17 +5003,17 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 78a7bf950..8addbf53d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-06 00:44+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -2124,26 +2124,26 @@ msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "��������%08lX�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��%08lX: �������Τʤ���̩���Ǥ� - �����å�\n"
@@ -3837,7 +3837,7 @@ msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
@@ -3846,11 +3846,11 @@ msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
@@ -3882,16 +3882,16 @@ msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
 msgid "invalid response from agent\n"
 msgstr "����������Ȥ����̵���ʱ���\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3901,20 +3901,20 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -3982,41 +3982,41 @@ msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "��%08lX��%s���׵�\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s'�ؤ��������顼: %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "`%s'�ؤ����������� (����=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "���θ������С��ϡ�--search-keys�򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
@@ -4537,7 +4537,7 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
@@ -4926,17 +4926,17 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 2146609e9..256921895 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-05-10 19:23+0200\n"
 "Last-Translator: Elros Cyriatan <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -2118,29 +2118,29 @@ msgstr "WAARSCHUWING: niets uitgevoerd\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "teveel ingangen in pk buffer - uit gezet\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Gebruikerscode niet gevonden]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ongeldige sleutel %08lX geldig gemaakt met --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "geen geheime deelsleutel voor openbare deelsleutel %08lX - genegeerd\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "de secundaire sleutel %08lX wordt gebruikt in plaats van primaire sleutel %"
 "08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -3876,7 +3876,7 @@ msgstr "misvormde GPG_AGENT_INFO omgevingsvariabele\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan niet verbinden met `%s': %s\n"
@@ -3885,11 +3885,11 @@ msgstr "kan niet verbinden met `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "communicatieprobleem met gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem met de agent - gebruik van agent uit gezet\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutel ID %08lX)"
@@ -3922,16 +3922,16 @@ msgstr "wachtwoord te lang\n"
 msgid "invalid response from agent\n"
 msgstr "ongeldig antwoord van agent\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "geannuleerd door gebruiker\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem met agent: agent geeft 0x%lx terug\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3941,20 +3941,20 @@ msgstr ""
 "U heeft een wachtwoord nodig om de geheime sleutel\n"
 "voor de gebruiker te ontgrendelen: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "kan niet vragen om wachtwoord in batch-modus\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Geef wachtwoord: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Herhaal wachtwoord: "
 
@@ -4022,41 +4022,41 @@ msgstr "LET OP: geheime sleutel %08lX verlopen op %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "LET OP: sleutel is herroepen"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "bezig met opvragen sleutel %08lX van %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan sleutel niet ontvangen van sleutelserver: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij verzenden aan `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "succes bij zenden aan `%s' (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "verzenden aan `%s' mislukt: status=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kan niet zoeken op sleutelserver: %s\n"
@@ -4607,7 +4607,7 @@ msgstr ""
 "kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer "
 "geprobeerd!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n"
 
@@ -5026,17 +5026,17 @@ msgstr "Geen hulp beschikbaar"
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fout bij aanmaken sleutelbos `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "sleutelbos `%s' aangemaakt\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 881e37231..1a2a6d3f7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -2130,27 +2130,27 @@ msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -3868,7 +3868,7 @@ msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
@@ -3877,11 +3877,11 @@ msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (podklucz %08lX)"
@@ -3913,16 +3913,16 @@ msgstr "has�o zbyt d�ugie\n"
 msgid "invalid response from agent\n"
 msgstr "b��dna odpowied� agenta\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3932,20 +3932,20 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
@@ -4012,41 +4012,41 @@ msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nie mo�na pobra� klucza z serwera: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "wysy�anie do ,,%s'' powiod�o si� (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy�anie do ,,%s'' nie powiod�o si� (status=%u)\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "ten serwer kluczy nie umo�liwia przeszukiwania\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nie mo�na przeszuka� serwera: %s\n"
@@ -4593,7 +4593,7 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
@@ -4995,17 +4995,17 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
diff --git a/po/pt.po b/po/pt.po
index d1f1e59d1..cbead2557 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -2121,26 +2121,26 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -3860,7 +3860,7 @@ msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
@@ -3869,11 +3869,11 @@ msgstr "imposs�vel ligar a `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -3907,16 +3907,16 @@ msgstr "frase secreta demasiado longa\n"
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3926,20 +3926,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4005,41 +4005,41 @@ msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "n�o consigo obter chave do servidor: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "erro ao enviar para `%s': estado=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "n�o consigo procurar no servidor de chaves: %s\n"
@@ -4586,7 +4586,7 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
 
@@ -4987,17 +4987,17 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 39b156ea8..e57495f82 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -2182,27 +2182,27 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -3931,7 +3931,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -3940,11 +3940,11 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -3980,16 +3980,16 @@ msgstr "linha muito longa\n"
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3999,20 +3999,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4080,41 +4080,41 @@ msgstr "NOTA: chave secreta %08lX expirou %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr ""
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
@@ -4652,7 +4652,7 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
@@ -4996,17 +4996,17 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
diff --git a/po/ro.po b/po/ro.po
index fa0503748..81218b4c9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 # Mesajele �n limba rom�n� pentru gnupg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul gnupg.
-# Laurentiu Buzdugan <[email protected]>, 2003.
+# Laurentiu Buzdugan <[email protected]>, 2003.
 #
 #
 #
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
-"PO-Revision-Date: 2004-06-17 12:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
+"PO-Revision-Date: 2003-05-11 12:00-0500\n"
+"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -77,7 +77,7 @@ msgstr "algoritm pubkey necunoscut"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "algoritm rezumat necunoscut"
+msgstr "algoritm rezumat (digest) necunoscut"
 
 #: util/errors.c:59
 msgid "bad public key"
@@ -365,14 +365,14 @@ msgstr ""
 #: cipher/md.c:140
 #, c-format
 msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
+msgstr "algoritm rezumat (digest) `%s' este numai-citire �n acest� edi�ie\n"
 
 #: cipher/md.c:147
 #, c-format
 msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 msgstr ""
-"AVERTISMENT: rezumatul `%s' nu este parte din OpenPGP.  Folosi�i-l pe riscul "
-"dvs.!\n"
+"AVERTISMENT: rezumatul (digest) `%s' nu este parte din OpenPGP. Folosi�i-l "
+"pe riscul dvs.!\n"
 
 #: cipher/rndegd.c:204
 msgid ""
@@ -550,7 +550,7 @@ msgstr "Pune armura unui fi�ier sau intr�rii standard (stdin)"
 
 #: g10/g10.c:381
 msgid "|algo [files]|print message digests"
-msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
+msgstr "|algo [fi�iere]|afi�eaz� rezumate (digest) mesaje"
 
 #: g10/g10.c:385 g10/gpgv.c:64
 msgid ""
@@ -705,13 +705,13 @@ msgstr "emuleaz� modul descris �n RFC1991"
 #: g10/g10.c:472
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
-"seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru "
+"seteaz� toate op�iunile pentru pachete, cifru �i rezumat (digest) ca pentru "
 "comportamentul OpenPGP"
 
 #: g10/g10.c:473
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
-"seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru "
+"seteaz� toate op�iunile pentru pachete, cifru �i rezumat (digest) ca pentru "
 "comportamentul PGP 2.x"
 
 #: g10/g10.c:477
@@ -720,7 +720,8 @@ msgstr "|N|folose�te modul fraz�-parol� N"
 
 #: g10/g10.c:479
 msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NUME|folose�te algoritm rezumat mesaj NUME pentru fraza-parol�"
+msgstr ""
+"|NUME|folose�te algoritm rezumat (digest) mesaj NUME pentru fraza-parol�"
 
 #: g10/g10.c:481
 msgid "|NAME|use cipher algorithm NAME for passphrases"
@@ -732,7 +733,7 @@ msgstr "|NUME|folose�te algoritm cifrare NUME"
 
 #: g10/g10.c:484
 msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
+msgstr "|NUME|folose�te algoritm rezumat (digest) mesaj NUME"
 
 #: g10/g10.c:486
 msgid "|N|use compress algorithm N"
@@ -864,7 +865,7 @@ msgstr ""
 #: g10/g10.c:1224
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
-msgstr "articol configurare necunoscut \"%s\"\n"
+msgstr "articol de configurare necunoscut \"%s\"\n"
 
 #: g10/g10.c:1445
 #, c-format
@@ -976,11 +977,11 @@ msgstr "algoritm cifrare selectat este invalid\n"
 
 #: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
-msgstr "algoritm rezumat selectat este invalid\n"
+msgstr "algoritm rezumat (digest) selectat este invalid\n"
 
 #: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "algoritm rezumat certificare selectat este invalid\n"
+msgstr "algoritm rezumat (digest) certificare selectat este invalid\n"
 
 #: g10/g10.c:2197
 #, c-format
@@ -1010,7 +1011,7 @@ msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
 #: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
+msgstr "min-cert-level invalid; trebuie s� fie 1, 2 sau 3\n"
 
 #: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
@@ -1030,7 +1031,7 @@ msgstr "preferin�e cifrare personale invalide\n"
 
 #: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
-msgstr "preferin�e rezumat personale invalide\n"
+msgstr "preferin�e rezumat (digest) personale invalide\n"
 
 #: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
@@ -1039,7 +1040,7 @@ msgstr "preferin�e compresie personale invalide\n"
 #: g10/g10.c:2272
 #, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s nu merge �nc� cu %s!\n"
+msgstr "%s nu merge �nc� cu %s\n"
 
 #: g10/g10.c:2316
 #, c-format
@@ -1049,7 +1050,8 @@ msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
 #: g10/g10.c:2321
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
-msgstr "nu pute�i folosi algorimul de rezumat \"%s\" c�t� vreme �n modul %s\n"
+msgstr ""
+"nu pute�i folosi algoritmul rezumat (digest) \"%s\" c�t� vreme �n modul %s\n"
 
 #: g10/g10.c:2326
 #, c-format
@@ -1132,27 +1134,27 @@ msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 #: g10/g10.c:2683
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "trimitere server de chei e�uat�: %s\n"
+msgstr "trimiterea la serverul de chei a e�uat: %s\n"
 
 #: g10/g10.c:2685
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "recep�ie server de chei e�uat�: %s\n"
+msgstr "receptionarea de la serverul de chei a e�uat: %s\n"
 
 #: g10/g10.c:2687
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "export cheie e�uat: %s\n"
+msgstr "exportul cheii a e�uat: %s\n"
 
 #: g10/g10.c:2698
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "c�utare server de chei e�uat�: %s\n"
+msgstr "c�utarea pe serverul de chei a e�uat: %s\n"
 
 #: g10/g10.c:2708
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "actualizare server de chei e�uat�: %s\n"
+msgstr "actualizarea serverului de chei a e�uat: %s\n"
 
 #: g10/g10.c:2749
 #, c-format
@@ -1175,7 +1177,7 @@ msgstr "[nume_fi�ier]"
 
 #: g10/g10.c:2942
 msgid "Go ahead and type your message ...\n"
-msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
+msgstr "Da�i-i drumul �i scri�i mesajul ...\n"
 
 #: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
@@ -1481,12 +1483,14 @@ msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 #: g10/pkclist.c:602
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
+"AVERTISMENT: aceast� cheie ar putea fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
 #: g10/pkclist.c:611
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
+msgstr ""
+"AVERTISMENT: Aceast� cheie a fost revocat� de cel desemnat cu aceast� "
+"capacitate!\n"
 
 #: g10/pkclist.c:614
 msgid "WARNING: This key has been revoked by its owner!\n"
@@ -2036,7 +2040,7 @@ msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
 #: g10/encode.c:223
 #, c-format
 msgid "using cipher %s\n"
-msgstr "folosesc cifrul %s\n"
+msgstr "este folosit cifrul %s\n"
 
 #: g10/encode.c:233 g10/encode.c:494
 #, c-format
@@ -2123,26 +2127,26 @@ msgstr "AVERTISMENT: nimic exportat\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %08lX f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %08lX - ignorat�\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "folosim cheia secundar� %08lX �n loc de cheia primar� %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "cheia %08lX: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -2684,7 +2688,7 @@ msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
 #: g10/keyedit.c:668
 msgid "Your selection? (enter '?' for more information): "
-msgstr "Selec�ia dvs.? (introduce�i '?' pentru informa�ii suplimentare): "
+msgstr "Selec�ia dvs.? (apasa�i '?' pentru informa�ii suplimentare): "
 
 #: g10/keyedit.c:688
 msgid ""
@@ -3229,7 +3233,7 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
 #: g10/keyedit.c:1611
 msgid "Digest: "
-msgstr "Rezumat: "
+msgstr "Rezumat (digest): "
 
 #: g10/keyedit.c:1663
 msgid "Features: "
@@ -3298,9 +3302,9 @@ msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
-"AVERTISMENT: nici un ID utilizator nu a fost marcat ca primar.\n"
-"              Aceast� comand� poate cauza ca un alt ID utilizator\n"
-"              s� devin� ID-ul utilizator primar presupus.\n"
+"AVERTISMENT: nici un ID utilizator nu a fost desemnat ca primar.  Aceast�\n"
+"            comand� poate face ca un alt ID utilizator s� devin� cel "
+"primar.\n"
 
 #: g10/keyedit.c:2181
 msgid ""
@@ -3582,12 +3586,12 @@ msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "fraz�=parol� gre�it� sau algoritm cifrare necunoscut (%d)\n"
+msgstr "fraza-parol� incorect� sau algoritm de cifrare necunoscut (%d)\n"
 
 #: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
-msgstr "%s cheie de sesiune cifrat�\n"
+msgstr "cheie de sesiune cifrat� %s\n"
 
 #: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
@@ -3600,9 +3604,9 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "cifrat cu un algoritm necunoscut %d\n"
+msgstr "fraza-parol� generat� cu un algoritm rezumat (digest) necunoscut %d\n"
 
 #: g10/mainproc.c:358
 #, c-format
@@ -3631,11 +3635,11 @@ msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 #: g10/mainproc.c:494
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "cifrat� cu %lu fraze-parol�\n"
+msgstr "cifrat(�) cu %lu fraze-parol�\n"
 
 #: g10/mainproc.c:496
 msgid "encrypted with 1 passphrase\n"
-msgstr "cifrat� cu 1 fraz�-parol�\n"
+msgstr "cifrat(�) cu 1 fraza-parol�\n"
 
 #: g10/mainproc.c:512 g10/mainproc.c:531
 #, c-format
@@ -3696,7 +3700,7 @@ msgstr "nu pot m�nui aceste semn�turi multiple\n"
 #: g10/mainproc.c:1352
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Semn�tur� f�cut� %.*s folosind cheia %s cu ID %08lX\n"
+msgstr "Semn�tura a f�cut %.*s folosind cheia %s ID %08lX\n"
 
 #: g10/mainproc.c:1381
 msgid "Key available at: "
@@ -3731,7 +3735,7 @@ msgstr "Semn�tura expir� %s\n"
 #: g10/mainproc.c:1574
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
+msgstr "semn�tur� %s, algoritm rezumat (digest) %s\n"
 
 #: g10/mainproc.c:1575
 msgid "binary"
@@ -3815,7 +3819,7 @@ msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
 #: g10/misc.c:551
 msgid "Uncompressed"
-msgstr "Necompresat"
+msgstr "Necompresat(�)"
 
 #: g10/misc.c:629
 #, c-format
@@ -3830,7 +3834,7 @@ msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 #: g10/parse-packet.c:688
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
-"AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
+"AVERTISMENT: cheie de sesiune cifrat� simetric potential nesigur� "
 "(insecure)\n"
 
 #: g10/parse-packet.c:1106
@@ -3863,7 +3867,7 @@ msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
@@ -3872,11 +3876,11 @@ msgstr "nu m� pot conecta la `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cheie principal� %08lX)"
@@ -3909,16 +3913,16 @@ msgstr "fraz�-parol� prea lung�\n"
 msgid "invalid response from agent\n"
 msgstr "r�spuns invalid de la agent\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3928,20 +3932,20 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
 "secret� pentru utilizator: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "nu pot cere parola �n modul batch\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
@@ -4008,41 +4012,41 @@ msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "cer cheia %08lX de la %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nu pot ob�ine cheia de la serverul de chei: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "succes trimitere la `%s' (stare=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "a e�uat trimiterea la `%s': stare=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
-msgstr "acest sercer de chei nu suport� --search-keys\n"
+msgstr "acest server de chei nu suport� --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nu pot c�uta serverul de chei: %s\n"
@@ -4057,9 +4061,9 @@ msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
 #: g10/seckey-cert.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+msgstr "algoritm de rezumat (digest) %d nu este suportat\n"
 
 #: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again"
@@ -4082,7 +4086,9 @@ msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
 
 #: g10/sig-check.c:70
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
+msgstr ""
+"AVERTISMENT: conflict pentru rezumatul semn�turii (signature digest) �n "
+"mesaj\n"
 
 #: g10/sig-check.c:93
 #, c-format
@@ -4095,8 +4101,8 @@ msgstr ""
 #, c-format
 msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n"
 msgstr ""
-"AVERTISMENT: subcheia de semnare %08lX are un certificare-reciproc� invalid� "
-"(invalid cross-certification)\n"
+"AVERTISMENT: subcheia de semnare %08lX are o certificare recipric� (cross-"
+"certification) invalid�\n"
 
 #: g10/sig-check.c:233
 #, c-format
@@ -4155,7 +4161,7 @@ msgstr "cheia %08lX: nici o subcheie pentru pachetul de revocare a subcheii\n"
 #: g10/sig-check.c:640
 #, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
-msgstr "cheia %08lX: nici o subcheie pentru semnare legat� de cheie\n"
+msgstr "cheia %08lX: nici o subcheie pentru legarea semn�turii de subcheie\n"
 
 #: g10/sign.c:84
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -4216,7 +4222,8 @@ msgstr "nu pot crea %s: %s\n"
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
+"for�area algoritmului rezumat (digest) %s (%d) violeaz� preferin�ele "
+"destinatarului\n"
 
 #: g10/sign.c:804
 msgid "signing:"
@@ -4444,12 +4451,12 @@ msgstr "cheia public� %08lX nu a fost g�sit�: %s\n"
 #: g10/trustdb.c:1203
 #, c-format
 msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-msgstr "semn�tur� de la cheia de semnare Elgamal %08lX la %08lX s�rit�\n"
+msgstr "semn�tur� de la cheie de semnare Elgamal %08lX pentru %08lX s�rit�\n"
 
 #: g10/trustdb.c:1211
 #, c-format
 msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-msgstr "semn�tur� de la %08lX la cheia de semnare Elgamal %08lX s�rit�\n"
+msgstr "semn�tur� de la %08lX pentru cheia de semnare Elgamal %08lX s�rit�\n"
 
 #: g10/trustdb.c:1608
 #, c-format
@@ -4579,7 +4586,7 @@ msgstr "cheie slab� creat� - re�ncerc\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
@@ -4987,17 +4994,17 @@ msgstr "Nici un ajutor disponibil"
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
@@ -5300,3 +5307,27 @@ msgstr "eroare g�sire �nregistrare �ncredere: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "eroare citire: %s\n"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (semn�tur� �i cifrare)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Folosirea acestui algoritm este suportat� numai de GnuPG.  Nu ve�i putea\n"
+#~ "folosi aceast� cheie pentru a comunica cu al�i utilizatori PGP.  Mai "
+#~ "mult,\n"
+#~ "acest algoritm este foarte lent �i ar putea fi mai pu�in sigur dec�t\n"
+#~ "celelalte op�iuni.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "Crea�i oricum? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "am detectat un algoritm symkey invalid (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "acest server de chei nu este �n totalitate compatibil cu HKP\n"
diff --git a/po/ru.po b/po/ru.po
index 1c2b23d30..1e68c46fc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -2095,27 +2095,27 @@ msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User ID Не найден]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Недействительный ключ %08lX разрешен параметром --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %08lX - игнорирую\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "используется вторичный ключ %08lX вместо главного %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "ключ %08lX: секретный ключ без открытого - пропущен\n"
@@ -3816,7 +3816,7 @@ msgstr "неправильная переменная окружения GPG_AGE
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
@@ -3825,11 +3825,11 @@ msgstr "не могу подключиться к `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "коммуникационный проблемы с gpg-agent\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (главный идентификатор ключа %08lX)"
@@ -3861,16 +3861,16 @@ msgstr "пароль слишком длинный\n"
 msgid "invalid response from agent\n"
 msgstr "неверный ответ от агента\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3880,20 +3880,20 @@ msgstr ""
 "Необходим пароль для доступа к секретному ключу пользователя:\n"
 "\""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-бит %s ключ, ID %08lX, создан %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
@@ -3959,41 +3959,41 @@ msgstr "ЗАМЕТЬТЕ: секретный ключ %08lX просрочен �
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "не могу получить ключ с сервера ключей: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "ошибка отправки на `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "успешно отправлено на `%s' (статус=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "сбой отправки на `%s': статус=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "Данный сервер ключей не поддерживает --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "не могу найти сервер ключей: %s\n"
@@ -4524,7 +4524,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA требует использования 160 битной хэш-функции\n"
 
@@ -4913,17 +4913,17 @@ msgstr "Нет доступной справки"
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 398d8306d..f3d6f8a03 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -2124,28 +2124,28 @@ msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
@@ -3865,7 +3865,7 @@ msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
@@ -3874,11 +3874,11 @@ msgstr "nem��em sa pripoji� k `%s': %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hlavn� ID k���a %08lX)"
@@ -3910,16 +3910,16 @@ msgstr "heslo je pr�li� dlh�\n"
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakcia od agenta\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3929,20 +3929,20 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4008,41 +4008,41 @@ msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nem��em dosta� k��� zo servera k���ov: %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�spe�n� odoslanie na `%s' (status=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "zlyhalo posielanie na `%s': (status=%u)\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "tento server k���ov nepodporuje --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nem��em preh�ad�va� server k���ov: %s\n"
@@ -4582,7 +4582,7 @@ msgstr ""
 "nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
@@ -4982,17 +4982,17 @@ msgstr "Pomoc nie je k dispoz�cii"
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
diff --git a/po/sv.po b/po/sv.po
index d3d5c6be8..a26429649 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 # Swedish messages for gnupg
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 #
 # Per Tunedal <[email protected]>, 2004
 #
@@ -10,10 +10,7 @@
 # where corrected. The translations were checked for
 # consistency and some expressions where given new
 # translations.
-#
-# 2004, September 20: First Preliminary new translation.
-# This translation will be revised and corrected
-# during October 2004.
+# 2004/12/01 Per Tunedal
 # ===================================================
 #
 # First translator Daniel Resare <[email protected]>, 1999-2002,
@@ -24,10 +21,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2004-08-25 16:59+0200\n"
-"PO-Revision-Date: 2004-09-20 22:12+0100\n"
-"Last-Translator: Per Tunedal <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.6\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
+"PO-Revision-Date: 2004-12-01 17:49+0100\n"
+"Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -49,28 +47,23 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
-#: util/miscutil.c:307
-#: util/miscutil.c:344
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:308
-#: util/miscutil.c:349
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:310
-#: util/miscutil.c:346
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:311
-#: util/miscutil.c:350
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:348
-#: g10/keyedit.c:996
+#: util/miscutil.c:348 g10/keyedit.c:996
 msgid "quit"
 msgstr "avsluta"
 
@@ -180,7 +173,7 @@ msgstr "fel vid skapande av fil"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "felaktig lösenmening"
+msgstr "fel lösenmening"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
@@ -301,9 +294,7 @@ msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:387
-#: g10/keygen.c:1931
-#: g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1931 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -320,11 +311,11 @@ msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
 #: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "notera: filen random_seed är tom\n"
+msgstr "Obs: filen random_seed är tom\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n"
+msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n"
 
 #: cipher/random.c:415
 #, c-format
@@ -333,10 +324,9 @@ msgstr "kan inte läsa \"%s\": %s\n"
 
 #: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr "notera: random_seed uppdaterades inte\n"
+msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:473
-#: g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
@@ -390,7 +380,8 @@ msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgåva\n"
 #: cipher/md.c:147
 #, c-format
 msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-msgstr "VARNING: sammandraget `%s' ingår inte i OpenPGP.  Användes på din egen risk!\n"
+msgstr ""
+"VARNING: sammandraget `%s' ingår inte i OpenPGP. Användes på din egen risk!\n"
 
 #: cipher/rndegd.c:204
 msgid ""
@@ -405,7 +396,7 @@ msgstr ""
 #: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr "kan inte skapa ett  primtal med mindre än %d bits\n"
+msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
 #: g10/g10.c:322
 msgid ""
@@ -425,7 +416,7 @@ msgstr "|[fil]|skapa en klartext-signatur"
 
 #: g10/g10.c:326
 msgid "make a detached signature"
-msgstr "skapa en signatur i en separat fil"
+msgstr "skapa signatur i en separat fil"
 
 #: g10/g10.c:327
 msgid "encrypt data"
@@ -437,15 +428,16 @@ msgstr "|[filer]|kryptera filer"
 
 #: g10/g10.c:330
 msgid "encryption only with symmetric cipher"
-msgstr "endast symetrisk kryptering"
+msgstr "endast symmetrisk kryptering"
 
 #: g10/g10.c:331
 msgid "store only"
 msgstr "endast lagring"
 
+# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
 #: g10/g10.c:332
 msgid "decrypt data (default)"
-msgstr "dekryptera data (normalläge)"
+msgstr "dekryptera data (standard)"
 
 #: g10/g10.c:333
 msgid "|[files]|decrypt files"
@@ -457,11 +449,11 @@ msgstr "verifiera en signatur"
 
 #: g10/g10.c:336
 msgid "list keys"
-msgstr "räkna upp nycklar"
+msgstr "visa en lista på nycklar"
 
 #: g10/g10.c:338
 msgid "list keys and signatures"
-msgstr "räkna upp nycklar och signaturer"
+msgstr "visa en lista på nycklar och signaturer"
 
 #: g10/g10.c:339
 msgid "check key signatures"
@@ -469,11 +461,11 @@ msgstr "verifiera nyckelsignaturer"
 
 #: g10/g10.c:340
 msgid "list keys and fingerprints"
-msgstr "räkna upp nycklar och fingeravtryck"
+msgstr "visa en lista på nycklar och fingeravtryck"
 
 #: g10/g10.c:341
 msgid "list secret keys"
-msgstr "räkna upp hemliga nycklar"
+msgstr "visa en lista på hemliga nycklar"
 
 #: g10/g10.c:342
 msgid "generate a new key pair"
@@ -537,7 +529,7 @@ msgstr "importera/slå ihop nycklar"
 
 #: g10/g10.c:367
 msgid "list only the sequence of packets"
-msgstr "skriv endast ut paketsekvensen"
+msgstr "visa endast paketsekvensen"
 
 #: g10/g10.c:369
 msgid "export the ownertrust values"
@@ -571,8 +563,8 @@ msgstr "Skapa ett skal för en fil eller standard in"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:385
-#: g10/gpgv.c:64
+# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
+#: g10/g10.c:385 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -592,11 +584,11 @@ msgstr "|NAMN|kryptera för NAMN"
 
 #: g10/g10.c:392
 msgid "|NAME|use NAME as default recipient"
-msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
+msgstr "|NAMN|använd NAMN som förvald mottagare"
 
 #: g10/g10.c:394
 msgid "use the default key as default recipient"
-msgstr "använd standardnyckeln som standardmottagare"
+msgstr "använd standardnyckeln som förvald mottagare"
 
 #: g10/g10.c:400
 msgid "use this user-id to sign or decrypt"
@@ -604,7 +596,7 @@ msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
 #: g10/g10.c:401
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|sätt kompressionsnivån till N (0 för att slå av kompression)"
+msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
 #: g10/g10.c:404
 msgid "use canonical text mode"
@@ -614,13 +606,11 @@ msgstr "använd \"ursprunglig text\"-läget"
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:416
-#: g10/gpgv.c:66
+#: g10/g10.c:416 g10/gpgv.c:66
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:417
-#: g10/gpgv.c:67
+#: g10/g10.c:417 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
@@ -628,29 +618,35 @@ msgstr "var något tystare"
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
+# Alltså även för V4-nycklar. För att vara PGP-kompatibel.
 #: g10/g10.c:419
 msgid "force v3 signatures"
-msgstr "använd v3-signaturer"
+msgstr "använd alltid v3-signaturer"
 
+# motsatsen översatt med:
+# använd alltid v3-signaturer
 #: g10/g10.c:420
 msgid "do not force v3 signatures"
-msgstr "använd inte v3-signaturer"
+msgstr "genomdriv inte användning av v3-signaturer"
 
 #: g10/g10.c:421
 msgid "force v4 key signatures"
-msgstr "använd v4-nyckelsignaturer"
+msgstr "använd alltid v4-nyckelsignaturer"
 
 #: g10/g10.c:422
 msgid "do not force v4 key signatures"
-msgstr "använd inte v4-nyckelsignaturer"
+msgstr "genomdriv inte användning av v4-nyckelsignaturer"
 
+# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp.
+# Cast-5 används som standard  vid symmetrisk kryptering. Detta kommando integritetskyddar då den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences
 #: g10/g10.c:423
 msgid "always use a MDC for encryption"
-msgstr "använd alltid en MDC för kryptering"
+msgstr "använd alltid en MDC vid kryptering"
 
+# mdc är standard för de nyare algoritmerna AES, TWOFISH
 #: g10/g10.c:425
 msgid "never use a MDC for encryption"
-msgstr "använd aldrig en MDC för kryptering"
+msgstr "använd aldrig en MDC vid kryptering"
 
 #: g10/g10.c:427
 msgid "do not make any changes"
@@ -679,7 +675,7 @@ msgstr "anta att svaret är nej på de flesta frågor"
 
 #: g10/g10.c:435
 msgid "add this keyring to the list of keyrings"
-msgstr "lägg till denna nyckelring till listan av nyckelringar"
+msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
 #: g10/g10.c:436
 msgid "add this secret keyring to the list"
@@ -703,10 +699,9 @@ msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
 #: g10/g10.c:445
 msgid "read options from file"
-msgstr "läs flaggor från fil"
+msgstr "läs inställningar från fil"
 
-#: g10/g10.c:449
-#: g10/gpgv.c:71
+#: g10/g10.c:449 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -728,11 +723,15 @@ msgstr "imitera läget som beskrivs i RFC1991"
 
 #: g10/g10.c:472
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg följer OpenPGP-standarden"
+msgstr ""
+"ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma så "
+"att gpg följer OpenPGP-standarden"
 
 #: g10/g10.c:473
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg härmar PGP 2.x-beteende"
+msgstr ""
+"ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma så "
+"att gpg härmar PGP 2.x-beteende"
 
 #: g10/g10.c:477
 msgid "|N|use passphrase mode N"
@@ -764,16 +763,19 @@ msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
 #: g10/g10.c:489
 msgid "Show Photo IDs"
-msgstr "Visa fotoidentifikation"
+msgstr "Visa foto-ID:n"
 
 #: g10/g10.c:490
 msgid "Don't show Photo IDs"
-msgstr "Visa inte fotoidentifikation"
+msgstr "Visa inte foto-ID:n"
 
+# Här anges alltså med vilket program som ska visa foto-ID:n
 #: g10/g10.c:491
 msgid "Set command line to view Photo IDs"
-msgstr "Sätt komandoraden för att visa fotoientifikation"
+msgstr "Ange kommandoraden för att visa foto-ID:n"
 
+# inställningar istället för flaggor?
+# Nej, här är det bruksanvisningen för kommandoraden.
 #: g10/g10.c:498
 msgid ""
 "@\n"
@@ -798,12 +800,11 @@ msgstr ""
 "\n"
 "-se -r Bo [fil]             signera och kryptera för användaren Bo\n"
 "--clearsign [fil]           skapa en klartextsignatur\n"
-"--detach-sign [fil]         skapa en signatur i en separat fil\n"
+"--detach-sign [fil]         skapa signatur i en separat fil\n"
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:667
-#: g10/gpgv.c:95
+#: g10/g10.c:667 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera gärna fel till <[email protected]>.\n"
@@ -813,6 +814,7 @@ msgstr ""
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
+# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
 #: g10/g10.c:687
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -833,21 +835,19 @@ msgstr ""
 
 #: g10/g10.c:701
 msgid "Pubkey: "
-msgstr "öppen nyckel:"
+msgstr "öppen nyckel: "
 
-#: g10/g10.c:707
-#: g10/keyedit.c:1588
+#: g10/g10.c:707 g10/keyedit.c:1588
 msgid "Cipher: "
-msgstr "Chiffer"
+msgstr "Chiffer: "
 
 #: g10/g10.c:713
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:719
-#: g10/keyedit.c:1634
+#: g10/g10.c:719 g10/keyedit.c:1634
 msgid "Compression: "
-msgstr "Komprimering:"
+msgstr "Komprimering: "
 
 #: g10/g10.c:802
 msgid "usage: gpg [options] "
@@ -891,7 +891,7 @@ msgstr "okänt configurationspost \"%s\"\n"
 #: g10/g10.c:1445
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "OBS: inställningsfilen \"%s\" används inte\n"
+msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
 #: g10/g10.c:1481
 #, c-format
@@ -906,7 +906,7 @@ msgstr "inställningsfil \"%s\": %s\n"
 #: g10/g10.c:1492
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "läser flaggor från \"%s\"\n"
+msgstr "läser inställningar från \"%s\"\n"
 
 #: g10/g10.c:1701
 #, c-format
@@ -925,26 +925,27 @@ msgstr "kunde inte tolka nyckelserver-URI\n"
 #: g10/g10.c:1863
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s: felaktiga importalternativ %d\n"
+msgstr "%s: felaktiga importinställningar %d\n"
 
 #: g10/g10.c:1866
 msgid "invalid import options\n"
-msgstr "felaktiga importalternativ\n"
+msgstr "felaktiga importinställningar\n"
 
 #: g10/g10.c:1873
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: felaktiga exportalternativ %d\n"
+msgstr "%s: felaktiga exportinställningar %d\n"
 
 #: g10/g10.c:1876
 msgid "invalid export options\n"
-msgstr "felaktiga exportalternativ\n"
+msgstr "felaktiga exportinställningar\n"
 
 #: g10/g10.c:1882
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
+# Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
 #: g10/g10.c:2040
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
@@ -954,8 +955,7 @@ msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2051
-#: g10/g10.c:2062
+#: g10/g10.c:2051 g10/g10.c:2062
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
@@ -978,29 +978,29 @@ msgstr ""
 
 #: g10/g10.c:2083
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "du kan inte både signera och kryptera samtidigt tillsammans med --pgp2\n"
+msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
 #: g10/g10.c:2089
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "du måste använda filer (och inte rör) tillsammans med --pgp2\n"
+msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
+# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
 #: g10/g10.c:2102
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n"
+msgstr ""
+"för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2169
-#: g10/g10.c:2187
+#: g10/g10.c:2169 g10/g10.c:2187
 msgid "selected cipher algorithm is invalid\n"
-msgstr "den valda krypteringsalgoritmen är ogiltig\n"
+msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2175
-#: g10/g10.c:2193
+#: g10/g10.c:2175 g10/g10.c:2193
 msgid "selected digest algorithm is invalid\n"
-msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
+msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 #: g10/g10.c:2181
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
+msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 #: g10/g10.c:2197
 #, c-format
@@ -1012,60 +1012,58 @@ msgstr "komprimeringsalgoritmen `%s' kan endast läsas i denna programutgåva\n"
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
 
-# jag bedömer att detta och de följande är interna felmeddelanden
-# som det är i princip omöjligt att översätta på på ett bra sätt.
-# Sannolikheten för att användaren drabbas av felmeddelandet
-# är ändå litet. Eventuellt borde meddelandena inte alls
-# översättas för att göra eventuell felsökning lättare
-# för internationella felsökare
+# antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
 #: g10/g10.c:2203
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
+# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
 #: g10/g10.c:2205
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
+# Hur djupt GnuPG ska leta i Web-of-trust.
 #: g10/g10.c:2207
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
-# cert-level? Vad är det?
-# inte testnivå i alla fall!
-# Kanske är det nivån för hur lång förtroendekedjan får vara?
+# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
 #: g10/g10.c:2209
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ogiltigt standardvärde för certifikatnivån; måste vara 0, 1, 2 eller 3\n"
+msgstr ""
+"felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
-# testnivå!? Vad är detta???
-# längd på förtroendekedjan?
+# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
 #: g10/g10.c:2211
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
+msgstr ""
+"felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
+# S2K har med krypteringen av hemliga nyckeln att göra
 #: g10/g10.c:2214
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
 #: g10/g10.c:2218
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
+msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
 #: g10/g10.c:2225
 msgid "invalid default preferences\n"
-msgstr "ogiltiga standardinställningar\n"
+msgstr "felaktiga standardinställningar\n"
 
+# Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
 #: g10/g10.c:2234
 msgid "invalid personal cipher preferences\n"
-msgstr "felaktiga inställningar av krypteringsalgoritm\n"
+msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
 #: g10/g10.c:2238
 msgid "invalid personal digest preferences\n"
-msgstr "felaktiga inställningar av checksummealgoritm\n"
+msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
 #: g10/g10.c:2242
 msgid "invalid personal compress preferences\n"
-msgstr "felaktiga inställningar av kompressionsalgoritm\n"
+msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
 #: g10/g10.c:2272
 #, c-format
@@ -1085,7 +1083,8 @@ msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge
 #: g10/g10.c:2326
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
+msgstr ""
+"du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
 #: g10/g10.c:2418
 #, c-format
@@ -1094,7 +1093,8 @@ msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
 #: g10/g10.c:2429
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
+msgstr ""
+"VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
 #: g10/g10.c:2440
 msgid "--store [filename]"
@@ -1150,9 +1150,7 @@ msgstr "--edit-key användaridentitet [kommandon]"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: g10/g10.c:2631
-#: g10/encode.c:423
-#: g10/sign.c:809
+#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
@@ -1189,12 +1187,12 @@ msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 #: g10/g10.c:2749
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "misslyckades med att ta bort skalet: %s\n"
+msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
 #: g10/g10.c:2757
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "misslyckades med att skapa skal: %s\n"
+msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
 #: g10/g10.c:2844
 #, c-format
@@ -1210,25 +1208,26 @@ msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
 # se förra kommentaren
-#: g10/g10.c:2945
-#: g10/decrypt.c:62
-#: g10/decrypt.c:145
-#: g10/verify.c:95
+#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
 #: g10/g10.c:3218
-msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-# user notation namme??
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
 #: g10/g10.c:3227
 msgid "a user notation name must contain the '@' character\n"
-msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknetr\n"
+msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
 #: g10/g10.c:3237
 msgid "a notation value must not use any control characters\n"
@@ -1236,20 +1235,22 @@ msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
 #: g10/g10.c:3272
 msgid "the given certification policy URL is invalid\n"
-msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n"
+msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
 #: g10/g10.c:3274
 msgid "the given signature policy URL is invalid\n"
-msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
+msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
 #: g10/gpgv.c:68
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
-# vad menas?
+# Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
+# Kommandot är avsett att användas i "near online system".
+# Krav från RIPE.
 #: g10/gpgv.c:70
 msgid "make timestamp conflicts only a warning"
-msgstr "konflikter vid utförande av tidsstämpling enbart en varning"
+msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
 #: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
@@ -1266,15 +1267,15 @@ msgstr ""
 #: g10/armor.c:321
 #, c-format
 msgid "armor: %s\n"
-msgstr "skal: %s\n"
+msgstr "ASCII-skal: %s\n"
 
 #: g10/armor.c:350
 msgid "invalid armor header: "
-msgstr "felaktig rubrikrad i skalet: "
+msgstr "felaktig rubrikrad i ASCII-skalet: "
 
 #: g10/armor.c:357
 msgid "armor header: "
-msgstr "rad i skalet: "
+msgstr "rad i ASCII-skalet: "
 
 #: g10/armor.c:368
 msgid "invalid clearsig header\n"
@@ -1284,21 +1285,22 @@ msgstr "felaktig rubrikrad i klartextsignatur\n"
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
+# rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
 #: g10/armor.c:544
 msgid "invalid dash escaped line: "
-msgstr "felaktig bindestreck-kodad rad: "
+msgstr "felaktig rad som börjar med bindestreck: "
 
 #: g10/armor.c:556
 msgid "unexpected armor:"
-msgstr "oväntat skal:"
+msgstr "oväntat ASCII-skal:"
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:682
-#: g10/armor.c:1258
+#: g10/armor.c:682 g10/armor.c:1258
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "hoppade över ogiltigt radix64-tecken %02x \n"
+msgstr "hoppade över felaktigt radix64-tecken %02x \n"
 
+# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
 #: g10/armor.c:725
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
@@ -1311,8 +1313,7 @@ msgstr "för tidigt filslut (i CRC-summan)\n"
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:767
-#: g10/armor.c:1295
+#: g10/armor.c:767 g10/armor.c:1295
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
@@ -1332,48 +1333,45 @@ msgstr "hittade ingen giltig OpenPGP-data.\n"
 #: g10/armor.c:1078
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "felaktigt asciiI-skal: raden är längre än %d tecken\n"
+msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
 
 #: g10/armor.c:1082
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "tecken kodade enligt \"quoted printable\"-standarden funna i skalet - detta\n"
-"beror sannolikt på att en felaktig epostserver eller epostklient har använts\n"
+"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
+"använts\n"
 
-#: g10/pkclist.c:63
-#: g10/revoke.c:603
+#: g10/pkclist.c:63 g10/revoke.c:603
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
-# känns inte heller bra
-#: g10/pkclist.c:65
-#: g10/revoke.c:605
+# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
+#: g10/pkclist.c:65 g10/revoke.c:605
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:67
-#: g10/revoke.c:604
+#: g10/pkclist.c:67 g10/revoke.c:604
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:69
-#: g10/revoke.c:606
+#: g10/pkclist.c:69 g10/revoke.c:606
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:71
-#: g10/revoke.c:607
+#: g10/pkclist.c:71 g10/revoke.c:607
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
 #: g10/pkclist.c:75
 msgid "reason for revocation: "
-msgstr "Anledning till spärren: "
+msgstr "anledning till spärren: "
 
 #: g10/pkclist.c:92
 msgid "revocation comment: "
-msgstr "Spärrkommentar: "
+msgstr "spärrkommentar: "
 
 # ej kristallklart vad förkortningarna står för
 #: g10/pkclist.c:254
@@ -1389,8 +1387,7 @@ msgstr ""
 "Inget tillitsvärde tilldelat till:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290
-#: g10/mainproc.c:1503
+#: g10/pkclist.c:290 g10/mainproc.c:1503
 msgid "                aka \""
 msgstr "      även känd som \""
 
@@ -1420,7 +1417,7 @@ msgstr " %d = Jag litar INTE på denna användare\n"
 #: g10/pkclist.c:307
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr " %d = Jag litar maginellt på denna användare\n"
+msgstr " %d = Jag litar marginellt på denna användare\n"
 
 #: g10/pkclist.c:308
 #, c-format
@@ -1444,13 +1441,11 @@ msgstr " m = gå tillbaka till huvudmenyn\n"
 msgid " s = skip this key\n"
 msgstr " s = hoppa över denna nyckel\n"
 
-# q skall bytas ut mot a såfort det kollas upp så att q också funkar.
 #: g10/pkclist.c:320
 msgid " q = quit\n"
-msgstr " q = avsluta\n"
+msgstr "a = avsluta\n"
 
-#: g10/pkclist.c:327
-#: g10/revoke.c:632
+#: g10/pkclist.c:327 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
@@ -1467,9 +1462,7 @@ msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n
 msgid "key %08lX: key has been revoked!\n"
 msgstr "nyckeln %08lX: nyckeln har spärrats!\n"
 
-#: g10/pkclist.c:444
-#: g10/pkclist.c:456
-#: g10/pkclist.c:556
+#: g10/pkclist.c:444 g10/pkclist.c:456 g10/pkclist.c:556
 msgid "Use this key anyway? "
 msgstr "Vill du använda nyckeln trots det? "
 
@@ -1481,12 +1474,15 @@ msgstr "nyckeln %08lX: en undernyckel har spärrats!\n"
 #: g10/pkclist.c:470
 #, c-format
 msgid "%08lX: key has expired\n"
-msgstr "%08lX: nyckeln har blivit för gammal\n"
+msgstr "%08lX:giltighetstiden har gått ut för nyckeln\n"
 
 #: g10/pkclist.c:480
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Det finns inget som indikerar att signaturen verkligen tillhör ägaren.\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
+"ägaren.\n"
 
 #: g10/pkclist.c:486
 #, c-format
@@ -1521,8 +1517,7 @@ msgstr ""
 "*verkligen* vet vad du gör, kan du svara ja på nästa fråga\n"
 "\n"
 
-#: g10/pkclist.c:565
-#: g10/pkclist.c:595
+#: g10/pkclist.c:565 g10/pkclist.c:595
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
@@ -1532,7 +1527,7 @@ msgstr "VARNING: denna nyckel kan ha spärrats: Spärrnyckeln saknas.\n"
 
 #: g10/pkclist.c:611
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n"
+msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
 #: g10/pkclist.c:614
 msgid "WARNING: This key has been revoked by its owner!\n"
@@ -1548,19 +1543,21 @@ msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
 #: g10/pkclist.c:626
 msgid "Note: This key has been disabled.\n"
-msgstr "Notera: Denna nyckel har deaktiverats.\n"
+msgstr "Obs: Denna nyckel har stängts av.\n"
 
 #: g10/pkclist.c:631
 msgid "Note: This key has expired!\n"
-msgstr "Notera: Denna nyckel har gått ut!\n"
+msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
 #: g10/pkclist.c:642
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
 #: g10/pkclist.c:644
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
 #: g10/pkclist.c:652
 msgid "WARNING: We do NOT trust this key!\n"
@@ -1571,7 +1568,8 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
 #: g10/pkclist.c:661
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
@@ -1580,24 +1578,21 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:817
-#: g10/pkclist.c:841
-#: g10/pkclist.c:999
-#: g10/pkclist.c:1059
+#: g10/pkclist.c:817 g10/pkclist.c:841 g10/pkclist.c:999 g10/pkclist.c:1059
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: g10/pkclist.c:827
-#: g10/pkclist.c:1031
+#: g10/pkclist.c:827 g10/pkclist.c:1031
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "hoppade över %s: öppen nyckel finns redan\n"
 
 #: g10/pkclist.c:858
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n"
+msgstr ""
+"Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n"
 
 #: g10/pkclist.c:871
 msgid ""
@@ -1611,14 +1606,13 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:892
-#: g10/pkclist.c:974
+#: g10/pkclist.c:892 g10/pkclist.c:974
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\n"
 
 #: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "Den öppna nyckeln är deaktiverad\n"
+msgstr "Den öppna nyckeln är avstängd.\n"
 
 #: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
@@ -1632,11 +1626,14 @@ msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 #: g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "hoppade över %s: den öppna nyckeln är deaktiverad\n"
+msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
 
+# plural av adressee
+# dvs. den som meddelandet är adresserat till.
+# Åtskillnad görs mellan adressee och receiver.
 #: g10/pkclist.c:1066
 msgid "no valid addressees\n"
-msgstr "inga giltiga adresser\n"
+msgstr "inga giltiga adressater\n"
 
 #: g10/keygen.c:198
 #, c-format
@@ -1646,7 +1643,7 @@ msgstr "inställningen %c%lu är inte giltig\n"
 #: g10/keygen.c:205
 #, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "inställningen %c%lu är dubblerad\n"
+msgstr "inställningen %c%lu förekommer flera gånger\n"
 
 #: g10/keygen.c:210
 #, c-format
@@ -1655,7 +1652,7 @@ msgstr "för många `%c' inställningar\n"
 
 #: g10/keygen.c:280
 msgid "invalid character in preference string\n"
-msgstr "Ogiltigt tecken i inställningssträngen\n"
+msgstr "felaktigt tecken i inställningssträngen\n"
 
 #: g10/keygen.c:638
 msgid "writing direct signature\n"
@@ -1669,16 +1666,12 @@ msgstr "skriver egensignatur\n"
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:785
-#: g10/keygen.c:869
-#: g10/keygen.c:960
+#: g10/keygen.c:785 g10/keygen.c:869 g10/keygen.c:960
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
+msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:790
-#: g10/keygen.c:874
-#: g10/keygen.c:965
+#: g10/keygen.c:790 g10/keygen.c:874 g10/keygen.c:965
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -1721,9 +1714,7 @@ msgstr "   (%d) RSA (signering och kryptering)\n"
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:1112
-#: g10/keyedit.c:682
-#: g10/revoke.c:665
+#: g10/keygen.c:1112 g10/keyedit.c:682 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -1750,7 +1741,8 @@ msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
 
 #: g10/keygen.c:1141
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för RSA.\n"
+msgstr ""
+"nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för RSA.\n"
 
 #: g10/keygen.c:1144
 msgid "keysize too small; 768 is smallest value allowed.\n"
@@ -1774,7 +1766,9 @@ msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
 #: g10/keygen.c:1164
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
 msgstr ""
 "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
 "avslöjande strålning som kan avlyssnas!\n"
@@ -1784,8 +1778,7 @@ msgstr ""
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1176
-#: g10/keygen.c:1180
+#: g10/keygen.c:1176 g10/keygen.c:1180
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
@@ -1834,7 +1827,7 @@ msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
 #: g10/keygen.c:1269
 msgid "invalid value\n"
-msgstr "ogiltigt värde\n"
+msgstr "felaktigt värde\n"
 
 #: g10/keygen.c:1274
 #, c-format
@@ -1861,14 +1854,15 @@ msgstr "Stämmer detta (j/n)? "
 #: g10/keygen.c:1335
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
 "Du behöver en användaridentitet för att identifiera din nyckel; mjukvaran\n"
-"konstruerar en användaridentitet från namn, kommentar och epostadress\n"
+"konstruerar en användaridentitet från namn, kommentar och e-postadress\n"
 "enligt följande form: \n"
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
@@ -1879,7 +1873,7 @@ msgstr "Namn: "
 
 #: g10/keygen.c:1355
 msgid "Invalid character in name\n"
-msgstr "Ogiltigt tecken i namnet\n"
+msgstr "Felaktigt tecken i namnet\n"
 
 #: g10/keygen.c:1357
 msgid "Name may not start with a digit\n"
@@ -1891,11 +1885,11 @@ msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
 #: g10/keygen.c:1367
 msgid "Email address: "
-msgstr "Epostadress: "
+msgstr "E-postadress: "
 
 #: g10/keygen.c:1378
 msgid "Not a valid email address\n"
-msgstr "Epostadressen är ogiltig\n"
+msgstr "E-postadressen är ogiltig\n"
 
 #: g10/keygen.c:1386
 msgid "Comment: "
@@ -1903,7 +1897,7 @@ msgstr "Kommentar: "
 
 #: g10/keygen.c:1392
 msgid "Invalid character in comment\n"
-msgstr "Ogiltigt tecken i kommentaren\n"
+msgstr "Felaktigt tecken i kommentaren\n"
 
 #: g10/keygen.c:1415
 #, c-format
@@ -1923,7 +1917,7 @@ msgstr ""
 
 #: g10/keygen.c:1427
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Ange inte epostadressen som namn eller kommentar\n"
+msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
 # Ej solklart vad förkortningarna står för
 #: g10/keygen.c:1432
@@ -1951,8 +1945,7 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1510
-#: g10/keyedit.c:880
+#: g10/keygen.c:1510 g10/keyedit.c:880
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
@@ -1992,14 +1985,12 @@ msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2293
-#: g10/keygen.c:2381
+#: g10/keygen.c:2293 g10/keygen.c:2381
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2294
-#: g10/keygen.c:2383
+#: g10/keygen.c:2294 g10/keygen.c:2383
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
@@ -2012,7 +2003,7 @@ msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 #: g10/keygen.c:2376
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
+msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
 #: g10/keygen.c:2390
 #, c-format
@@ -2037,85 +2028,79 @@ msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
-"Notera att denna nyckel inte kan användas för kryptering. Du kommer\n"
+"Observera att denna nyckel inte kan användas för kryptering. Du kommer\n"
 "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n"
 "undernyckel för detta syfte.\n"
 
-#: g10/keygen.c:2441
-#: g10/keygen.c:2563
+#: g10/keygen.c:2441 g10/keygen.c:2563
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:2491
-#: g10/sign.c:261
+#: g10/keygen.c:2491 g10/sign.c:261
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:2493
-#: g10/sign.c:263
+#: g10/keygen.c:2493 g10/sign.c:263
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
 #: g10/keygen.c:2502
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
+msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
 #: g10/keygen.c:2530
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/decrypt.c:98
-#: g10/encode.c:771
+#: g10/decrypt.c:98 g10/encode.c:771
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/encode.c:176
-#: g10/tdbio.c:508
-#: g10/tdbio.c:569
-#: g10/openfile.c:180
+#: g10/encode.c:176 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180
 #: g10/openfile.c:316
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte öppna: %s\n"
 
-#: g10/encode.c:207
-#: g10/sign.c:1063
+#: g10/encode.c:207 g10/sign.c:1063
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
 #: g10/encode.c:212
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "kan inte använda symetriska ESK-paket pga S2K-läge\n"
+msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
 #: g10/encode.c:223
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använderchiffer %s\n"
 
-#: g10/encode.c:233
-#: g10/encode.c:494
+#: g10/encode.c:233 g10/encode.c:494
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:302
-#: g10/encode.c:531
+#: g10/encode.c:302 g10/encode.c:531
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
 #: g10/encode.c:414
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "du kan endast krypterar till RSA nycklar som är högst 2048 bitar långa i --pgp2-läge\n"
+msgstr ""
+"du kan endast kryptera till RSA nycklar som är högst 2048 bitar långa i --"
+"pgp2-läge\n"
 
 #: g10/encode.c:429
 #, c-format
@@ -2123,20 +2108,23 @@ msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
 #: g10/encode.c:465
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:475
-#: g10/encode.c:658
+#: g10/encode.c:475 g10/encode.c:658
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas inställningar\n"
+msgstr ""
+"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
+"inställningar\n"
 
-#: g10/encode.c:573
-#: g10/sign.c:781
+#: g10/encode.c:573 g10/sign.c:781
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inställningar\n"
+msgstr ""
+"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens "
+"inställningar\n"
 
 #: g10/encode.c:717
 #, c-format
@@ -2148,31 +2136,25 @@ msgstr "du kan inte använda %s när du är i %s läge\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/export.c:157
-#: g10/keyedit.c:2501
-#: g10/delkey.c:74
-#: g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2501 g10/delkey.c:74 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/export.c:180
-#: g10/delkey.c:82
-#: g10/revoke.c:230
-#: g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "fel vid läsninga av  nyckelblock: %s\n"
+msgstr "fel vid läsning av nyckelblock: %s\n"
 
 #: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "hoppade över nyckeln %08lX - följer inte standarden RFC2440\n"
+msgstr "hoppade över nyckeln %08lX - den följer inte standarden RFC2440\n"
 
 #: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "nyckeln %08lX är inte skyddad - överhoppade över den\n"
+msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
 #: g10/export.c:213
 #, c-format
@@ -2182,7 +2164,7 @@ msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
 #: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK kontrollsumma\n"
+msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
 #: g10/export.c:310
 msgid "WARNING: nothing exported\n"
@@ -2190,29 +2172,30 @@ msgstr "VARNING: exporterade ingenting\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "för många poster i pk-cachen - inaktiverad\n"
+msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:186
-#: g10/getkey.c:2670
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX - hoppar över\n"
+msgstr ""
+"det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
+"- hoppar över\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
@@ -2298,27 +2281,27 @@ msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
 #: g10/import.c:551
-msgid "NOTE: Elgamal primary key detected - this may take some time to import\n"
+msgid ""
+"NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr "OBS: Elgamal-huvdnyckel upptäckt- denna kan ta tid att importera\n"
 
-#: g10/import.c:565
-#: g10/import.c:832
+#: g10/import.c:565 g10/import.c:832
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-# eller är det en skadad HKP-nyckel som reparerats?
-# Jag tror att undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
+# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
 #: g10/import.c:587
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "nyckeln %08lX: HKP skadad undernyckel har reparerats!\n"
+msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
 #: g10/import.c:602
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
+msgstr ""
+"nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
 
 #: g10/import.c:608
 #, c-format
@@ -2329,8 +2312,7 @@ msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:619
-#: g10/import.c:912
+#: g10/import.c:619 g10/import.c:912
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
@@ -2345,18 +2327,12 @@ msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:639
-#: g10/sign.c:688
-#: g10/sign.c:924
-#: g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:688 g10/sign.c:924 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:645
-#: g10/import.c:730
-#: g10/import.c:859
-#: g10/import.c:972
+#: g10/import.c:645 g10/import.c:730 g10/import.c:859 g10/import.c:972
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
@@ -2365,21 +2341,19 @@ msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 #: g10/import.c:662
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "nyckel %08lX: importerade öppen nyckel  \"%s\"\n"
+msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
 #: g10/import.c:684
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:701
-#: g10/import.c:929
+#: g10/import.c:701 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:708
-#: g10/import.c:935
+#: g10/import.c:708 g10/import.c:935
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
@@ -2422,12 +2396,14 @@ msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 #: g10/import.c:838
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade över den\n"
+msgstr ""
+"nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
+"över den\n"
 
 #: g10/import.c:853
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "inga standardnyckelringar: %s\n"
+msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
 #: g10/import.c:864
 #, c-format
@@ -2447,7 +2423,9 @@ msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 #: g10/import.c:906
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med spärrcertifikatet\n"
+msgstr ""
+"nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
+"spärrcertifikatet\n"
 
 #: g10/import.c:946
 #, c-format
@@ -2468,7 +2446,9 @@ msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 #: g10/import.c:1056
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s\"\n"
+msgstr ""
+"nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
+"\"\n"
 
 #: g10/import.c:1058
 #, c-format
@@ -2480,8 +2460,7 @@ msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1084
-#: g10/import.c:1128
+#: g10/import.c:1084 g10/import.c:1128
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
@@ -2509,7 +2488,7 @@ msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 #: g10/import.c:1142
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "nyckel %08lX: tog bort ogiltig spärr av undernyckel\n"
+msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
 #: g10/import.c:1179
 #, c-format
@@ -2524,36 +2503,40 @@ msgstr "nyckel %08lX: hoppade över undernyckel\n"
 #: g10/import.c:1229
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
+msgstr ""
+"nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-# Vad skippades? nyckeln eller spärrcertifikatet??
 #: g10/import.c:1238
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "nyckel %08lX: spärrcertifikat på fel plats - hoppade över\n"
+msgstr ""
+"nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
 #: g10/import.c:1255
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "nyckel %08lX: felaktigt sp?rrcertifikat (revocation certificate): %s - hoppade ?ver\n"
+msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-# signaturen?
 #: g10/import.c:1268
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "nyckel %08lX: signatur på undernyckel på fel plats - hoppade över den\n"
+msgstr ""
+"nyckel %08lX: signatur på undernyckel på fel plats - hoppade över "
+"signaturen\n"
 
 # nyckeln eller klassen?
 #: g10/import.c:1276
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
-msgstr "nyckel %08lX: oväntad signaturklass  (0x%02X) - överhoppad\n"
+msgstr ""
+"nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
 #: g10/import.c:1375
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "nyckel %08lX: användaridentitet hittades två gånger - slog ihop\n"
+msgstr ""
+"nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
 #: g10/import.c:1434
 #, c-format
@@ -2573,7 +2556,7 @@ msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 #: g10/import.c:1539
 #, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "nyckel %08lX: lagt till direkt nyckelignatur\n"
+msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
 #: g10/keyedit.c:149
 msgid "[revocation]"
@@ -2583,35 +2566,29 @@ msgstr "[spärrad]"
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:221
-#: g10/keylist.c:169
+#: g10/keyedit.c:221 g10/keylist.c:169
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:223
-#: g10/keylist.c:171
+#: g10/keyedit.c:223 g10/keylist.c:171
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:225
-#: g10/keylist.c:173
+#: g10/keyedit.c:225 g10/keylist.c:173
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:227
-#: g10/keylist.c:175
+#: g10/keyedit.c:227 g10/keylist.c:175
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:229
-#: g10/keylist.c:177
+#: g10/keyedit.c:229 g10/keylist.c:177
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:231
-#: g10/keylist.c:179
+#: g10/keyedit.c:231 g10/keylist.c:179
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
@@ -2630,19 +2607,12 @@ msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:371
-#: g10/keyedit.c:397
-#: g10/keyedit.c:422
-#: g10/keyedit.c:576
-#: g10/keyedit.c:634
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:371 g10/keyedit.c:397 g10/keyedit.c:422 g10/keyedit.c:576
+#: g10/keyedit.c:634 g10/keyedit.c:1237
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:383
-#: g10/keyedit.c:409
-#: g10/keyedit.c:434
-#: g10/keyedit.c:582
+#: g10/keyedit.c:383 g10/keyedit.c:409 g10/keyedit.c:434 g10/keyedit.c:582
 #: g10/keyedit.c:1243
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
@@ -2681,7 +2651,9 @@ msgstr ""
 
 #: g10/keyedit.c:480
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/n) "
+msgstr ""
+"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
+"n) "
 
 #: g10/keyedit.c:501
 #, c-format
@@ -2717,7 +2689,7 @@ msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
 #: g10/keyedit.c:570
 msgid "This key has expired!"
-msgstr "Notera: Giltighetstiden för denna nyckel har gått ut!"
+msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
 #: g10/keyedit.c:590
 #, c-format
@@ -2726,11 +2698,16 @@ msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
 #: g10/keyedit.c:594
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
+msgstr ""
+"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
 #: g10/keyedit.c:627
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-läge\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
+"läge\n"
 
 #: g10/keyedit.c:629
 msgid "This would make the key unusable in PGP 2.x.\n"
@@ -2738,7 +2715,8 @@ msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
 #: g10/keyedit.c:652
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
@@ -2747,12 +2725,10 @@ msgstr ""
 #: g10/keyedit.c:656
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
+msgstr ""
+"     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:657
-#: g10/keyedit.c:659
-#: g10/keyedit.c:661
-#: g10/keyedit.c:663
+#: g10/keyedit.c:657 g10/keyedit.c:659 g10/keyedit.c:661 g10/keyedit.c:663
 msgid " (default)"
 msgstr " (standard)"
 
@@ -2797,7 +2773,7 @@ msgid ""
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"VARNING: Signaturen kommer att markeras som icke exporterbar.\n"
+"VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
 #: g10/keyedit.c:706
@@ -2806,7 +2782,7 @@ msgid ""
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"VARNING: Signaturen kommer att markeras som icke möjlig att återkalla.\n"
+"VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
 #: g10/keyedit.c:713
@@ -2855,10 +2831,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:781
-#: g10/keyedit.c:3289
-#: g10/keyedit.c:3380
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:781 g10/keyedit.c:3289 g10/keyedit.c:3380 g10/keyedit.c:3453
 #: g10/sign.c:318
 #, c-format
 msgid "signing failed: %s\n"
@@ -2894,7 +2867,7 @@ msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"Du vill inte ha någon lösenmening - detta är sannolikt en dålig idé!\n"
+"Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
 #: g10/keyedit.c:888
@@ -2940,11 +2913,11 @@ msgstr "visa fingeravtryck"
 
 #: g10/keyedit.c:1002
 msgid "list"
-msgstr "list"
+msgstr "visa en lista"
 
 #: g10/keyedit.c:1002
 msgid "list key and user IDs"
-msgstr "räkna upp nycklar och användaridentiteter"
+msgstr "visa en lista på nycklar och användaridentiteter"
 
 # ???
 #: g10/keyedit.c:1003
@@ -2973,7 +2946,7 @@ msgstr "check"
 
 #: g10/keyedit.c:1006
 msgid "list signatures"
-msgstr "räkna upp signaturer"
+msgstr "visa en lista på signaturer"
 
 #: g10/keyedit.c:1007
 msgid "c"
@@ -3017,7 +2990,7 @@ msgstr "signera en nyckel lokalt utan möjlighet till återkallelse"
 
 #: g10/keyedit.c:1013
 msgid "debug"
-msgstr "debug"
+msgstr "avlusa"
 
 #: g10/keyedit.c:1014
 msgid "adduid"
@@ -3029,11 +3002,11 @@ msgstr "lägg till en användaridentitet"
 
 #: g10/keyedit.c:1015
 msgid "addphoto"
-msgstr "lägg till bild"
+msgstr "addphoto"
 
 #: g10/keyedit.c:1015
 msgid "add a photo ID"
-msgstr "lägg till en användaridentitet med foto"
+msgstr "lägg till ett foto som användaridentitet"
 
 #: g10/keyedit.c:1016
 msgid "deluid"
@@ -3045,7 +3018,7 @@ msgstr "ta bort en användaridentitet"
 
 #: g10/keyedit.c:1018
 msgid "delphoto"
-msgstr "ta bort bild"
+msgstr "delphoto"
 
 #: g10/keyedit.c:1019
 msgid "addkey"
@@ -3065,7 +3038,7 @@ msgstr "ta bort en undernyckel"
 
 #: g10/keyedit.c:1021
 msgid "addrevoker"
-msgstr "Ange spärrnyckel"
+msgstr "addrevoker"
 
 #: g10/keyedit.c:1021
 msgid "add a revocation key"
@@ -3089,7 +3062,7 @@ msgstr "ändra utgångsdatum"
 
 #: g10/keyedit.c:1024
 msgid "primary"
-msgstr "huvud"
+msgstr "primary"
 
 #: g10/keyedit.c:1024
 msgid "flag user ID as primary"
@@ -3101,7 +3074,7 @@ msgstr "toggle"
 
 #: g10/keyedit.c:1025
 msgid "toggle between secret and public key listing"
-msgstr "hoppa mellan utskrift av hemliga och öppna nycklar"
+msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
 #: g10/keyedit.c:1027
 msgid "t"
@@ -3113,7 +3086,7 @@ msgstr "pref"
 
 #: g10/keyedit.c:1028
 msgid "list preferences (expert)"
-msgstr "skriv ut inställningar (expertläge)"
+msgstr "visa en lista på  inställningar (expertläge)"
 
 #: g10/keyedit.c:1029
 msgid "showpref"
@@ -3121,7 +3094,7 @@ msgstr "showpref"
 
 #: g10/keyedit.c:1029
 msgid "list preferences (verbose)"
-msgstr "skriv ut inställningar (utförligt)"
+msgstr "visa en lista på inställningar (utförligt)"
 
 #: g10/keyedit.c:1030
 msgid "setpref"
@@ -3187,7 +3160,7 @@ msgstr "disable"
 
 #: g10/keyedit.c:1037
 msgid "disable a key"
-msgstr "deaktivera en nyckel"
+msgstr "stäng av en nyckel"
 
 #: g10/keyedit.c:1038
 msgid "enable"
@@ -3199,21 +3172,20 @@ msgstr "aktivera en nyckel"
 
 #: g10/keyedit.c:1039
 msgid "showphoto"
-msgstr "visa bild"
+msgstr "showphoto"
 
 #: g10/keyedit.c:1039
 msgid "show photo ID"
-msgstr "visa bild-ID"
+msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1059
-#: g10/delkey.c:120
+#: g10/keyedit.c:1059 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
 #: g10/keyedit.c:1097
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n"
+msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
 #: g10/keyedit.c:1115
 msgid "Secret key is available.\n"
@@ -3241,16 +3213,14 @@ msgstr "Vill du verkligen signera alla användaridentiteter? "
 
 #: g10/keyedit.c:1251
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tips: Välj det användarid du vill signera\n"
+msgstr "Tips: Välj de användarID:n du vill signera\n"
 
 #: g10/keyedit.c:1276
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1298
-#: g10/keyedit.c:1319
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1298 g10/keyedit.c:1319 g10/keyedit.c:1379
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
@@ -3266,8 +3236,7 @@ msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1342
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1342 g10/keyedit.c:1398
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
@@ -3297,7 +3266,8 @@ msgstr "Vill du verkligen spärra denna nyckel? "
 
 #: g10/keyedit.c:1472
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
+msgstr ""
+"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
 #: g10/keyedit.c:1474
 msgid "Really update the preferences? "
@@ -3327,15 +3297,15 @@ msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
 #: g10/keyedit.c:1552
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Ogiltigt kommando (försök med \"help\")\n"
+msgstr "Felaktigt kommando (försök med \"help\")\n"
 
 #: g10/keyedit.c:1611
 msgid "Digest: "
-msgstr "Sammandrag:"
+msgstr "Sammandrag: "
 
 #: g10/keyedit.c:1663
 msgid "Features: "
-msgstr "Funktioner:"
+msgstr "Funktioner: "
 
 #: g10/keyedit.c:1897
 #, c-format
@@ -3346,10 +3316,7 @@ msgstr "Denna nyckel kan spärras av nyckeln %s"
 msgid " (sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:1907
-#: g10/keyedit.c:1933
-#: g10/keyedit.c:2018
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  skapad: %s går ut: %s"
@@ -3361,12 +3328,12 @@ msgstr " tillit: %c/%c"
 
 #: g10/keyedit.c:1920
 msgid "This key has been disabled"
-msgstr "Denna nyckel har deaktiverats"
+msgstr "Denna nyckel har stängts av"
 
 #: g10/keyedit.c:1949
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "revoked! en undernyckel har spärrats: %s\n"
+msgstr "rev! undernyckeln har spärrats: %s\n"
 
 #: g10/keyedit.c:1952
 msgid "rev- faked revocation found\n"
@@ -3378,22 +3345,19 @@ msgstr "rev- hittade förfalskad spärr av nyckeln\n"
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem vid kontroll av spärren: %s\n"
 
-#: g10/keyedit.c:1974
-#: g10/keyedit.c:2057
-#: g10/keylist.c:492
-#: g10/keylist.c:532
+#: g10/keyedit.c:1974 g10/keyedit.c:2057 g10/keylist.c:492 g10/keylist.c:532
 #: g10/mainproc.c:946
 msgid "[revoked] "
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:1976
-#: g10/keyedit.c:2059
+#: g10/keyedit.c:1976 g10/keyedit.c:2059
 msgid "[expired] "
-msgstr "[Giltighetstiden har upphört]"
+msgstr "[Giltighetstiden har gått ut]"
 
 #: g10/keyedit.c:1984
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Du kan inte ange några inställningar för ett användar-ID av PGP 2.x-typ.\n"
+msgstr ""
+"Du kan inte ange några inställningar för ett användar-ID av PGP 2.x-typ.\n"
 
 #: g10/keyedit.c:1992
 msgid ""
@@ -3401,7 +3365,7 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
-"om du inte startar om  programmet.\n"
+"om du inte startar om programmet.\n"
 
 #: g10/keyedit.c:2121
 msgid ""
@@ -3414,20 +3378,21 @@ msgstr ""
 
 #: g10/keyedit.c:2181
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto- ID kan vissa versioner\n"
+"VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto- ID kan "
+"vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2186
-#: g10/keyedit.c:2459
+#: g10/keyedit.c:2186 g10/keyedit.c:2459
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
 #: g10/keyedit.c:2192
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n"
+msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
 #: g10/keyedit.c:2327
 msgid "Delete this good signature? (y/N/q)"
@@ -3462,9 +3427,12 @@ msgstr "Ingenting raderat.\n"
 
 #: g10/keyedit.c:2454
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
-msgstr "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna nyckel inte användas i vissa versioner av PGP.\n"
+msgstr ""
+"VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
+"nyckel inte användas i vissa versioner av PGP.\n"
 
 #: g10/keyedit.c:2465
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
@@ -3472,11 +3440,11 @@ msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n"
 
 #: g10/keyedit.c:2488
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Ange användar-ID för spärrnyckeln:"
+msgstr "Ange användar-ID för spärrnyckeln: "
 
 #: g10/keyedit.c:2511
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "Det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
+msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
 #: g10/keyedit.c:2521
 msgid "you cannot appoint a key as its own designated revoker\n"
@@ -3488,8 +3456,11 @@ msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
 #: g10/keyedit.c:2546
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/N): "
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
+"N): "
 
 #: g10/keyedit.c:2611
 msgid "Please remove selections from the secret keys.\n"
@@ -3519,8 +3490,7 @@ msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:2805
-#: g10/keyedit.c:2915
+#: g10/keyedit.c:2805 g10/keyedit.c:2915
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
@@ -3614,7 +3584,9 @@ msgstr "Användar-ID \"%s\" är redan spärrad\n"
 #: g10/keyedit.c:3364
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i framtiden\n"
+msgstr ""
+"VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
+"framtiden\n"
 
 #: g10/keyedit.c:3537
 #, c-format
@@ -3624,29 +3596,26 @@ msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
 #: g10/keylist.c:112
 #, c-format
 msgid "Critical signature policy: "
-msgstr "FELAKTIG signatur fr?n \""
+msgstr "Viktig signaturpolicy: "
 
 #: g10/keylist.c:114
 #, c-format
 msgid "Signature policy: "
-msgstr "Signatur-policy: "
+msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:139
-#: g10/keylist.c:162
-#: g10/mainproc.c:811
-#: g10/mainproc.c:820
+#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:811 g10/mainproc.c:820
 msgid "WARNING: invalid notation data found\n"
-msgstr "VARNING: ogiltig notationsdata hittades\n"
+msgstr "VARNING: ogiltig noteringsdata hittades\n"
 
 #: g10/keylist.c:148
 #, c-format
 msgid "Critical signature notation: "
-msgstr "FELAKTIG signatur fr?n \""
+msgstr "Viktig signaturnotation: "
 
 #: g10/keylist.c:150
 #, c-format
 msgid "Signature notation: "
-msgstr "Signatur-notering:"
+msgstr "Signaturnotering: "
 
 #: g10/keylist.c:157
 msgid "not human readable"
@@ -3656,8 +3625,7 @@ msgstr "inte möjlig att läsa för människor"
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:534
-#: g10/mainproc.c:948
+#: g10/keylist.c:534 g10/mainproc.c:948
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
@@ -3668,7 +3636,7 @@ msgstr "Huvudnyckelns fingeravtryck:"
 
 #: g10/keylist.c:1048
 msgid "     Subkey fingerprint:"
-msgstr "   Undernyckelns fingeravtryck:"
+msgstr "    Undernyckelns fingeravtryck:"
 
 #: g10/keylist.c:1055
 msgid " Primary key fingerprint:"
@@ -3676,10 +3644,9 @@ msgstr "Huvudnyckelns fingeravtryck:"
 
 #: g10/keylist.c:1057
 msgid "      Subkey fingerprint:"
-msgstr "   Undernyckelns fingeravtryck:"
+msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1061
-#: g10/keylist.c:1065
+#: g10/keylist.c:1061 g10/keylist.c:1065
 msgid "     Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
@@ -3698,14 +3665,12 @@ msgstr "Fel lösenmening eller okänd krypteringsalgoritm (%d)\n"
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:301
-#: g10/encr-data.c:66
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/mainproc.c:305
-#: g10/encr-data.c:68
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
@@ -3720,16 +3685,10 @@ msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 msgid "public key is %08lX\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
-# DEK betyder Data Encryption Key, Meddelandet är förvirrande
-# men efter att ha kikat i koden har jag kommit fram till att
-# meddelandet bara visas om verbose-flaggan är satt, och då
-# markerar meddelandet att get_session_key lyckades hitta
-# rätt publik nyckel att kryptera datat med. Jag tycker
-# inte att svenska översättningen är mycket obskyrare än engelska
-# originalet iallafall.
+# Men jag ändrade så det blev närmare originalet. Per
 #: g10/mainproc.c:404
 msgid "public key encrypted data: good DEK\n"
-msgstr "data krypterad med öppen nyckel: korrekt krypteringsnyckel\n"
+msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
 #: g10/mainproc.c:456
 #, c-format
@@ -3756,8 +3715,7 @@ msgstr "krypterad med %lu lösenmeningar\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenmening\n"
 
-#: g10/mainproc.c:512
-#: g10/mainproc.c:531
+#: g10/mainproc.c:512 g10/mainproc.c:531
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
@@ -3765,16 +3723,20 @@ msgstr "antar att %s krypterade data\n"
 #: g10/mainproc.c:519
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s istället\n"
+msgstr ""
+"IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
+"istället\n"
 
 #: g10/mainproc.c:549
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
+# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
 #: g10/mainproc.c:553
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
+# Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
 #: g10/mainproc.c:556
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
@@ -3786,7 +3748,7 @@ msgstr "dekrypteringen misslyckades: %s\n"
 
 #: g10/mainproc.c:581
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "OBS: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
+msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
 #: g10/mainproc.c:583
 #, c-format
@@ -3801,7 +3763,7 @@ msgstr ""
 
 #: g10/mainproc.c:823
 msgid "Notation: "
-msgstr "Notation: "
+msgstr "Notering: "
 
 # finns det någon bra svensk översättning av policy?
 #: g10/mainproc.c:835
@@ -3812,8 +3774,7 @@ msgstr "Policy: "
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1333
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1333 g10/mainproc.c:1343
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
@@ -3826,21 +3787,20 @@ msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1430
-#: g10/mainproc.c:1463
+#: g10/mainproc.c:1430 g10/mainproc.c:1463
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1431
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1431 g10/mainproc.c:1464
 msgid "Expired signature from \""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1432
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1432 g10/mainproc.c:1465
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
+# Visas vid ogiltig signatur:
+# Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
 #: g10/mainproc.c:1467
 msgid "[uncertain]"
 msgstr "[osäkert]"
@@ -3877,15 +3837,16 @@ msgstr "okänd"
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1664
-#: g10/mainproc.c:1680
-#: g10/mainproc.c:1766
+#: g10/mainproc.c:1664 g10/mainproc.c:1680 g10/mainproc.c:1766
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
 #: g10/mainproc.c:1707
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "VARNING: multipla signaturerer upptäckta. Endast den första kommer att kontrolleras.\n"
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
+"kontrolleras.\n"
 
 #: g10/mainproc.c:1715
 #, c-format
@@ -3903,7 +3864,7 @@ msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 #: g10/misc.c:99
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "kan inte deaktivera minnesutskrifter: %s\n"
+msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
 #: g10/misc.c:163
 msgid "Experimental algorithms should not be used!\n"
@@ -3911,14 +3872,17 @@ msgstr "Experimentella algoritmer bör inte användas!\n"
 
 #: g10/misc.c:193
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "denna krypteringsalgoritm är föråldrad, använd istället en mer normal algoritm!\n"
+msgstr ""
+"denna krypteringsalgoritm är föråldrad, använd istället en mer normal "
+"algoritm!\n"
 
 #: g10/misc.c:301
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n"
 
 #: g10/misc.c:302
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n"
 
 #: g10/misc.c:534
@@ -3959,8 +3923,7 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:459
-#: g10/passphrase.c:506
+#: g10/passphrase.c:459 g10/passphrase.c:506
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
@@ -3987,8 +3950,7 @@ msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:549
-#: g10/hkp.c:156
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
@@ -3997,14 +3959,11 @@ msgstr "kan inte ansluta till \"%s\": %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:578
-#: g10/passphrase.c:885
-#: g10/passphrase.c:998
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
-msgstr "problem med GPG-Agent, inaktiverar den\n"
+msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:680
-#: g10/passphrase.c:1104
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
@@ -4036,13 +3995,11 @@ msgstr "lösenmeningen är för lång\n"
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar från GPG-Agent\n"
 
-#: g10/passphrase.c:780
-#: g10/passphrase.c:879
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:785
-#: g10/passphrase.c:969
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
@@ -4099,7 +4056,12 @@ msgstr "läser från standard in ...\n"
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
+# se förra kommentaren
 #: g10/plaintext.c:472
+#, fuzzy, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "kan inte öppna \"%s\"\n"
+
 #: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
@@ -4169,7 +4131,7 @@ msgstr "söker \"%s\" från HKP-server %s\n"
 #: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "kan inte h?mta nyckeln fr?n en nyckelserver: %s\n"
+msgstr "kan inte söka på nyckelservern: %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
@@ -4196,14 +4158,16 @@ msgstr "Fel lösenmening; försök igen!"
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-# är det nyckeln som är svag, konstigt
+# För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
 #: g10/seckey-cert.c:297
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n"
 
 #: g10/seckey-cert.c:335
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga nyckeln\n"
+msgstr ""
+"skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
+"nyckeln\n"
 
 #: g10/sig-check.c:70
 msgid "WARNING: signature digest conflict in message\n"
@@ -4219,11 +4183,14 @@ msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
 #: g10/sig-check.c:96
 #, c-format
 msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n"
-msgstr "WARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
+msgstr ""
+"VARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
 
 #: g10/sig-check.c:233
 #, c-format
-msgid "key %08lX: this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgid ""
+"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"signatures!\n"
 msgstr ""
 "nyckel %08lX:: detta är en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte är säker för signaturer!\n"
@@ -4242,14 +4209,18 @@ msgstr "den öppna nyckeln %08lX är %lu sekunder nyare än signaturen\n"
 # c-format behövs inte i singularis
 #: g10/sig-check.c:252
 #, c-format
-msgid "key %08lX has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key %08lX has been created %lu second in future (time warp or clock "
+"problem)\n"
 msgstr ""
 "nyckel  %08lX är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
 #: g10/sig-check.c:254
 #, c-format
-msgid "key %08lX has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key %08lX has been created %lu seconds in future (time warp or clock "
+"problem)\n"
 msgstr ""
 "nyckel %08lX är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
@@ -4262,17 +4233,20 @@ msgstr "OBS: signaturnyckeln %08lX, gick ut vid %s\n"
 #: g10/sig-check.c:370
 #, c-format
 msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd kritisk bit är satt\n"
+msgstr ""
+"antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd "
+"kritisk bit är satt\n"
 
 #: g10/sig-check.c:614
 #, c-format
 msgid "key %08lX: no subkey for subkey revocation packet\n"
-msgstr "nyckel %08lX: ingen undernyckel för spärr av undernyckel\n"
+msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n"
 
 #: g10/sig-check.c:640
 #, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
-msgstr "nyckel %08lX: ingen anv?ndaridentitet f?r signaturen\n"
+msgstr ""
+"nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n"
 
 # notation data?
 #: g10/sign.c:84
@@ -4283,12 +4257,16 @@ msgstr ""
 
 #: g10/sign.c:92
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n"
+msgstr ""
+"kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en "
+"v3-nyckel (PGP 2.x-typ)\n"
 
 #: g10/sign.c:111
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan expansion.\n"
+msgstr ""
+"VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
+"expansion.\n"
 
 #: g10/sign.c:137
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
@@ -4296,12 +4274,17 @@ msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
 
 #: g10/sign.c:145
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n"
+msgstr ""
+"kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
+"2.x-typ)\n"
 
 #: g10/sign.c:158
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan expansion.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
+"expansion.\n"
 
 #: g10/sign.c:313
 #, c-format
@@ -4322,10 +4305,9 @@ msgstr "VARNING: \"%s\" är en tom fil\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
-" i --pgp2-läge\n"
+"när du är i --pgp2-läge\n"
 
-#: g10/sign.c:683
-#: g10/sign.c:919
+#: g10/sign.c:683 g10/sign.c:919
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -4333,7 +4315,9 @@ msgstr "kan inte skapa %s: %s\n"
 #: g10/sign.c:712
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?llningar\n"
+msgstr ""
+"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
+"llningar\n"
 
 #: g10/sign.c:804
 msgid "signing:"
@@ -4341,7 +4325,9 @@ msgstr "signerar:"
 
 #: g10/sign.c:903
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "du kan endast krypterar till RSA nycklar som ?r h?gst 2048 bitar l?nga i --pgp2-l?ge\n"
+msgstr ""
+"du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
+"när du är i --pgp2-läge\n"
 
 #: g10/sign.c:1057
 #, c-format
@@ -4358,14 +4344,12 @@ msgstr "kan inte hantera text med rader längre än %d tecken\n"
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: g10/tdbio.c:128
-#: g10/tdbio.c:1410
+#: g10/tdbio.c:128 g10/tdbio.c:1410
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:134
-#: g10/tdbio.c:1417
+#: g10/tdbio.c:134 g10/tdbio.c:1417
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
@@ -4384,23 +4368,17 @@ msgstr "%s: ingen åtkomst: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:496
-#: g10/tdbio.c:514
-#: g10/tdbio.c:557
+#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: kan inte skapa lås\n"
 
-#: g10/tdbio.c:498
-#: g10/tdbio.c:560
+#: g10/tdbio.c:498 g10/tdbio.c:560
 #, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: kan inte skapa l?s\n"
+msgstr "%s: kan inte skapa lås\n"
 
-#: g10/tdbio.c:504
-#: g10/openfile.c:250
-#: g10/openfile.c:325
-#: g10/keyring.c:1460
+#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
@@ -4413,7 +4391,7 @@ msgstr "%s: misslyckades med att skapa versionspost: %s"
 #: g10/tdbio.c:523
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: felaktig tillitsdatabas skapad\n"
+msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
 #: g10/tdbio.c:526
 #, c-format
@@ -4427,7 +4405,7 @@ msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 #: g10/tdbio.c:582
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: felaktig tillitsdatabas\n"
+msgstr "%s: ogiltig tillitsdatabas\n"
 
 #: g10/tdbio.c:614
 #, c-format
@@ -4439,18 +4417,13 @@ msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:638
-#: g10/tdbio.c:674
-#: g10/tdbio.c:688
-#: g10/tdbio.c:724
-#: g10/tdbio.c:1343
-#: g10/tdbio.c:1370
+#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724
+#: g10/tdbio.c:1343 g10/tdbio.c:1370
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:651
-#: g10/tdbio.c:703
+#: g10/tdbio.c:651 g10/tdbio.c:703
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
@@ -4524,7 +4497,7 @@ msgstr "nyckel %08lX förekommer mer än en gång i tillitsdatabasen\n"
 #: g10/trustdb.c:289
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - ?verhoppad\n"
+msgstr "nyckel %08lX: hittade ingen motsvarande öppen nyckel - överhoppad\n"
 
 # är det en bekräftelse av en förändring eller ett konstaterande?
 # Jfr nyckeln %08lX är förbehållslöst betrodd\n
@@ -4533,26 +4506,24 @@ msgstr "nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - ?ver
 msgid "key %08lX marked as ultimately trusted\n"
 msgstr "nyckeln %08lX är markerad som förbehållslöst betrodd\n"
 
-# req är nog felstavat i originalet då det syftar på record och inte
-# request
+# req står för request
+# kollat med Werner. Per
 #: g10/trustdb.c:324
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "tillitspost %lu, posttyp %d: kunde inte läsa: %s\n"
+msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
 #: g10/trustdb.c:330
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:345
-#: g10/tdbdump.c:59
+#: g10/trustdb.c:345 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/trustdb.c:360
-#: g10/tdbdump.c:217
+#: g10/trustdb.c:360 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@ -4561,8 +4532,7 @@ msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:465
-#: g10/trustdb.c:1814
+#: g10/trustdb.c:465 g10/trustdb.c:1814
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -4605,12 +4575,15 @@ msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 #: g10/trustdb.c:1680
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr "Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda nyckeln %08lX \n"
+msgstr ""
+"Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda "
+"nyckeln %08lX \n"
 
 #: g10/trustdb.c:1755
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "kontrollerar vid djupet %d signerad=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"kontrollerar vid djupet %d signerad=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:110
 msgid ""
@@ -4628,19 +4601,18 @@ msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:129
-#: g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "nyckeln är inte markerad som osäker - det går inte att använda den med fejkad slumptalsgenerator!\n"
+msgstr ""
+"nyckeln är inte markerad som osäker - det går inte att använda den med "
+"fejkad slumptalsgenerator!\n"
 
-# bubblerad?
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "hoppade över \"%s\": kopia\n"
+msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:164
-#: g10/skclist.c:172
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade över  `%s': %s\n"
@@ -4651,7 +4623,9 @@ msgstr "hoppade över: hemlig nyckel finns redan\n"
 
 #: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
 msgstr ""
 "hoppade över  `%s': detta är en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte är säker för signaturer!\n"
@@ -4691,7 +4665,8 @@ msgstr "ny konfigurationsfil `%s'skapad\n"
 #: g10/openfile.c:354
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
+msgstr ""
+"VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
 #: g10/openfile.c:383
 #, c-format
@@ -4703,11 +4678,13 @@ msgstr "%s: kan inte skapa katalog: %s\n"
 msgid "%s: directory created\n"
 msgstr "%s: katalog skapad\n"
 
+# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"VARNING: meddelandet krypterades med en svag nyckel i den symmetriska\n"
-"krypteringen.\n"
+"VARNING: meddelandet krypterades med en svag nyckel\n"
+"i den symmetriska krypteringen.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -4728,8 +4705,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
 
-#: g10/delkey.c:121
-#: g10/delkey.c:128
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
@@ -4795,10 +4771,12 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Ange användaridentiteten till vilken du vill skicka meddelandet."
 
-# Ska inte avsnittet om ElGAmal -signaturer utgå!
+# Ska inte avsnittet om ElGAmal -signaturer utgå! Sådana signaturer knäcktes 2004.
+# Jo, enligt Werner ska avsnittet bort till nästa version.
 #: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
@@ -4808,7 +4786,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -4829,11 +4808,13 @@ msgstr ""
 "OpenPGP-standarden skiljer på två varianter av denna algoritm: en som bara\n"
 "kan användas för kryptering och en som både kan signera och kryptera.\n"
 "Egentligen är det samma algoritm, men vissa parametrar måste väljas på\n"
-"ett speciellt sätt för att skapa en säker nyckel för signaturer: detta program\n"
+"ett speciellt sätt för att skapa en säker nyckel för signaturer: detta "
+"program\n"
 "gör detta men andra OpenPGP-implementationer behöver inte förstå\n"
 "signatur+kryptering varianten.\n"
 "\n"
-"Den första nyckeln (huvudnyckeln) måste alltid vara en nyckel som kan användas\n"
+"Den första nyckeln (huvudnyckeln) måste alltid vara en nyckel som kan "
+"användas\n"
 "för att skapa signaturer. Detta är anledningen till att den ElGamal-variant\n"
 "som bara krypterar inte är tillgänglig i denna meny"
 
@@ -4861,13 +4842,8 @@ msgstr ""
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:109
-#: g10/helptext.c:114
-#: g10/helptext.c:126
-#: g10/helptext.c:158
-#: g10/helptext.c:186
-#: g10/helptext.c:191
-#: g10/helptext.c:196
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
@@ -4889,11 +4865,11 @@ msgstr "Ange namnet på nyckelns ägare"
 
 #: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
-msgstr "ange en epostadress. Detta är valfritt men rekommenderas varmt"
+msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
 #: g10/helptext.c:140
 msgid "Please enter an optional comment"
-msgstr "Ange en valfri kommentar"
+msgstr "Ange en kommentar (frivilligt)"
 
 #: g10/helptext.c:145
 msgid ""
@@ -4905,7 +4881,7 @@ msgid ""
 msgstr ""
 "N  för att ändra namnet.\n"
 "C  för att ändra kommentaren.\n"
-"E  för att ändra epostadressen.\n"
+"E  för att ändra e-postadressen.\n"
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
@@ -4919,51 +4895,74 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"När du signerar ett användar-ID på en nyckel, måste du först kontrollera att nyckeln\n"
-"verkligen tillhör den person som nämns i användar-ID:t.  Det är viktigt för andra att\n"
+"När du signerar ett användar-ID på en nyckel, måste du först kontrollera att "
+"nyckeln\n"
+"verkligen tillhör den person som nämns i användar-ID:t.  Det är viktigt för "
+"andra att\n"
 "få veta hur noga du har kontrollerat detta.\n"
 "\n"
-"\"0\" betyder att du inte påstår någonting om hur noga du kontrolleratnyckeln.\n"
+"\"0\" betyder att du inte påstår någonting om hur noga du "
+"kontrolleratnyckeln.\n"
 "\n"
-"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra det\n"
-"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är användbartför\n"
-"    en \"persona\" kontroll, där du signerar nyckeln för en användare med pseudonym.\n"
+"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra "
+"det\n"
+"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är "
+"användbartför\n"
+"    en \"persona\" kontroll, där du signerar nyckeln för en användare med "
+"pseudonym.\n"
 "\n"
-"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda att\n"
-"    du kontrollerade fingeravtrycket och kontrollerade användar-ID:t för nyckeln\n"
+"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda "
+"att\n"
+"    du kontrollerade fingeravtrycket och kontrollerade användar-ID:t för "
+"nyckeln\n"
 "    mot en fotolegitimation.\n"
 "\n"
-"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  Detta kan t.ex.\n"
-"    betyda att du kontrollerade nyckelns fingeravtryck direkt med nyckelinnehavaren\n"
-"    och att du kontrollerade, med hjälp av svårförfalskade identitetsdokument\n"
+"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  "
+"Detta kan t.ex.\n"
+"    betyda att du kontrollerade nyckelns fingeravtryck direkt med "
+"nyckelinnehavaren\n"
+"    och att du kontrollerade, med hjälp av svårförfalskade "
+"identitetsdokument\n"
 "a\n"
 "    med foto (tex ett körkort) att namnet på innehavaren stämmer med\n"
-"    namnet i användar-ID:t på nyckeln, och slutligen att du kontrollerade att(genom att utväxla\n"
-"    e-postmeddelanden) att e-postadressen på nyckeln tillhör nyckelinnehavaren.\n"
+"    namnet i användar-ID:t på nyckeln, och slutligen att du kontrollerade att"
+"(genom att utväxla\n"
+"    e-postmeddelanden) att e-postadressen på nyckeln tillhör "
+"nyckelinnehavaren.\n"
 "\n"
 "Obs! Ovanstående exempel för nivåerna 2 och 3 är bara förslag.\n"
 "Slutligen är det bara du själv som avgör vad \"viss\" and \"noggrann\"\n"
@@ -5040,8 +5039,10 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"Ändra dina inställningar för alla användar-ID:n (eller enbart för en av de valda)\n"
-"till den aktuella listan på inställningar. Tidsstämplingen för alla påverkade\n"
+"Ändra dina inställningar för alla användar-ID:n (eller enbart för en av de "
+"valda)\n"
+"till den aktuella listan på inställningar. Tidsstämplingen för alla "
+"påverkade\n"
 "egensignaturer kommer att flyttas fram en sekund.\n"
 
 #: g10/helptext.c:244
@@ -5084,10 +5085,11 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"Du borde ange en anledning till certifikationen. Beroende på sammanhanget\n"
-"har du möjligheten att välja från följande lista:\n"
+"Du borde ange en anledning till spärren. Beroende på sammanhanget\n"
+"har du möjlighet att välja från följande lista:\n"
 "  \"Nyckeln har tappat sin säkerhet\"\n"
-"     Använd denna om du har anledning att tro att icke auktoriserade personer\n"
+"     Använd denna om du har anledning att tro att icke auktoriserade "
+"personer\n"
 "     har fått tillgång till din hemliga nyckel.\n"
 "  \"Nyckeln har ersatts\"\n"
 "     Använd denna om du har ersatt denna nyckel med en nyare.\n"
@@ -5095,7 +5097,7 @@ msgstr ""
 "     Använd denna om du har pensionerat denna nyckel.\n"
 "  \"Användaridentiteten är inte längre giltig\"\n"
 "     Använd denna för att visa att denna användaridentitet inte längre\n"
-"     skall användas. Detta används normalt för att visa att en epostadress\n"
+"     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
 #: g10/helptext.c:286
@@ -5105,7 +5107,8 @@ msgid ""
 "An empty line ends the text.\n"
 msgstr ""
 "Om du vill kan du ange en text som beskriver varför du utfärdar\n"
-"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort och koncis.\n"
+"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort "
+"och koncis.\n"
 "En tom rad avslutar texten.\n"
 
 #: g10/helptext.c:301
@@ -5117,22 +5120,22 @@ msgstr "Det finns ingen hjälp tillgänglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-# märkligt felmeddelande, kolla upp
+# Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
 #: g10/keyring.c:1226
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
@@ -5195,9 +5198,10 @@ msgstr "Skriv JPEG-filnamnet för foto-ID: "
 msgid "Unable to open photo \"%s\": %s\n"
 msgstr "Kan inte öppna fotot \"%s\": %s\n"
 
+# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
 #: g10/photoid.c:97
 msgid "Are you sure you want to use it (y/N)? "
-msgstr "Vill du verkligen sp?rra denna nyckel? "
+msgstr "Vill du verkligen använda det (j/N)?"
 
 #: g10/photoid.c:112
 #, c-format
@@ -5223,9 +5227,10 @@ msgstr "%s: kan inte skapa katalog: %s\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
 #: g10/exec.c:325
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
-"anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
+"anrop av externa program är avstängt pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
 #: g10/exec.c:355
@@ -5242,8 +5247,7 @@ msgstr "Kunde inte köra %s \"%s\": %s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/exec.c:524
-#: g10/exec.c:583
+#: g10/exec.c:524 g10/exec.c:583
 msgid "unnatural exit of external program\n"
 msgstr "externa program avslutades felaktigt\n"
 
@@ -5256,8 +5260,7 @@ msgstr "Kunde inte köra det externa programmet\n"
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: g10/exec.c:594
-#: g10/exec.c:601
+#: g10/exec.c:594 g10/exec.c:601
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
@@ -5267,9 +5270,7 @@ msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/keyid.c:317
-#: g10/keyid.c:329
-#: g10/keyid.c:341
+#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341
 msgid "never     "
 msgstr "aldrig"
 
@@ -5278,12 +5279,8 @@ msgid "key incomplete\n"
 msgstr "ofullständing nyckel\n"
 
 # Vad?
-#: g10/revoke.c:102
-#: g10/revoke.c:116
-#: g10/revoke.c:128
-#: g10/revoke.c:174
-#: g10/revoke.c:186
-#: g10/revoke.c:568
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:568
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
@@ -5293,8 +5290,7 @@ msgstr "build_packet misslyckades: %s\n"
 msgid "key %08lX incomplete\n"
 msgstr "nyckel %08lX är inte komplett\n"
 
-#: g10/revoke.c:214
-#: g10/revoke.c:433
+#: g10/revoke.c:214 g10/revoke.c:433
 msgid "sorry, can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
@@ -5306,19 +5302,21 @@ msgstr "Att spärras av:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:297
-#: g10/revoke.c:503
+#: g10/revoke.c:297 g10/revoke.c:503
 msgid "Create a revocation certificate for this key? "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
-#: g10/revoke.c:310
-#: g10/revoke.c:534
+# --force översatt med:
+# genomdriv (använd alltid?)
+# -do-not-force översatt med:
+# genomdriv inte
+# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
+#: g10/revoke.c:310 g10/revoke.c:534
 msgid "ASCII armored output forced.\n"
-msgstr "utdata med ett ascii-skal valt.\n"
+msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:324
-#: g10/revoke.c:548
+#: g10/revoke.c:324 g10/revoke.c:548
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
@@ -5369,8 +5367,8 @@ msgstr ""
 "Var vänlig flytta det till ett media du kan gömma; om Mallory får\n"
 "får tillgång till detta certificate kan han göra din nyckel oanvändbar.\n"
 "Det är klokt att skriva ut detta certifikat och gömma det, ifall ditt\n"
-"media blir oläsligt.  But have some caution:  The print system of\n"
-"your machine might store the data and make it available to others!\n"
+"media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
+"din dator kan spara data så att det blir åtkomligt för andra!\n"
 
 #: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
@@ -5387,7 +5385,7 @@ msgstr "(Troligen vill du välja %d här)\n"
 
 #: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Skriv en frivillig beskrivning; avsluta med en tom rad:\n"
+msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
 #: g10/revoke.c:696
 #, c-format
@@ -5416,15 +5414,16 @@ msgstr ""
 #: g10/tdbdump.c:140
 #, c-format
 msgid "can't open file: %s\n"
-msgstr "Kan inte öppna fil %s\n"
+msgstr "Kan inte öppna fil: %s\n"
 
 #: g10/tdbdump.c:151
 msgid "line too long\n"
 msgstr "raden är för lång\n"
 
+# Det ska vara ett kolon på denna plats, men det saknas!
 #: g10/tdbdump.c:159
 msgid "error: missing colon\n"
-msgstr "fel: saknar kolon\n"
+msgstr "fel: kolonet saknas\n"
 
 #: g10/tdbdump.c:164
 msgid "error: invalid fingerprint\n"
@@ -5442,5 +5441,4 @@ msgstr "fel vid sökning av tillitsvärde: %s\n"
 #: g10/tdbdump.c:208
 #, c-format
 msgid "read error: %s\n"
-msgstr "Läsfel:  %s\n"
-
+msgstr "läsfel:  %s\n"
diff --git a/po/tr.po b/po/tr.po
index 99223095b..a2efca229 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -2105,29 +2105,29 @@ msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
 "oldu\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
@@ -3866,7 +3866,7 @@ msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
@@ -3875,11 +3875,11 @@ msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (asıl anahtar kimliği %08lX)"
@@ -3911,16 +3911,16 @@ msgstr "Parola çok uzun\n"
 msgid "invalid response from agent\n"
 msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3930,22 +3930,22 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 "%u bitlik %s anahtarı, %08lX kimliği ile\n"
 "%s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
@@ -4011,41 +4011,41 @@ msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "anahtar sunucusunun %s adresinden anahtar alınamadı\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "\"%s\" adresine gönderme hatası: %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "\"%s\" adresine gönderme işlemi başarılı (durum=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "\"%s\" adresine gönderme işlemi başarısız (durum=%u)\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "bu anahtar sunucusu --search-keys seçeneğini desteklemiyor\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "anahtar sunucusu aranamıyor: %s\n"
@@ -4589,7 +4589,7 @@ msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
@@ -4979,17 +4979,17 @@ msgstr "yardım mevcut değil"
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2aab3b9c8..767530474 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2004-07-20 15:50+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -2067,26 +2067,26 @@ msgstr "���棺û�е����κζ���\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk ��������Ŀ̫�ࡪ���ѽ���\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[�Ҳ����û���ʶ]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid ������Ч����Կ %08lX ��Ч\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "��Կ %08lX û�����Ӧ��˽Կ�������ں���\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "ʹ����Կ %08lX ������Կ %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��Կ %08lX��ֻ��˽Կ��û�й�Կ����������\n"
@@ -3788,7 +3788,7 @@ msgstr "GPG_AGENT_INFO ����������ʽ����\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��֧�� gpg-agent Э��汾 %d\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�޷���������%s����%s\n"
@@ -3797,11 +3797,11 @@ msgstr "�޷���������%s����%s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "�� gpg-agent ͨѶ������\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "������������⡪������ͣ�ô�������\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(��Կ�׺� %08lX)"
@@ -3833,16 +3833,16 @@ msgstr "����̫��\n"
 msgid "invalid response from agent\n"
 msgstr "����������Ӧ��Ч\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "�û�ȡ��\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "������������⣺�������򷵻� 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3852,20 +3852,20 @@ msgstr ""
 "����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
 "\""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "��������ģʽ���޷�ѯ������\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "���������룺"
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "��������һ�����룺"
 
@@ -3931,41 +3931,41 @@ msgstr "ע�⣺˽Կ %08lX ���� %s ����\n"
 msgid "NOTE: key has been revoked"
 msgstr "ע�⣺��Կ�ѱ�����"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�޷��ӹ�Կ������ȡ����Կ�� %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "�ϴ�����%s����ʱ��������%s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�ɹ��ϴ�����%s��(״̬ = %u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "�ϴ�����%s��ʧ�ܣ�״̬ = %u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr "�˹�Կ��������֧�� --search-keys\n"
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "�޷���Ѱ��Կ��������%s\n"
@@ -4480,7 +4480,7 @@ msgstr "����������Կ������������\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�ԳƼ����޷�������������Կ���Ѿ����� %d �Σ�\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA Ҫ��ʹ�� 160 �ֽڵ�ɢ���㷨\n"
 
@@ -4861,17 +4861,17 @@ msgstr "û�п��õİ���"
 msgid "No help available for `%s'"
 msgstr "��%s��û�п��õİ���"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "����Կ�׻���%s��ʱ��������%s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Կ�׻���%s���ѽ���\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 91955f9c5..96ab7368b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-08-13 18:54+0200\n"
+"POT-Creation-Date: 2004-12-27 17:50+0100\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -2072,26 +2072,26 @@ msgstr "ĵ�i�G�S���ץX����F��\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2672
+#: g10/getkey.c:186 g10/getkey.c:2689
 msgid "[User id not found]"
 msgstr "[�䤣��ϥΪ� ID]"
 
-#: g10/getkey.c:1607
+#: g10/getkey.c:1630
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
 
-#: g10/getkey.c:2160
+#: g10/getkey.c:2179
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2407
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
 
-#: g10/getkey.c:2435
+#: g10/getkey.c:2454
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
@@ -3785,7 +3785,7 @@ msgstr "�Q�ܳy�� GPG_AGENT_INFO �����ܼ�\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent ��w���� %d ���Q�䴩\n"
 
-#: g10/passphrase.c:549 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:156
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�L�k�s���� `%s' �G %s\n"
@@ -3794,11 +3794,11 @@ msgstr "�L�k�s���� `%s' �G %s\n"
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ���q�T���D\n"
 
-#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
+#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
 
-#: g10/passphrase.c:680 g10/passphrase.c:1098
+#: g10/passphrase.c:680 g10/passphrase.c:1104
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�D�n���_ ID %08lX)"
@@ -3830,16 +3830,16 @@ msgstr "�K�X��Ӫ�\n"
 msgid "invalid response from agent\n"
 msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
 
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:780 g10/passphrase.c:879
 msgid "cancelled by user\n"
 msgstr "�ѨϥΪ̨����F\n"
 
-#: g10/passphrase.c:785 g10/passphrase.c:963
+#: g10/passphrase.c:785 g10/passphrase.c:969
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
 
-#: g10/passphrase.c:1084
+#: g10/passphrase.c:1090
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3849,20 +3849,20 @@ msgstr ""
 "�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
 "\""
 
-#: g10/passphrase.c:1093
+#: g10/passphrase.c:1099
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
 
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1151
 msgid "can't query password in batchmode\n"
 msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
 
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1155
 msgid "Enter passphrase: "
 msgstr "�п�J�K�X��G "
 
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1159
 msgid "Repeat passphrase: "
 msgstr "�ЦA��J�@���K�X��G "
 
@@ -3928,41 +3928,41 @@ msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
 msgid "NOTE: key has been revoked"
 msgstr "�Ъ`�N�G���_�w�g�Q�M�P�F"
 
-#: g10/hkp.c:71
+#: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s\n"
 msgstr "���_ %08lX ���V %s �n�D��\n"
 
-#: g10/hkp.c:98
+#: g10/hkp.c:99
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�L�k�q���_���A�����o���_�G %s\n"
 
-#: g10/hkp.c:183
+#: g10/hkp.c:184
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "�ǰe�� `%s' ���ɭԵo�Ϳ��~�G %s\n"
 
-#: g10/hkp.c:198
+#: g10/hkp.c:199
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "���\�a�ǰe�� `%s' (���A=%u)\n"
 
-#: g10/hkp.c:201
+#: g10/hkp.c:202
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "�ǰe�� `%s' ���ɭԥ��ѤF�G���A=%u\n"
 
-#: g10/hkp.c:373
+#: g10/hkp.c:384
 msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
-#: g10/hkp.c:523
+#: g10/hkp.c:534
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "���b�j�M \"%s\" �� HKP ���A�� %s �W\n"
 
-#: g10/hkp.c:575
+#: g10/hkp.c:586
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "�L�k�j�M���_���A���G %s\n"
@@ -4478,7 +4478,7 @@ msgstr "�إߤF�z���_ �w ���b����\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�L�k�קK��٦��s�K�k���z���_�F�w�g�դF %d ���F�I\n"
 
-#: g10/seskey.c:210
+#: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA �n�D�ϥ� 160 �줸������t��k\n"
 
@@ -4859,17 +4859,17 @@ msgstr "�S���i�Ϊ�����"
 msgid "No help available for `%s'"
 msgstr "`%s' �S���i�Ϊ�����"
 
-#: g10/keydb.c:156
+#: g10/keydb.c:160
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�إ��_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keydb.c:163
+#: g10/keydb.c:167
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�_�Ͱ� `%s' �w�إ�\n"
 
-#: g10/keydb.c:639
+#: g10/keydb.c:646
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
diff --git a/scripts/config.guess b/scripts/config.guess
index 664145662..77c7cbab0 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-07-19'
+timestamp='2004-08-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -203,9 +203,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     cats:OpenBSD:*:*)
 	echo arm-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -230,18 +227,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -1179,9 +1170,10 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	case `uname -p` in
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/scripts/depcomp b/scripts/depcomp
index 3480ce4e9..11e2d3bfe 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,7 +1,9 @@
 #! /bin/sh
-
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2004-05-31.23
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,22 +27,45 @@
 
 # Originally written by Alexandre Oliva <[email protected]>.
 
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <[email protected]>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -172,19 +197,25 @@ sgi)
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
   tmpdepfile="$stripped.u"
-  outname="$stripped.o"
   if test "$libtool" = yes; then
     "$@" -Wc,-M
   else
     "$@" -M
   fi
-
   stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
   if test $stat -eq 0; then :
   else
     rm -f "$tmpdepfile"
@@ -192,6 +223,7 @@ aix)
   fi
 
   if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
@@ -206,38 +238,89 @@ aix)
   rm -f "$tmpdepfile"
   ;;
 
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-   base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'`
-   tmpdepfile1="$base.o.d"
-   tmpdepfile2="$base.d"
    if test "$libtool" = yes; then
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
    if test -f "$tmpdepfile1"; then
       tmpdepfile="$tmpdepfile1"
-   else
+   elif test -f "$tmpdepfile2"; then
       tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -250,34 +333,42 @@ tru64)
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
       ;;
     esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '
@@ -295,33 +386,37 @@ dashXmstdout)
   ;;
 
 makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
     done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
@@ -334,35 +429,39 @@ makedepend)
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
       ;;
     esac
-    "$@" -E |
+  done
+
+  "$@" -E |
     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -372,49 +471,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
   # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    for arg
-    do
-      case "$arg" in
-      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
 	shift
 	;;
-      *)
+    *)
 	set fnord "$@" "$arg"
 	shift
 	shift
 	;;
-      esac
-    done
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
@@ -434,3 +511,12 @@ none)
 esac
 
 exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/install-sh b/scripts/install-sh
index 398a88e14..0b65ee871 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,19 +1,38 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2004-10-22.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -23,13 +42,11 @@
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
-
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -41,211 +58,266 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
 	shift
+	shift
+	continue;;
 
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
 done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
 
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-fi &&
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
 
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit; }
+done
 
-exit 0
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/missing b/scripts/missing
index dd583709f..64b5f901d 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2004-09-07.08
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <[email protected]>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,18 +42,24 @@ else
   configure_ac=configure.in
 fi
 
+msg="missing on your system"
+
 case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -74,11 +84,15 @@ Supported PROGRAM values:
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <[email protected]>."
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
+    exit 0
     ;;
 
   -*)
@@ -87,14 +101,44 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -102,13 +146,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -116,13 +155,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -140,13 +174,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -156,16 +185,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
@@ -185,7 +209,7 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -262,13 +281,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
@@ -284,32 +298,28 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
     # messages.
     if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
+       gnutar "$@" && exit 0
     fi
     if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
+       gtar "$@" && exit 0
     fi
     firstarg="$1"
     if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
     fi
@@ -323,10 +333,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
          some other package would contain this missing \`$1' program."
     exit 1
@@ -334,3 +344,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index d2d5f21b6..6fbe5e117 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -1,20 +1,32 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <[email protected]>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <[email protected]>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
 
 errstatus=0
 dirmode=""
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <[email protected]>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
+      echo "$usage"
       exit 0
       ;;
     -m)                         # -m PERM arg
@@ -23,6 +35,10 @@ while test $# -gt 0 ; do
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,17 +66,37 @@ case $# in
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
@@ -84,17 +120,17 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
+	errstatus=$lasterr
       else
-  	if test ! -z "$dirmode"; then
+	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+	  lasterr=""
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
       fi
     fi
 
@@ -107,5 +143,8 @@ exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
 # End:
-# mkinstalldirs ends here
author	Werner Koch <[email protected]>	2004-12-27 17:27:11 +0000
committer	Werner Koch <[email protected]>	2004-12-27 17:27:11 +0000
commit	f79f61e50d7731105a7bbb093c90c783278043c3 (patch)
tree	3336f9be50aebc5abda9101cb3319be848964d66
parent	* NEWS: Note pgpgroup-to-gpggroup. (diff)
download	gnupg-f79f61e50d7731105a7bbb093c90c783278043c3.tar.gz gnupg-f79f61e50d7731105a7bbb093c90c783278043c3.zip