Preparing 1.4.7

AUTHORS

@@ -36,6 +36,8 @@ Gregory Steuck <steuck@iname.com> Translations [ru]
 
 Nagy Ferenc László <nfl@nfllab.com> Translations [hu]
 
+Ivar Snaaijer <Ivar@Snaaijer.nl>  Translations [nl]
+
 Ivo Timmermans <itimmermans@bigfoot.com> Translations [nl]
 
 Jacobo Tarri'o Barreiro <jtarrio@iname.com> Translations [gl]

ChangeLog

@@ -1,3 +1,11 @@
+2007-03-05  Werner Koch  <wk@g10code.com>
+
+	Released 1.4.7.
+
+2007-03-04  David Shaw  <dshaw@jabberwocky.com>
+
+	* NEWS: Note --allow-multiple-messages.
+
 2006-12-21  David Shaw  <dshaw@jabberwocky.com>
 
 	* configure.ac: Only check for libusb if we're building with card

NEWS

@@ -1,11 +1,21 @@
-Noteworthy changes in version 1.4.7
+Noteworthy changes in version 1.4.7 (2007-03-05)
 ------------------------------------------------
 
+    * By default, do not allow processing multiple plaintexts in a
+      single stream.  Many programs that called GnuPG were assuming
+      that GnuPG did not permit this, and were thus not using the
+      plaintext boundary status tags that GnuPG provides.  This change
+      makes GnuPG reject such messages by default which makes those
+      programs safe again.  --allow-multiple-messages returns to the
+      old behavior.
+
     * [W32] The environment variable LANGUAGE may be used to override
       the language given by HKCU\Software\GNU\GnuPG:Lang.  The
       language files "*.mo" are expected in a directory named
       "gnupg.nls" below the directory with the gpg.exe binary.
 
+    * New --verify-option show-primary-uid-only. 
+
 
 Noteworthy changes in version 1.4.6 (2006-12-06)
 ------------------------------------------------
@@ -35,7 +45,7 @@ Noteworthy changes in version 1.4.6 (2006-12-06)
       violations pertaining to this issue, including those that may
       have occurred in the past.
 
-    * Man pages are now build from the same source as those of GnuPG-2.
+    * Man pages are now built from the same source as those of GnuPG-2.
 
 
 Noteworthy changes in version 1.4.5 (2006-08-01)

checks/ChangeLog

@@ -1,3 +1,9 @@
+2007-03-04  David Shaw  <dshaw@jabberwocky.com>
+
+	* verify.test: Use --allow-multiple-messages instead of
+	--allow-multisig-verification.  Two clearsigs in a row counts as a
+	multiple-message test.
+
 2006-12-11  Werner Koch  <wk@g10code.com>
 
 	* verify.test (msg_clsclss_asc): Work around a bug in OpenBSD.

checks/verify.test

@@ -121,8 +121,8 @@ IHBlb3BsZS4K
 
 
 # Two standard signed messages in a row
-tests="$tests msg_olsols_asc_multisig"
+tests="$tests msg_olsols_asc_multiple"
-msg_olsols_asc_multisig='-----BEGIN PGP MESSAGE-----
+msg_olsols_asc_multiple='-----BEGIN PGP MESSAGE-----
 
 kA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGluayB0aGF0IGFsbCByaWdo
 dC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5IGFyZSBzaWNrIGFuZAp0
@@ -215,8 +215,8 @@ EOF
 `
 
 # Two clear text signatures in a row
-tests="$tests msg_clsclss_asc"
+tests="$tests msg_clsclss_asc_multiple"
-msg_clsclss_asc="${msg_cls_asc}
+msg_clsclss_asc_multiple="${msg_cls_asc}
 ${msg_clss_asc}"
 
 
@@ -236,8 +236,8 @@ for i in $tests ; do
     msg_*_asc)
        $GPG --verify x || error "verify of $i failed"
        ;;
-    msg_*_asc_multisig)
+    msg_*_asc_multiple)
-       $GPG --verify --allow-multisig-verification x \
+       $GPG --verify --allow-multiple-messages x \
            || error "verify of $i failed"
        set +x
        $GPG --verify x && error "verify of $i succeeded but should not"

configure.ac

@@ -28,7 +28,7 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [1.4.7])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
           || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

doc/gpg.texi

@@ -1003,6 +1003,11 @@ the signature. Defaults to no.
 Show revoked and expired user IDs during signature verification.
 Defaults to no.
 
+@item show-primary-uid-only
+Show only the primary user ID during signature verification.  That is
+all the AKA lines as well as photo Ids are not shown with the signature
+verification status.
+
 @item pka-lookups
 Enable PKA lookups to verify sender addresses. Note that PKA is based
 on DNS, and so enabling this option may disclose information on when
@@ -1076,18 +1081,23 @@ not used).
 @include opt-homedir.texi
 
 
+@ifset gpgone
 @item --pcsc-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default is
 `libpcsclite.so.1' for GLIBC based systems,
 `/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
 `winscard.dll' for Windows and `libpcsclite.so' for other systems.
+@end ifset
 
+@ifset gpgone
 @item --disable-ccid
 Disable the integrated support for CCID compliant readers. This
 allows to fall back to one of the other drivers even if the internal
 CCID driver can handle the reader. Note, that CCID support is only
 available if libusb was available at build time.
+@end ifset
 
+@ifset gpgone
 @item --reader-port @code{number_or_string}
 This option may be used to specify the port of the card terminal. A
 value of 0 refers to the first serial device; add 32768 to access USB
@@ -1095,6 +1105,7 @@ devices. The default is 32768 (first USB device). PC/SC or CCID
 readers might need a string here; run the program in verbose mode to get
 a list of available readers. The default is then the first reader
 found.
+@end ifset
 
 @item --display-charset @code{name}
 Set the name of the native character set. This is used to convert
@@ -1389,12 +1400,9 @@ For example, when retrieving multiple keys via @option{--recv-keys}, the
 timeout applies separately to each key retrieval, and not to the
 @option{--recv-keys} command as a whole. Defaults to 30 seconds.
 
-@item http-proxy
+@item http-proxy=@code{value}
-For HTTP-like keyserver schemes that (such as HKP and HTTP itself),
+Set the proxy to use for HTTP and HKP keyservers.  This overrides the
-try to access the keyserver over a proxy. If a @code{value} is
+"http_proxy" environment variable, if any.
-specified, use this as the HTTP proxy. If no @code{value} is
-specified, the value of the environment variable "http_proxy", if any,
-will be used.
 
 @item max-cert-size
 When retrieving a key via DNS CERT, only accept keys up to this size.
@@ -1458,9 +1466,15 @@ passphrase. @option{--no-use-agent} disables this option.
 @end ifset
 
 @item --gpg-agent-info
+@ifclear gpgone
+This is dummy option. It has no effect when used with @command{gpg2}.
+@end ifclear
+@ifset gpgone
 Override the value of the environment variable
 @samp{GPG_AGENT_INFO}. This is only used when @option{--use-agent} has
-been given
+been given.  Given that this option is not anymore used by
+@command{gpg2}, it should be avoided if possible.
+@end ifset
 
 @item --lock-once
 Lock the databases the first time a lock is requested
@@ -1971,7 +1985,7 @@ SHA224, SHA384, and SHA512 digests.
 @c ********  ESOTERIC OPTIONS  ***************
 @c *******************************************
 @node GPG Esoteric Options
-@subsection Doing things one usually don't want to do.
+@subsection Doing things one usually doesn't want to do.
 
 @table @gnupgtabopt
 
@@ -2093,8 +2107,8 @@ The same %-expandos used for notation data are available here as well.
 
 @item --sig-keyserver-url @code{string}
 Use @code{string} as a preferred keyserver URL for data signatures. If
-you prefix it with an exclamation mark, the keyserver URL packet will
+you prefix it with an exclamation mark (!), the keyserver URL packet
-be flagged as critical.
+will be flagged as critical.
 
 The same %-expandos used for notation data are available here as well.
 
@@ -2366,11 +2380,13 @@ absolute date in the form YYYY-MM-DD. Defaults to "0".
 @item --allow-secret-key-import
 This is an obsolete option and is not used anywhere.
 
-@item --allow-multisig-verification
+@item --allow-multiple-messages
-Allow verification of concatenated signed messages. This will run a
+@item --no-allow-multiple-messages
-signature verification for each data+signature block. There are some
+Allow processing of multiple OpenPGP messages contained in a single
-security issues with this option and thus it is off by default. Note
+file or stream.  Some programs that call GPG are not prepared to deal
-that versions of GPG prior to version 1.4.3 implicitly allowed this.
+with multiple messages being processed together, so this option
+defaults to no.  Note that versions of GPG prior to 1.4.7 always
+allowed multiple messages.
 
 @item --enable-special-filenames
 This options enables a mode in which filenames of the form
@@ -2448,10 +2464,12 @@ Display the keyring name at the head of key listings to show which
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options [no-]show-keyring} instead.
 
+@ifset gpgone
 @item --ctapi-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default
 is `libtowitoko.so'. Note that the use of this interface is
 deprecated; it may be removed in future releases.
+@end ifset
 
 @item --always-trust
 Identical to @option{--trust-model always}. This option is deprecated.
@@ -2570,6 +2588,16 @@ value. The option @option{--gpg-agent-info} can be used to override it.
 @itemx LINES
 Used to size some displays to the full size of the screen.
 
+
+@item LANGUAGE
+Apart from its use by GNU, it is used in the W32 version to override the
+language selection done through the Registry.  If used and set to a a
+valid and available language name (@var{langid}), the file with the
+translation is loaded from
+@code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}.  Here @var{gpgdir} is the
+directory out of which the gpg binary has been laoded.  If it can't be
+loaded the Registry is tried as a fallback.
+
 @end table
 
 
@@ -2684,6 +2712,13 @@ warning message about insecure memory your operating system supports
 locking without being root. The program drops root privileges as soon
 as locked memory is allocated.
 
+Note also that some systems (especially laptops) have the ability to
+``suspend to disk'' (also known as ``safe sleep'' or ``hibernate'').
+This writes all memory to disk before going into a low power or even
+powered off mode.  Unless measures are taken in the operating system
+to protect the saved memory, passphrases or other sensitive material
+may be recoverable from it later.
+
 @mansect see also
 @ifset isman
 @command{gpgv}(1), 

doc/gpgv.texi

@@ -157,11 +157,6 @@ The default keyring with the allowed keys
 @end table
 
 @mansect see also
-@ifset gpgone
-@command{gpg}(1)
-@end ifset
-@ifclear gpgone
 @command{gpg2}(1)
-@end ifclear
 @include see-also-note.texi
 

g10/ChangeLog

@@ -1,3 +1,29 @@
+2007-03-01  David Shaw  <dshaw@jabberwocky.com>
+
+	* options.h, gpg.c (main), mainproc.c (check_sig_and_print): Allow
+	multiple sig verification again as this is protected via the
+	multiple-messages code.
+
+2007-02-26  Werner Koch  <wk@g10code.com>
+
+	* gpg.c (main): Add verify option show-primary-uid-only.
+	* options.h (VERIFY_SHOW_PRIMARY_UID_ONLY): New.
+	* mainproc.c (check_sig_and_print): Implement it.
+
+	* status.h (STATUS_ERROR): New status code.
+	* status.c (get_status_string): Ditto.
+	* mainproc.c (proc_plaintext): Emit it if multiple messages are
+	detected.
+
+2007-02-20  David Shaw  <dshaw@jabberwocky.com>
+
+	* mainproc.c (literals_seen): New.
+	(proc_plaintext): Error out if more than one plaintext packet is
+	encountered
+	
+	* options.h, gpg.c: New option --allow-multiple-messages and --no
+	variant.
+
 2007-02-13  David Shaw  <dshaw@jabberwocky.com>
 
 	* parse-packet.c (parse_signature): It's hex.

g10/gpg.c

@@ -367,6 +367,8 @@ enum cmd_and_opt_values
     oAllowMultisigVerification,
     oEnableDSA2,
     oDisableDSA2,
+    oAllowMultipleMessages,
+    oNoAllowMultipleMessages,
 
     oNoop
   };
@@ -710,6 +712,8 @@ static ARGPARSE_OPTS opts[] = {
     { oAllowMultisigVerification, "allow-multisig-verification", 0, "@"},
     { oEnableDSA2, "enable-dsa2", 0, "@"},
     { oDisableDSA2, "disable-dsa2", 0, "@"},
+    { oAllowMultipleMessages, "allow-multiple-messages", 0, "@"},
+    { oNoAllowMultipleMessages, "no-allow-multiple-messages", 0, "@"},
 
     /* These two are aliases to help users of the PGP command line
        product use gpg with minimal pain.  Many commands are common
@@ -2581,6 +2585,8 @@ main (int argc, char **argv )
 		   N_("show user ID validity during signature verification")},
 		  {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL,
 		   N_("show revoked and expired user IDs in signature verification")},
+		  {"show-primary-uid-only",VERIFY_SHOW_PRIMARY_UID_ONLY,NULL,
+		   N_("show only the primary user ID in signature verification")},
 		  {"pka-lookups",VERIFY_PKA_LOOKUPS,NULL,
 		   N_("validate signatures with PKA data")},
 		  {"pka-trust-increase",VERIFY_PKA_TRUST_INCREASE,NULL,
@@ -2774,13 +2780,18 @@ main (int argc, char **argv )
 	    release_akl();
 	    break;
 
-          case oAllowMultisigVerification:
-            opt.allow_multisig_verification = 1;
-            break;
-
 	  case oEnableDSA2: opt.flags.dsa2=1; break;
 	  case oDisableDSA2: opt.flags.dsa2=0; break;
 
+          case oAllowMultisigVerification:
+	  case oAllowMultipleMessages:
+	    opt.flags.allow_multiple_messages=1;
+	    break;
+
+	  case oNoAllowMultipleMessages:
+	    opt.flags.allow_multiple_messages=0;
+	    break;
+
 	  case oNoop: break;
 
 	  default : pargs.err = configfp? 1:2; break;

g10/mainproc.c

@@ -84,10 +84,9 @@ struct mainproc_context
 
 
 static int do_proc_packets( CTX c, IOBUF a );
-
 static void list_node( CTX c, KBNODE node );
 static void proc_tree( CTX c, KBNODE node );
-
+static int literals_seen;
 
 static void
 release_list( CTX c )
@@ -619,6 +618,8 @@ proc_plaintext( CTX c, PACKET *pkt )
     int any, clearsig, only_md5, rc;
     KBNODE n;
 
+    literals_seen++;
+
     if( pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8 ) )
 	log_info(_("NOTE: sender requested \"for-your-eyes-only\"\n"));
     else if( opt.verbose )
@@ -702,16 +703,37 @@ proc_plaintext( CTX c, PACKET *pkt )
 	if ( c->mfx.md2  )
 	    md_start_debug( c->mfx.md2, "verify2" );
     }
+
+    rc=0;
+
+    if(literals_seen>1)
+      {
+	log_info(_("WARNING: multiple plaintexts seen\n"));
+
+	if(!opt.flags.allow_multiple_messages)
+	  {
+            write_status_text (STATUS_ERROR, "proc_pkt.plaintext 89_BAD_DATA");
+	    log_inc_errorcount();
+	    rc=G10ERR_UNEXPECTED;
+	  }
+      }
+
+    if(!rc)
+      {
 	if ( c->pipemode.op == 'B' )
 	  rc = handle_plaintext( pt, &c->mfx, 1, 0 );
-    else {
+	else
+	  {
 	    rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
-        if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
+	    if( rc == G10ERR_CREATE_FILE && !c->sigs_only)
+	      {
 		/* can't write output but we hash it anyway to
 		 * check the signature */
 		rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
 	      }
 	  }
+      }
+
     if( rc )
 	log_error( "handle plaintext failed: %s\n", g10_errstr(rc));
     free_packet(pkt);
@@ -1478,8 +1500,17 @@ check_sig_and_print( CTX c, KBNODE node )
           n_sig++;
         if (!n_sig)
           goto ambiguous;
+
+	/* If we wanted to disallow multiple sig verification, we'd do
+	   something like this:
+
 	   if (n && !opt.allow_multisig_verification)
                goto ambiguous;
+
+	   However, now that we have --allow-multiple-messages, this
+	   can stay allowable as we can't get here unless multiple
+	   messages (i.e. multiple literals) are allowed. */
+
         if (n_onepass != n_sig)
           {
             log_info ("number of one-pass packets does not match "
@@ -1737,7 +1768,8 @@ check_sig_and_print( CTX c, KBNODE node )
 
         /* If we have a good signature and already printed 
          * the primary user ID, print all the other user IDs */
-        if ( count && !rc ) {
+        if ( count && !rc
+             && !(opt.verify_options&VERIFY_SHOW_PRIMARY_UID_ONLY) ) {
 	    char *p;
             for( un=keyblock; un; un = un->next ) {
                 if( un->pkt->pkttype != PKT_USER_ID )

g10/options.h

@@ -226,6 +226,7 @@ struct
     unsigned int use_embedded_filename:1;
     unsigned int utf8_filename:1;
     unsigned int dsa2:1;
+    unsigned int allow_multiple_messages:1;
   } flags;
 
   /* Linked list of ways to find a key if the key isn't on the local
@@ -237,8 +238,6 @@ struct
     struct akl *next;
   } *auto_key_locate;
 
-  /* True if multiple concatenated signatures may be verified. */
-  int allow_multisig_verification; 
   int passwd_repeat;
 } opt;
 
@@ -324,6 +323,7 @@ struct {
 #define VERIFY_SHOW_UNUSABLE_UIDS        (1<<6)
 #define VERIFY_PKA_LOOKUPS               (1<<7)
 #define VERIFY_PKA_TRUST_INCREASE        (1<<8)
+#define VERIFY_SHOW_PRIMARY_UID_ONLY     (1<<9)
 
 #define KEYSERVER_USE_TEMP_FILES         (1<<0)
 #define KEYSERVER_KEEP_TEMP_FILES        (1<<1)

g10/status.c

@@ -166,6 +166,7 @@ get_status_string ( int no )
     case STATUS_PKA_TRUST_BAD  : s = "PKA_TRUST_BAD"; break;
     case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break;
     case STATUS_BEGIN_SIGNING  : s = "BEGIN_SIGNING"; break;
+    case STATUS_ERROR          : s = "ERROR"; break;
     default: s = "?"; break;
     }
   return s;

g10/status.h

@@ -120,6 +120,8 @@
 
 #define STATUS_BEGIN_SIGNING    84
 
+#define STATUS_ERROR  85
+
 
 /*-- status.c --*/
 void set_status_fd ( int fd );

po/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-05  Werner Koch  <wk@g10code.com>
+
+	* LINGUAS: Add nl.
+	* nl.po: Revised translation by Ivar Snaaijer.
+
 2007-02-26  Werner Koch  <wk@g10code.com>
 
 	* sv.po: Update fron Daniel.

po/LINGUAS

@@ -9,6 +9,7 @@ hu
 id it
 ja
 nb
+nl
 pl pt_BR pt
 ro ru 
 sk sv

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2007-02-26 15:57+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2006-06-28 20:54+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -41,7 +41,7 @@ msgstr "es wird auf die Sperre `%s' gewartet...\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3514 g10/import.c:195 g10/keygen.c:2392
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
 #: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
 #: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -720,7 +720,7 @@ msgstr "Geben Sie die PIN nochmal ein: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3879 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -1410,7 +1410,7 @@ msgstr "Optionendatei '%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2864 g10/gpg.c:2883
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
@@ -1432,7 +1432,7 @@ msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2705 g10/keyedit.c:4074
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
@@ -1507,321 +1507,326 @@ msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
 #: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2773
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2857
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2869
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2876
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
 
-#: g10/gpg.c:2891
+#: g10/gpg.c:2890
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/gpg.c:2905
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2911
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2916
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:2930
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:2997 g10/gpg.c:3021
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3003 g10/gpg.c:3027
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3009
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3029
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3032
+#: g10/gpg.c:3031
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3036
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3038
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3065
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3102
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3154
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3319
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3351
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3425
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/gpg.c:3571
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3573
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3586
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3655
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3742
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4173
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4175
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4208
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
@@ -1846,19 +1851,19 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3717
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschlüssel zum öffentlichen Unterschlüssel %s - "
 "übergangen\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -3532,13 +3537,13 @@ msgstr ""
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
 #: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
-#: g10/mainproc.c:1794 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
 #: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
-#: g10/mainproc.c:1796 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4710,107 +4715,107 @@ msgstr "Korrekte Unterschrift von \""
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1539
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n"
 
-#: g10/mainproc.c:1541
+#: g10/mainproc.c:1550
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1542
+#: g10/mainproc.c:1551
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1546
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
 
-#: g10/mainproc.c:1566
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1699 g10/mainproc.c:1747
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1701 g10/mainproc.c:1749
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1703 g10/mainproc.c:1751
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1755
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1797
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1885
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1890
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1894
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1895 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1984 g10/mainproc.c:2000 g10/mainproc.c:2086
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2027
+#: g10/mainproc.c:2037
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2035
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2092
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 

po/sv.po

@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2007-02-26 15:57+0100\n"
+"POT-Creation-Date: 2007-03-05 10:25+0100\n"
 "PO-Revision-Date: 2007-02-22 00:33+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -59,7 +59,7 @@ msgstr "väntar på lås på \"%s\"...\n"
 
 #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3514 g10/import.c:195 g10/keygen.c:2392
+#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
 #: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
 #: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -740,7 +740,7 @@ msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3879 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -1424,7 +1424,7 @@ msgstr "inställningsfil \"%s\": %s\n"
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2864 g10/gpg.c:2883
+#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
@@ -1445,7 +1445,7 @@ msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2705 g10/keyedit.c:4074
+#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4074
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
@@ -1518,322 +1518,327 @@ msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
 #: g10/gpg.c:2589
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
+
+#: g10/gpg.c:2591
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2593
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2603
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2610
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2771
+#: g10/gpg.c:2773
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2774
+#: g10/gpg.c:2776
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2853
+#: g10/gpg.c:2852
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2857
+#: g10/gpg.c:2856
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2865
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2869
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:2876
+#: g10/gpg.c:2875
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
 
-#: g10/gpg.c:2891
+#: g10/gpg.c:2890
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:2905
+#: g10/gpg.c:2904
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2911
+#: g10/gpg.c:2910
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2916
 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) 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/gpg.c:2930
+#: g10/gpg.c:2929
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:2997 g10/gpg.c:3021
+#: g10/gpg.c:2996 g10/gpg.c:3020
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3003 g10/gpg.c:3027
+#: g10/gpg.c:3002 g10/gpg.c:3026
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3009
+#: g10/gpg.c:3008
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3014
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3030
+#: g10/gpg.c:3029
 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/gpg.c:3032
+#: g10/gpg.c:3031
 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/gpg.c:3034
+#: g10/gpg.c:3033
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3036
+#: g10/gpg.c:3035
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3038
+#: g10/gpg.c:3037
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3041
+#: g10/gpg.c:3040
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3044
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3051
 msgid "invalid default preferences\n"
 msgstr "ogiltiga 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/gpg.c:3061
+#: g10/gpg.c:3060
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3065
+#: g10/gpg.c:3064
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3068
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3102
+#: g10/gpg.c:3101
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3148
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3154
+#: g10/gpg.c:3153
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3289
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3291
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3301
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3314
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3317
+#: g10/gpg.c:3316
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3319
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3337
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3351
+#: g10/gpg.c:3350
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3366
+#: g10/gpg.c:3365
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3367
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3370
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3390
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3399
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3425
+#: g10/gpg.c:3424
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3432
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3436
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3458
+#: g10/gpg.c:3457
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3528
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3571
+#: g10/gpg.c:3570
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3573
+#: g10/gpg.c:3572
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3574
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3586
+#: g10/gpg.c:3585
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3595
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3646
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3655
+#: g10/gpg.c:3654
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3742
+#: g10/gpg.c:3741
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3864
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3868
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4173
+#: g10/gpg.c:4172
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4175
+#: g10/gpg.c:4174
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4208
+#: g10/gpg.c:4207
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -1857,17 +1862,17 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3717
+#: g10/getkey.c:2383 g10/keyedit.c:3717
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: g10/getkey.c:2611
+#: g10/getkey.c:2614
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:2658
+#: g10/getkey.c:2661
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
@@ -3489,12 +3494,12 @@ msgstr ""
 "såvida inte du startar om programmet.\n"
 
 #: g10/keyedit.c:2877 g10/keyedit.c:3223 g10/keyserver.c:521
-#: g10/mainproc.c:1794 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "spärrad"
 
 #: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:525
-#: g10/mainproc.c:1796 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utgånget"
 
@@ -4652,108 +4657,108 @@ msgstr "ingen signatur hittades\n"
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utelämnad\n"
 
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1539
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1541
+#: g10/mainproc.c:1550
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1542
+#: g10/mainproc.c:1551
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1546
+#: g10/mainproc.c:1555
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1566
+#: g10/mainproc.c:1575
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1699 g10/mainproc.c:1747
+#: g10/mainproc.c:1708 g10/mainproc.c:1756
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1701 g10/mainproc.c:1749
+#: g10/mainproc.c:1710 g10/mainproc.c:1758
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1703 g10/mainproc.c:1751
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # 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:1755
+#: g10/mainproc.c:1764
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1797
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1885
+#: g10/mainproc.c:1895
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1890
+#: g10/mainproc.c:1900
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1903
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1894
+#: g10/mainproc.c:1904
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1905
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1895 g10/trustdb.c:531
+#: g10/mainproc.c:1905 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1915
+#: g10/mainproc.c:1925
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:1984 g10/mainproc.c:2000 g10/mainproc.c:2086
+#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2027
+#: g10/mainproc.c:2037
 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:2035
+#: g10/mainproc.c:2045
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2092
+#: g10/mainproc.c:2102
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2112
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"