STABLE-BRANCH-1-2 gnupg (40 files)

Mon Dec 27 18:22:01 CET 2004

Date: Monday, December 27, 2004 @ 18:27:11
  Author: wk
    Path: /cvs/gnupg/gnupg
     Tag: STABLE-BRANCH-1-2

Modified: ChangeLog INSTALL Makefile.am NEWS README configure.ac
          m4/Makefile.in po/ChangeLog po/be.po po/ca.po po/cs.po po/da.po
          po/de.po po/el.po po/eo.po po/es.po po/et.po po/fi.po po/fr.po
          po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po
          po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sv.po
          po/tr.po po/zh_CN.po po/zh_TW.po scripts/config.guess
          scripts/depcomp scripts/install-sh scripts/missing
          scripts/mkinstalldirs

* 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.


-----------------------+
 ChangeLog             |   11 
 INSTALL               |   70 +-
 Makefile.am           |    8 
 NEWS                  |    8 
 README                |    6 
 configure.ac          |   29 -
 m4/Makefile.in        |   94 ++-
 po/ChangeLog          |    6 
 po/be.po              |   56 +-
 po/ca.po              |   56 +-
 po/cs.po              |   56 +-
 po/da.po              |   56 +-
 po/de.po              |   56 +-
 po/el.po              |   56 +-
 po/eo.po              |   56 +-
 po/es.po              |   56 +-
 po/et.po              |   56 +-
 po/fi.po              |   56 +-
 po/fr.po              |   58 +-
 po/gl.po              |   56 +-
 po/hu.po              |   56 +-
 po/id.po              |   56 +-
 po/it.po              |   56 +-
 po/ja.po              |   56 +-
 po/nl.po              |   56 +-
 po/pl.po              |   56 +-
 po/pt.po              |   56 +-
 po/pt_BR.po           |   56 +-
 po/ro.po              |  193 ++++---
 po/ru.po              |   56 +-
 po/sk.po              |   56 +-
 po/sv.po              | 1234 +++++++++++++++++++++++-------------------------
 po/tr.po              |   56 +-
 po/zh_CN.po           |   56 +-
 po/zh_TW.po           |   56 +-
 scripts/config.guess  |   18 
 scripts/depcomp       |  362 ++++++++------
 scripts/install-sh    |  490 ++++++++++---------
 scripts/missing       |  139 +++--
 scripts/mkinstalldirs |   69 ++
 40 files changed, 2218 insertions(+), 1921 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.118.2.86 gnupg/ChangeLog:1.118.2.87

--- gnupg/ChangeLog:1.118.2.86	Thu Dec 23 04:03:10 2004
+++ gnupg/ChangeLog	Mon Dec 27 18:27:11 2004
@@ -1,3 +1,14 @@
+2004-12-27  Werner Koch  <wk at g10code.com>
+
+	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  <dshaw at jabberwocky.com>
 
 	* NEWS: Note pgpgroup-to-gpggroup.
Index: gnupg/INSTALL
diff -u gnupg/INSTALL:1.26 gnupg/INSTALL:1.26.2.1
--- gnupg/INSTALL:1.26	Sat Jun 29 22:47:08 2002
+++ gnupg/INSTALL	Mon Dec 27 18:27:11 2004
@@ -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 @@
 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.
-
-   You can give `configure' initial values for variables by setting
-them in the environment.  You can do that on the command line like this:
+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 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
    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 @@
 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 @@
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
Index: gnupg/Makefile.am
diff -u gnupg/Makefile.am:1.46.2.3 gnupg/Makefile.am:1.46.2.4
--- gnupg/Makefile.am:1.46.2.3	Mon Aug  9 21:47:08 2004
+++ gnupg/Makefile.am	Mon Dec 27 18:27:11 2004
@@ -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 @@
 	echo "$(VERSION)" > $(distdir)/VERSION
 
 
-
-
-
-
-
-ACLOCAL_AMFLAGS = -I m4
Index: gnupg/NEWS
diff -u gnupg/NEWS:1.158.2.49 gnupg/NEWS:1.158.2.50
--- gnupg/NEWS:1.158.2.49	Thu Dec 23 04:03:10 2004
+++ gnupg/NEWS	Mon Dec 27 18:27:11 2004
@@ -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)
 ------------------------------------------------
Index: gnupg/README
diff -u gnupg/README:1.71.2.16 gnupg/README:1.71.2.17
--- gnupg/README:1.71.2.16	Tue Aug 10 21:39:02 2004
+++ gnupg/README	Mon Dec 27 18:27:11 2004
@@ -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
     -----
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.25.2.62 gnupg/configure.ac:1.25.2.63
--- gnupg/configure.ac:1.25.2.62	Wed Aug 25 18:11:06 2004
+++ gnupg/configure.ac	Mon Dec 27 18:27:11 2004
@@ -19,13 +19,14 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.25.2.62 $)dnl
+dnlAC_REVISION($Revision: 1.25.2.63 $)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, bug-gnupg at gnu.org)
+AC_INIT(gnupg, 1.2.7, bug-gnupg at gnu.org)
 # 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 @@
 
 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 @@
 
 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 @@
 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 @@
 #
 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 "$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 @@
 
 # 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 @@
 
 # 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
Index: gnupg/m4/Makefile.in
diff -u gnupg/m4/Makefile.in:1.5.2.1 gnupg/m4/Makefile.in:1.5.2.2
--- gnupg/m4/Makefile.in:1.5.2.1	Tue Aug 10 20:17:49 2004
+++ gnupg/m4/Makefile.in	Mon Dec 27 18:27:11 2004
@@ -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 @@
 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 @@
 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__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 @@
 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 @@
 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 @@
 	  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 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -266,7 +302,7 @@
 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-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -316,8 +354,8 @@
 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 \
Index: gnupg/po/ChangeLog
diff -u gnupg/po/ChangeLog:1.48.2.18 gnupg/po/ChangeLog:1.48.2.19
--- gnupg/po/ChangeLog:1.48.2.18	Mon Aug  9 21:46:31 2004
+++ gnupg/po/ChangeLog	Mon Dec 27 18:27:11 2004
@@ -1,3 +1,9 @@
+2004-12-27  Werner Koch  <wk at g10code.com>
+
+	* ro.po: Updated.
+
+	* sv.po: Updated.
+
 2004-08-09  Werner Koch  <wk at g10code.de>
 
 	* ca.po: Updated.
Index: gnupg/po/be.po
diff -u gnupg/po/be.po:1.1.2.7 gnupg/po/be.po:1.1.2.8
--- gnupg/po/be.po:1.1.2.7	Fri Aug 13 19:03:15 2004
+++ gnupg/po/be.po	Mon Dec 27 18:27:11 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <nab at mail.by>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -2006,26 +2006,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "Ð’Ð°Ð¼ Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° ÑžÐ²ÐµÑÑŒÑ†Ñ– Ð¿Ð°Ñ€Ð¾Ð»ÑŒ, ÐºÐ°Ð± Ð°Ð´Ñ‡Ñ‹Ð½Ñ–Ñ†ÑŒ ÑÐ°ÐºÑ€ÑÑ‚Ð½Ñ‹ ÐºÐ»ÑŽÑ‡ Ð´Ð»Ñ\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 @@
 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 @@
 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 @@
 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 ""
Index: gnupg/po/ca.po
diff -u gnupg/po/ca.po:1.3.2.19 gnupg/po/ca.po:1.3.2.20
--- gnupg/po/ca.po:1.3.2.19	Fri Aug 13 19:03:12 2004
+++ gnupg/po/ca.po	Mon Dec 27 18:27:05 2004
@@ -28,7 +28,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <jordi at gnu.org>\n"
 "Language-Team: Catalan <ca at dodds.net>\n"
@@ -2176,28 +2176,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/cs.po
diff -u gnupg/po/cs.po:1.6.2.18 gnupg/po/cs.po:1.6.2.19
--- gnupg/po/cs.po:1.6.2.18	Fri Aug 13 19:03:09 2004
+++ gnupg/po/cs.po	Mon Dec 27 18:27:05 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.3\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <rp at tns.cz>\n"
 "Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@ -2121,28 +2121,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/da.po
diff -u gnupg/po/da.po:1.11.2.18 gnupg/po/da.po:1.11.2.19
--- gnupg/po/da.po:1.11.2.18	Fri Aug 13 19:03:06 2004
+++ gnupg/po/da.po	Mon Dec 27 18:27:04 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <birger.langkjer at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -2070,27 +2070,27 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/de.po
diff -u gnupg/po/de.po:1.82.2.20 gnupg/po/de.po:1.82.2.21
--- gnupg/po/de.po:1.82.2.20	Fri Aug 13 19:03:02 2004
+++ gnupg/po/de.po	Mon Dec 27 18:27:04 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <koch at u32.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -2134,29 +2134,29 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/el.po
diff -u gnupg/po/el.po:1.6.2.18 gnupg/po/el.po:1.6.2.19
--- gnupg/po/el.po:1.6.2.18	Fri Aug 13 19:03:00 2004
+++ gnupg/po/el.po	Mon Dec 27 18:27:03 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <madf at hellug.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -2127,27 +2127,27 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\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 @@
 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 @@
 "áäõíáìßá áðïöõãÞò áäýíáìïõ êëåéäéïý ãéá óõììåôñéêü êñõðôáëãüñéèìï, äïêéìÞ "
 "ãéá %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 @@
 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"
Index: gnupg/po/eo.po
diff -u gnupg/po/eo.po:1.10.2.18 gnupg/po/eo.po:1.10.2.19
--- gnupg/po/eo.po:1.10.2.18	Fri Aug 13 19:02:58 2004
+++ gnupg/po/eo.po	Mon Dec 27 18:27:03 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <edmundo at rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -2101,26 +2101,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/es.po
diff -u gnupg/po/es.po:1.6.2.18 gnupg/po/es.po:1.6.2.19
--- gnupg/po/es.po:1.6.2.18	Fri Aug 13 19:02:55 2004
+++ gnupg/po/es.po	Mon Dec 27 18:27:02 2004
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <jsuarez at ono.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -2158,26 +2158,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "¡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 @@
 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"
Index: gnupg/po/et.po
diff -u gnupg/po/et.po:1.6.2.18 gnupg/po/et.po:1.6.2.19
--- gnupg/po/et.po:1.6.2.18	Fri Aug 13 19:02:53 2004
+++ gnupg/po/et.po	Mon Dec 27 18:27:02 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <Toomas.Soome at microlink.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -2081,28 +2081,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/fi.po
diff -u gnupg/po/fi.po:1.1.2.15 gnupg/po/fi.po:1.1.2.16
--- gnupg/po/fi.po:1.1.2.15	Fri Aug 13 19:02:51 2004
+++ gnupg/po/fi.po	Mon Dec 27 18:27:02 2004
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <Tommi.Vainikainen at iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -2115,28 +2115,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/fr.po
diff -u gnupg/po/fr.po:1.60.2.19 gnupg/po/fr.po:1.60.2.20
--- gnupg/po/fr.po:1.60.2.19	Fri Aug 13 19:02:48 2004
+++ gnupg/po/fr.po	Mon Dec 27 18:27:01 2004
@@ -5,13 +5,13 @@
 # Thanks to Rémi Guyomarch <rguyom at mail.dotcom.fr> and <nmorant at amadeus.net>
 # for pointing me out some errors.
 #
-# $Id: fr.po,v 1.60.2.19 2004/08/13 17:02:48 werner Exp $
+# $Id: fr.po,v 1.60.2.20 2004/12/27 17:27:01 wk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <gael at lautre.net>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -2158,29 +2158,29 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/gl.po
diff -u gnupg/po/gl.po:1.6.2.18 gnupg/po/gl.po:1.6.2.19
--- gnupg/po/gl.po:1.6.2.18	Fri Aug 13 19:02:46 2004
+++ gnupg/po/gl.po	Mon Dec 27 18:27:00 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <jtarrio at trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@ -2111,28 +2111,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/hu.po
diff -u gnupg/po/hu.po:1.1.2.13 gnupg/po/hu.po:1.1.2.14
--- gnupg/po/hu.po:1.1.2.13	Fri Aug 13 19:02:45 2004
+++ gnupg/po/hu.po	Mon Dec 27 18:26:55 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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ó <nfl at nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -2091,29 +2091,29 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/id.po
diff -u gnupg/po/id.po:1.11.2.18 gnupg/po/id.po:1.11.2.19
--- gnupg/po/id.po:1.11.2.18	Fri Aug 13 19:02:43 2004
+++ gnupg/po/id.po	Mon Dec 27 18:26:55 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <tedi_h at gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -2102,26 +2102,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/it.po
diff -u gnupg/po/it.po:1.64.2.19 gnupg/po/it.po:1.64.2.20
--- gnupg/po/it.po:1.64.2.19	Fri Aug 13 19:02:41 2004
+++ gnupg/po/it.po	Mon Dec 27 18:26:55 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <md at linux.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -2112,27 +2112,27 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/ja.po
diff -u gnupg/po/ja.po:1.11.2.18 gnupg/po/ja.po:1.11.2.19
--- gnupg/po/ja.po:1.11.2.18	Fri Aug 13 19:02:39 2004
+++ gnupg/po/ja.po	Mon Dec 27 18:26:54 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <iida at gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -2124,26 +2124,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/nl.po
diff -u gnupg/po/nl.po:1.11.2.18 gnupg/po/nl.po:1.11.2.19
--- gnupg/po/nl.po:1.11.2.18	Fri Aug 13 19:02:36 2004
+++ gnupg/po/nl.po	Mon Dec 27 18:26:54 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <cyriatan at fastmail.fm>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -2118,29 +2118,29 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/pl.po
diff -u gnupg/po/pl.po:1.41.2.20 gnupg/po/pl.po:1.41.2.21
--- gnupg/po/pl.po:1.41.2.20	Fri Aug 13 19:02:34 2004
+++ gnupg/po/pl.po	Mon Dec 27 18:26:54 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <alex at bofh.net.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -2130,27 +2130,27 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/pt.po
diff -u gnupg/po/pt.po:1.6.2.18 gnupg/po/pt.po:1.6.2.19
--- gnupg/po/pt.po:1.6.2.18	Fri Aug 13 19:02:32 2004
+++ gnupg/po/pt.po	Mon Dec 27 18:26:53 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -2121,26 +2121,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/pt_BR.po
diff -u gnupg/po/pt_BR.po:1.43.2.18 gnupg/po/pt_BR.po:1.43.2.19
--- gnupg/po/pt_BR.po:1.43.2.18	Fri Aug 13 19:02:30 2004
+++ gnupg/po/pt_BR.po	Mon Dec 27 18:26:53 2004
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/ro.po
diff -u gnupg/po/ro.po:1.1.2.13 gnupg/po/ro.po:1.1.2.14
--- gnupg/po/ro.po:1.1.2.13	Fri Aug 13 19:02:28 2004
+++ gnupg/po/ro.po	Mon Dec 27 18:26:53 2004
@@ -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 <lbgnupg at rolix.org>, 2003.
+# Laurentiu Buzdugan <lbuz at rolix.org>, 2003.
 #
 #
 #
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <lbgnupg at rolix.org>\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 <blbuz at rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -77,7 +77,7 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1611
 msgid "Digest: "
-msgstr "Rezumat: "
+msgstr "Rezumat (digest): "
 
 #: g10/keyedit.c:1663
 msgid "Features: "
@@ -3298,9 +3302,9 @@
 "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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 
 #: g10/misc.c:551
 msgid "Uncompressed"
-msgstr "Necompresat"
+msgstr "Necompresat(ã)"
 
 #: g10/misc.c:629
 #, c-format
@@ -3830,7 +3834,7 @@
 #: 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 
 #: 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 @@
 #, 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 @@
 #: 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 @@
 #, 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 @@
 #: 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 @@
 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 @@
 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 @@
 #, 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"
Index: gnupg/po/ru.po
diff -u gnupg/po/ru.po:1.44.2.7 gnupg/po/ru.po:1.44.2.8
--- gnupg/po/ru.po:1.44.2.7	Fri Aug 13 19:02:27 2004
+++ gnupg/po/ru.po	Mon Dec 27 18:26:53 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <maxbritov at tut.by>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@ -2095,27 +2095,27 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº ÑÐµÐºÑ€ÐµÑ‚Ð½Ð¾Ð¼Ñƒ ÐºÐ»ÑŽÑ‡Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:\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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/sk.po
diff -u gnupg/po/sk.po:1.1.2.15 gnupg/po/sk.po:1.1.2.16
--- gnupg/po/sk.po:1.1.2.15	Fri Aug 13 19:02:25 2004
+++ gnupg/po/sk.po	Mon Dec 27 18:26:52 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <mmajer at econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -2124,28 +2124,28 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/sv.po
diff -u gnupg/po/sv.po:1.11.2.19 gnupg/po/sv.po:1.11.2.20
--- gnupg/po/sv.po:1.11.2.19	Fri Oct 15 10:16:42 2004
+++ gnupg/po/sv.po	Mon Dec 27 18:26:50 2004
@@ -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 <info at clipanish.com>, 2004
 #
@@ -10,24 +10,22 @@
 # 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 <daniel at resare.com>, 1999-2002,
 # who sends his thanks to AndrÃ© Dahlqvist <andre at beta.telenordia.se>
 # and to his wife Olivia <olivia at resare.com>. 
 #
-# $Id: sv.po,v 1.11.2.19 2004/10/15 08:16:42 werner Exp $
+# $Id: sv.po,v 1.11.2.20 2004/12/27 17:26:50 wk Exp $
 #
 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 <pt at radvis.nu>\n"
+"Project-Id-Version: gnupg 1.2.6\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\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 <info at clipanish.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -49,28 +47,23 @@
 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 "\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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Rapportera gÃ¤rna fel till <gnupg-bugs at gnu.org>.\n"
@@ -813,6 +814,7 @@
 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 @@
 
 #: 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 
 # 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 "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 @@
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 "*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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 #: 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) <heinrichh at duesseldorf.de>\"\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) <gustav at trekronor.se>\"\n"
 "\n"
@@ -1879,7 +1873,7 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 "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 @@
 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 @@
 #: 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 @@
 "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 @@
 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 "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 @@
 "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 @@
 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 @@
 "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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1013
 msgid "debug"
-msgstr "debug"
+msgstr "avlusa"
 
 #: g10/keyedit.c:1014
 msgid "adduid"
@@ -3029,11 +3002,11 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1018
 msgid "delphoto"
-msgstr "ta bort bild"
+msgstr "delphoto"
 
 #: g10/keyedit.c:1019
 msgid "addkey"
@@ -3065,7 +3038,7 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1024
 msgid "primary"
-msgstr "huvud"
+msgstr "primary"
 
 #: g10/keyedit.c:1024
 msgid "flag user ID as primary"
@@ -3101,7 +3074,7 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 # 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 # 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 #: 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "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"
-"\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"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"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"
-"\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"
+"\"0\" betyder att du inte pÃ¥stÃ¥r nÃ¥gonting om hur noga du "
+"kontrolleratnyckeln.\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"
+"\"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"
 "    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 @@
 "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 @@
 "      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 @@
 "     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 @@
 "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 @@
 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 @@
 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 @@
 
 # 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 
 #: 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 @@
 #: 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 @@
 #: g10/tdbdump.c:208
 #, c-format
 msgid "read error: %s\n"
-msgstr "LÃ¤sfel:  %s\n"
-
+msgstr "lÃ¤sfel:  %s\n"
Index: gnupg/po/tr.po
diff -u gnupg/po/tr.po:1.6.2.18 gnupg/po/tr.po:1.6.2.19
--- gnupg/po/tr.po:1.6.2.18	Fri Aug 13 19:02:17 2004
+++ gnupg/po/tr.po	Mon Dec 27 18:26:49 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <nilgun at superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -2105,29 +2105,29 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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"
Index: gnupg/po/zh_CN.po
diff -u gnupg/po/zh_CN.po:1.1.2.5 gnupg/po/zh_CN.po:1.1.2.6
--- gnupg/po/zh_CN.po:1.1.2.5	Fri Aug 13 19:02:17 2004
+++ gnupg/po/zh_CN.po	Mon Dec 27 18:26:49 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <zuxyhere at eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@ -2067,26 +2067,26 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "ÄúÐèÒªÏÂÁÐÊ¹ÓÃÕßµÄÃÜÂë£¬²ÅÄÜ½â¿ªË½Ô¿£º\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 @@
 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 @@
 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 @@
 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"
Index: gnupg/po/zh_TW.po
diff -u gnupg/po/zh_TW.po:1.1.2.15 gnupg/po/zh_TW.po:1.1.2.16
--- gnupg/po/zh_TW.po:1.1.2.15	Fri Aug 13 19:02:16 2004
+++ gnupg/po/zh_TW.po	Mon Dec 27 18:26:49 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\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 <Jedi at idej.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -2072,26 +2072,26 @@
 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 @@
 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 @@
 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 " (¥Dnª÷Æ_ ID %08lX)"
@@ -3830,16 +3830,16 @@
 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 @@
 "©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 @@
 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 @@
 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 @@
 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"
Index: gnupg/scripts/config.guess
diff -u gnupg/scripts/config.guess:1.9.2.2 gnupg/scripts/config.guess:1.9.2.3
--- gnupg/scripts/config.guess:1.9.2.2	Fri Aug 13 19:00:47 2004
+++ gnupg/scripts/config.guess	Mon Dec 27 18:26:49 2004
@@ -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 @@
     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 @@
     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 @@
 	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 ;;
Index: gnupg/scripts/depcomp
diff -u gnupg/scripts/depcomp:1.1 gnupg/scripts/depcomp:1.1.2.1
--- gnupg/scripts/depcomp:1.1	Fri Aug 23 10:02:08 2002
+++ gnupg/scripts/depcomp	Mon Dec 27 18:26:49 2004
@@ -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 <oliva at dcc.unicamp.br>.
 
+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 <bug-automake at gnu.org>.
+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 @@
 
 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 @@
   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 @@
   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 @@
 
 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 @@
   ;;
 
 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 @@
 
 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 @@
 
 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 @@
 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:
Index: gnupg/scripts/install-sh
diff -u gnupg/scripts/install-sh:1.3 gnupg/scripts/install-sh:1.3.2.1
--- gnupg/scripts/install-sh:1.3	Sat Jun 29 15:37:55 2002
+++ gnupg/scripts/install-sh	Mon Dec 27 18:26:49 2004
@@ -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 @@
 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
+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;;
 
-# 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=''
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
 
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
+    -T) no_target_directory=true
 	shift
+	continue;;
 
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
+    --version) echo "$0 $scriptversion"; exit 0;;
 
-	pathcomp="${pathcomp}/"
+    *)  # 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:
Index: gnupg/scripts/missing
diff -u gnupg/scripts/missing:1.2 gnupg/scripts/missing:1.2.2.1
--- gnupg/scripts/missing:1.2	Sat Jun 29 15:37:55 2002
+++ gnupg/scripts/missing	Mon Dec 27 18:26:49 2004
@@ -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 <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,18 +42,24 @@
   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 @@
   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 <bug-automake at gnu.org>."
+    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 @@
     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 @@
     ;;
 
   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 @@
     ;;
 
   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 @@
     ;;
 
   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 @@
     ;;
 
   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 @@
 
   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 @@
 
   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 @@
     ;;
 
   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 @@
     ;;
 
   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 @@
 
   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 @@
 
   *)
     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 @@
 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:
Index: gnupg/scripts/mkinstalldirs
diff -u gnupg/scripts/mkinstalldirs:1.5.2.1 gnupg/scripts/mkinstalldirs:1.5.2.2
--- gnupg/scripts/mkinstalldirs:1.5.2.1	Tue Aug 10 19:23:10 2004
+++ gnupg/scripts/mkinstalldirs	Mon Dec 27 18:26:49 2004
@@ -1,20 +1,32 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
 
 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 <bug-automake at gnu.org>."
 
 # 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 @@
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,17 +66,37 @@
   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 @@
       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 @@
 # 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


